Merge remote-tracking branch 'origin/master' into mypy

Author: basnijholt

.github/workflows/typeguard.yml

@@ -0,0 +1,18 @@
+name: typeguard
+
+on:
+  - push
+
+jobs:
+  coverage:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: "3.10"
+    - name: Install dependencies
+      run: pip install nox
+    - name: Test with nox
+      run: nox -e pytest_typeguard

adaptive/runner.py

@@ -6,6 +6,7 @@
 import itertools
 import pickle
 import platform
+import sys
 import time
 import traceback
 import warnings
@@ -759,9 +760,8 @@ async def _run(self) -> None:
         try:
             while not self.goal(self.learner):
                 futures = self._get_futures()
-                done, _ = await asyncio.wait(
-                    futures, return_when=first_completed, loop=self.ioloop
-                )
+                kw = {"loop": self.ioloop} if sys.version_info[:2] < (3, 10) else {}
+                done, _ = await asyncio.wait(futures, return_when=first_completed, **kw)
                 self._process_futures(done)
         finally:
             remaining = self._remove_unfinished()

adaptive/tests/test_runner.py

@@ -106,6 +106,7 @@ def test_stop_after_goal():
     OPERATING_SYSTEM == "Windows" and sys.version_info >= (3, 7),
     reason="Gets stuck in CI",
 )
+@pytest.mark.skipif(OPERATING_SYSTEM == "Darwin", reason="Cannot stop ipcluster")
 def test_ipyparallel_executor():
     from ipyparallel import Client
 

docs/environment.yml

@@ -21,3 +21,5 @@ dependencies:
   - m2r2=0.3.1
   - sphinx_rtd_theme=1.0.0
   - ffmpeg=4.3.2
+  - cloudpickle
+  - loky

noxfile.py

@@ -4,17 +4,16 @@
 @nox.session(python=["3.7", "3.8", "3.9", "3.10"])
 @nox.parametrize("all_deps", [True, False])
 def pytest(session, all_deps):
-    if all_deps:
-        session.install(".[testing,other]")
-    else:
-        session.install(".[testing]")
-
+    session.install(".[testing,other]" if all_deps else ".[testing]")
     session.run("coverage", "erase")
+    session.run("pytest")
+
 
-    if session.python == "3.10":
-        session.run("pytest", "--typeguard-packages=adaptive")
-    else:
-        session.run("pytest")
+@nox.session(python="3.10")
+def pytest_typeguard(session):
+    session.install(".[testing,other]")
+    session.run("coverage", "erase")
+    session.run("pytest", "--typeguard-packages=adaptive")
 
 
 @nox.session(python="3.7")

readthedocs.yml

@@ -1,3 +1,9 @@
+version: 2
+
+build:
+    os: "ubuntu-20.04"
+    tools:
+        python: "mambaforge-4.10"
+
 conda:
-    file: docs/environment.yml
-    formats: []
+    environment: docs/environment.yml