Skip to content

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 66967c3

Browse filesBrowse files
committed
Merge remote-tracking branch 'origin/main' into sphinx_autodoc_typehints
2 parents 85ed5cc + 6c69e88 commit 66967c3
Copy full SHA for 66967c3

File tree

6 files changed

+59
-13
lines changed
Filter options

6 files changed

+59
-13
lines changed

‎.github/workflows/nox.yml

Copy file name to clipboardExpand all lines: .github/workflows/nox.yml
+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
platform: [ubuntu-latest, macos-latest, windows-latest]
15-
python-version: ["3.7", "3.8", "3.9", "3.10"]
15+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
1616

1717
steps:
1818
- uses: actions/checkout@v1

‎.github/workflows/typeguard.yml

Copy file name to clipboardExpand all lines: .github/workflows/typeguard.yml
+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- name: Set up Python ${{ matrix.python-version }}
1212
uses: actions/setup-python@v2
1313
with:
14-
python-version: "3.10"
14+
python-version: "3.11"
1515
- name: Install dependencies
1616
run: pip install nox
1717
- name: Test with nox

‎CHANGELOG.md

Copy file name to clipboardExpand all lines: CHANGELOG.md
+51-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,61 @@
11
# Changelog
22

3+
## [v0.15.0](https://github.com/python-adaptive/adaptive/tree/v0.15.0) (2022-11-30)
4+
5+
[Full Changelog](https://github.com/python-adaptive/adaptive/compare/v0.14.2...v0.15.0)
6+
7+
**Closed issues:**
8+
9+
- Fix branch name \(master --\> main\) in binder link in readme [\#383](https://github.com/python-adaptive/adaptive/issues/383)
10+
11+
**Merged pull requests:**
12+
13+
- Add support for Python 3.11 and test on it [\#387](https://github.com/python-adaptive/adaptive/pull/387) ([basnijholt](https://github.com/basnijholt))
14+
- Rename master -\> main [\#384](https://github.com/python-adaptive/adaptive/pull/384) ([basnijholt](https://github.com/basnijholt))
15+
- Add loss\_goal, npoints\_goal, and an auto\_goal function and use it in the runners [\#382](https://github.com/python-adaptive/adaptive/pull/382) ([basnijholt](https://github.com/basnijholt))
16+
- Add type-hints to Runner [\#370](https://github.com/python-adaptive/adaptive/pull/370) ([basnijholt](https://github.com/basnijholt))
17+
- Add docs section about executing coroutines [\#364](https://github.com/python-adaptive/adaptive/pull/364) ([juandaanieel](https://github.com/juandaanieel))
18+
19+
## [v0.14.2](https://github.com/python-adaptive/adaptive/tree/v0.14.2) (2022-10-14)
20+
21+
[Full Changelog](https://github.com/python-adaptive/adaptive/compare/v0.14.1...v0.14.2)
22+
23+
**Closed issues:**
24+
25+
- Rename master branch to main [\#368](https://github.com/python-adaptive/adaptive/issues/368)
26+
27+
**Merged pull requests:**
28+
29+
- Avoid uncecessary iteration in SequenceLearner [\#380](https://github.com/python-adaptive/adaptive/pull/380) ([jbweston](https://github.com/jbweston))
30+
- Use numbers module from stdlib as type [\#379](https://github.com/python-adaptive/adaptive/pull/379) ([basnijholt](https://github.com/basnijholt))
31+
- Add type-hints to tests and misc [\#378](https://github.com/python-adaptive/adaptive/pull/378) ([basnijholt](https://github.com/basnijholt))
32+
- Add type-hints to Learner2D [\#375](https://github.com/python-adaptive/adaptive/pull/375) ([basnijholt](https://github.com/basnijholt))
33+
- Add type-hints to DataSaver [\#373](https://github.com/python-adaptive/adaptive/pull/373) ([basnijholt](https://github.com/basnijholt))
34+
- Type hint IntegratorLearner [\#372](https://github.com/python-adaptive/adaptive/pull/372) ([basnijholt](https://github.com/basnijholt))
35+
- Add type-hints to BalancingLearner [\#371](https://github.com/python-adaptive/adaptive/pull/371) ([basnijholt](https://github.com/basnijholt))
36+
- Optionally run tests with pandas [\#369](https://github.com/python-adaptive/adaptive/pull/369) ([basnijholt](https://github.com/basnijholt))
37+
- Typehint SequenceLearner [\#366](https://github.com/python-adaptive/adaptive/pull/366) ([basnijholt](https://github.com/basnijholt))
38+
39+
## [v0.14.1](https://github.com/python-adaptive/adaptive/tree/v0.14.1) (2022-10-11)
40+
41+
[Full Changelog](https://github.com/python-adaptive/adaptive/compare/v0.14.0...v0.14.1)
42+
43+
**Merged pull requests:**
44+
45+
- Use typing.TypeAlias [\#367](https://github.com/python-adaptive/adaptive/pull/367) ([basnijholt](https://github.com/basnijholt))
46+
- Add Learner.new\(\) method that returns an empty copy of the learner [\#365](https://github.com/python-adaptive/adaptive/pull/365) ([basnijholt](https://github.com/basnijholt))
47+
348
## [v0.14.0](https://github.com/python-adaptive/adaptive/tree/v0.14.0) (2022-10-05)
449

5-
[Full Changelog](https://github.com/python-adaptive/adaptive/compare/v0.14.0...HEAD)
50+
[Full Changelog](https://github.com/python-adaptive/adaptive/compare/v0.13.2...v0.14.0)
651

752
**Closed issues:**
853

954
- Stop using atomic writes [\#352](https://github.com/python-adaptive/adaptive/issues/352)
1055

1156
**Merged pull requests:**
1257

58+
- Release 0.14 [\#363](https://github.com/python-adaptive/adaptive/pull/363) ([basnijholt](https://github.com/basnijholt))
1359
- Allow to periodically save with any function [\#362](https://github.com/python-adaptive/adaptive/pull/362) ([basnijholt](https://github.com/basnijholt))
1460
- Update pre-commit versions [\#359](https://github.com/python-adaptive/adaptive/pull/359) ([basnijholt](https://github.com/basnijholt))
1561
- Add getting learner's data as pandas.DataFrame; add learner.to\_dataframe method [\#358](https://github.com/python-adaptive/adaptive/pull/358) ([basnijholt](https://github.com/basnijholt))
@@ -152,7 +198,7 @@
152198
- bump pre-commit filter dependencies [\#293](https://github.com/python-adaptive/adaptive/pull/293) ([basnijholt](https://github.com/basnijholt))
153199
- fix docs [\#291](https://github.com/python-adaptive/adaptive/pull/291) ([basnijholt](https://github.com/basnijholt))
154200
- update to miniver 0.7.0 [\#290](https://github.com/python-adaptive/adaptive/pull/290) ([basnijholt](https://github.com/basnijholt))
155-
- add `runner.live_plot()` in README example [\#288](https://github.com/python-adaptive/adaptive/pull/288) ([basnijholt](https://github.com/basnijholt))
201+
- add `runner.live\_plot\(\)` in README example [\#288](https://github.com/python-adaptive/adaptive/pull/288) ([basnijholt](https://github.com/basnijholt))
156202
- Update pre commit [\#287](https://github.com/python-adaptive/adaptive/pull/287) ([basnijholt](https://github.com/basnijholt))
157203
- Use m2r2 [\#286](https://github.com/python-adaptive/adaptive/pull/286) ([basnijholt](https://github.com/basnijholt))
158204
- temporarily pin scikit-learn\<=0.23.1 [\#285](https://github.com/python-adaptive/adaptive/pull/285) ([basnijholt](https://github.com/basnijholt))
@@ -197,6 +243,7 @@
197243

198244
**Closed issues:**
199245

246+
200247
- add minimum number of points parameter to AverageLearner [\#273](https://github.com/python-adaptive/adaptive/issues/273)
201248
- Release v0.10 [\#258](https://github.com/python-adaptive/adaptive/issues/258)
202249

@@ -386,7 +433,7 @@
386433
- Gracefully handle exceptions when evaluating the function to be learned [\#125](https://github.com/python-adaptive/adaptive/issues/125)
387434
- Allow BalancingLearner to return arbitrary number of points from 'choose\_points' [\#124](https://github.com/python-adaptive/adaptive/issues/124)
388435
- Increase the default refresh rate for 'live\_plot' [\#120](https://github.com/python-adaptive/adaptive/issues/120)
389-
- remove default number of points to choose in `choose_points` [\#118](https://github.com/python-adaptive/adaptive/issues/118)
436+
- remove default number of points to choose in `choose\_points` [\#118](https://github.com/python-adaptive/adaptive/issues/118)
390437
- Consider using Gaussian process optimization as a learner [\#115](https://github.com/python-adaptive/adaptive/issues/115)
391438
- Make `distributed.Client` work with automatic scaling of the cluster [\#104](https://github.com/python-adaptive/adaptive/issues/104)
392439
- Improve plotting for learners [\#83](https://github.com/python-adaptive/adaptive/issues/83)
@@ -473,7 +520,7 @@
473520
- Remove public 'fname' learner attribute [\#17](https://github.com/python-adaptive/adaptive/issues/17)
474521
- Release v0.7.0 [\#14](https://github.com/python-adaptive/adaptive/issues/14)
475522
- \(Learner1D\) improve time complexity [\#13](https://github.com/python-adaptive/adaptive/issues/13)
476-
- Typo in documentation for` adaptive.learner.learner2D.uniform_loss(ip)` [\#12](https://github.com/python-adaptive/adaptive/issues/12)
523+
- Typo in documentation for` adaptive.learner.learner2D.uniform\_loss\(ip\)` [\#12](https://github.com/python-adaptive/adaptive/issues/12)
477524
- \(LearnerND\) fix plotting of scaled domains [\#11](https://github.com/python-adaptive/adaptive/issues/11)
478525
- suggested points lie outside of domain [\#7](https://github.com/python-adaptive/adaptive/issues/7)
479526
- DEVELOPMENT IS ON GITLAB: https://gitlab.kwant-project.org/qt/adaptive [\#5](https://github.com/python-adaptive/adaptive/issues/5)

‎adaptive/runner.py

Copy file name to clipboardExpand all lines: adaptive/runner.py
+3-5
Original file line numberDiff line numberDiff line change
@@ -932,11 +932,9 @@ def replay_log(
932932
# -- Internal executor-related, things
933933

934934

935-
def _ensure_executor(
936-
executor: ExecutorTypes | None,
937-
) -> concurrent.Executor:
935+
def _ensure_executor(executor: ExecutorTypes | None) -> concurrent.Executor:
938936
if executor is None:
939-
executor = concurrent.ProcessPoolExecutor()
937+
executor = _default_executor()
940938

941939
if isinstance(executor, concurrent.Executor):
942940
return executor
@@ -979,7 +977,7 @@ def _get_ncores(
979977

980978
# TODO: deprecate
981979
def stop_after(
982-
*, seconds: float = 0, minutes: float = 0, hours: float = 0
980+
*, seconds: float = 0.0, minutes: float = 0.0, hours: float = 0.0
983981
) -> Callable[[BaseLearner], bool]:
984982
"""Stop a runner after a specified time.
985983

‎noxfile.py

Copy file name to clipboardExpand all lines: noxfile.py
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import nox
22

33

4-
@nox.session(python=["3.7", "3.8", "3.9", "3.10"])
4+
@nox.session(python=["3.7", "3.8", "3.9", "3.10", "3.11"])
55
@nox.parametrize("all_deps", [True, False])
66
def pytest(session, all_deps):
77
session.install(".[testing,other]" if all_deps else ".[testing]")
88
session.run("coverage", "erase")
99
session.run("pytest")
1010

1111

12-
@nox.session(python="3.10")
12+
@nox.session(python="3.11")
1313
def pytest_typeguard(session):
1414
session.install(".[testing,other]")
1515
session.run("coverage", "erase")

‎setup.py

Copy file name to clipboardExpand all lines: setup.py
+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ def get_version_and_cmdclass(package_name):
8181
"Programming Language :: Python :: 3.8",
8282
"Programming Language :: Python :: 3.9",
8383
"Programming Language :: Python :: 3.10",
84+
"Programming Language :: Python :: 3.11",
8485
],
8586
packages=find_packages("."),
8687
install_requires=install_requires,

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.