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

Author: basnijholt

.github/workflows/coverage.yml

@@ -13,8 +13,8 @@ jobs:
       with:
         python-version: 3.7
     - name: Install dependencies
-      run: pip install tox codecov
-    - name: Test with tox
-      run: tox -e py37-alldeps,report
+      run: pip install nox codecov
+    - name: Test with nox
+      run: nox -e coverage
     - name: Upload test coverage
       run: codecov -t ${{ secrets.CODECOV_TOKEN }} -f .coverage.xml

.github/workflows/tox.yml .github/workflows/nox.yml.github/workflows/tox.yml renamed to .github/workflows/nox.yml

@@ -1,4 +1,4 @@
-name: tox
+name: nox
 
 on:
   pull_request:
@@ -12,26 +12,24 @@ jobs:
       fail-fast: false
       matrix:
         platform: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.7, 3.8, 3.9]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
 
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Set Python version for tox
-      run: echo "PY_VERSION=$(echo py${version//./})" >> $GITHUB_ENV
+    - name: Set Python version for nox
+      run: echo "PY_VERSION=$(echo ${version})" >> $GITHUB_ENV
       shell: bash
       env:
         version: ${{ matrix.python-version }}
     - name: Register Python problem matcher
       run: echo "::add-matcher::.github/workflows/matchers/pytest.json"
     - name: Install dependencies
-      run: pip install tox pytest-github-actions-annotate-failures
-    - name: Test with tox using minimal dependencies
-      run: tox -e ${{ env.PY_VERSION }}-mindeps
-    - name: Clean
-      run: tox -e clean
-    - name: Test with tox with all dependencies
-      run: tox -e ${{ env.PY_VERSION }}-alldeps
+      run: pip install nox pytest-github-actions-annotate-failures
+    - name: Test with nox using minimal dependencies
+      run: nox -e "pytest-${{ env.PY_VERSION }}(all_deps=False)"
+    - name: Test with nox with all dependencies
+      run: nox -e "pytest-${{ env.PY_VERSION }}(all_deps=True)"

docs/environment.yml

@@ -11,7 +11,7 @@ dependencies:
   - scipy=1.7.1
   - holoviews=1.14.6
   - bokeh=2.4.0
-  - panel=0.12.3
+  - panel=0.12.7
   - plotly=5.3.1
   - ipywidgets=7.6.5
   - jupyter-sphinx=0.3.2

noxfile.py

@@ -0,0 +1,27 @@
+import nox
+
+
+@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.run("coverage", "erase")
+
+    if session.python == "3.10":
+        session.run("pytest", "--typeguard-packages=adaptive")
+    else:
+        session.run("pytest")
+
+
+@nox.session(python="3.7")
+def coverage(session):
+    session.install("coverage")
+    session.install(".[testing,other]")
+    session.run("pytest")
+
+    session.run("coverage", "report")
+    session.run("coverage", "xml")

pyproject.toml

@@ -4,3 +4,32 @@ requires = [
     "setuptools_scm >= 2.0.0, <3"
 ]
 build-backend = "setuptools.build_meta"
+
+[tool.pytest.ini_options]
+testpaths = ["adaptive"]
+addopts = "--durations=5 --cov --cov-append --cov-fail-under=70 -vvv --cov-report="
+norecursedirs = ["docs"]
+
+[tool.coverage.paths]
+source = [
+  "adaptive",
+  ".nox/py*/lib/python*/site-packages",
+]
+
+[tool.coverage.run]
+branch = true
+parallel = true
+source = ["adaptive"]
+
+[tool.coverage.report]
+show_missing = true
+precision = 2
+
+[tool.coverage.xml]
+output = ".coverage.xml"
+
+[tool.isort]
+profile = "black"
+
+[tool.mypy]
+ignore_missing_imports = true

setup.cfg

@@ -0,0 +1,6 @@
+[flake8]
+max-line-length = 100
+ignore = E501, W503, E203, E266, E741
+max-complexity = 18
+select = B, C, E, F, W, T4, B9
+exclude = .git, .tox, __pycache__, dist, .nox