Test on Python 3.10 alpha 3

PyMassSpec · Dec 15, 2020 · d280782 · d280782
1 parent 664c83e
commit d280782
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 43 deletions.
diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml
@@ -1,6 +1,6 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
-name: Windows Tests
+name: Windows
 
 on:
   push:
@@ -11,17 +11,19 @@ jobs:
   tests:
     name: "Python ${{ matrix.config.python-version }}"
     runs-on: "windows-2019"
+    continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.3'
 
     strategy:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build"}
-          - {python-version: "3.7", testenvs: "py37,build"}
-          - {python-version: "3.8", testenvs: "py38,build"}
-          - {python-version: "3.9", testenvs: "py39,build"}
+          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
+          - {python-version: "3.7", testenvs: "py37,build", experimental: False}
+          - {python-version: "3.8", testenvs: "py38,build", experimental: False}
+          - {python-version: "3.9", testenvs: "py39,build", experimental: False}
+          - {python-version: "3.10.0-alpha.3", testenvs: "py310-dev,build", experimental: True}
         arch:
           - x64
           - x86

diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml
@@ -1,6 +1,6 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
-name: Linux Tests
+name: Linux
 
 on:
   push:
@@ -10,18 +10,20 @@ on:
 jobs:
   tests:
     name: "Python ${{ matrix.config.python-version }}"
-    runs-on: "ubuntu-18.04"
+    runs-on: "ubuntu-20.04"
+    continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.3'
 
     strategy:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build"}
-          - {python-version: "3.7", testenvs: "py37,build"}
-          - {python-version: "3.8", testenvs: "py38,build"}
-          - {python-version: "3.9", testenvs: "py39,build"}
+          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
+          - {python-version: "3.7", testenvs: "py37,build", experimental: False}
+          - {python-version: "3.8", testenvs: "py38,build", experimental: False}
+          - {python-version: "3.9", testenvs: "py39,build", experimental: False}
+          - {python-version: "3.10.0-alpha.3", testenvs: "py310-dev,build", experimental: True}
 
     steps:
       - name: Checkout 🛎️
@@ -56,7 +58,7 @@ jobs:
 
   Coverage:
     needs: tests
-    runs-on: "ubuntu-18.04"
+    runs-on: "ubuntu-20.04"
     steps:
       - name: Checkout 🛎️
         uses: "actions/checkout@v2"
@@ -100,7 +102,7 @@ jobs:
   Deploy:
     needs: tests
 
-    runs-on: "ubuntu-18.04"
+    runs-on: "ubuntu-20.04"
     steps:
       - name: Checkout 🛎️
         uses: "actions/checkout@v2"
@@ -132,7 +134,7 @@ jobs:
 
   Conda:
     needs: deploy
-    runs-on: "ubuntu-18.04"
+    runs-on: "ubuntu-20.04"
     steps:
       - name: Checkout 🛎️
         uses: "actions/checkout@v2"

diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml
@@ -1,6 +1,6 @@
 # This file is managed by 'repo_helper'. Don't edit it directly.
 ---
-name: macOS Tests
+name: macOS
 
 on:
   push:
@@ -11,17 +11,19 @@ jobs:
   tests:
     name: "Python ${{ matrix.config.python-version }}"
     runs-on: "macos-latest"
+    continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.3'
 
     strategy:
       fail-fast: False
       matrix:
         config:
-          - {python-version: "3.6", testenvs: "py36,build"}
-          - {python-version: "3.7", testenvs: "py37,build"}
-          - {python-version: "3.8", testenvs: "py38,build"}
-          - {python-version: "3.9", testenvs: "py39,build"}
+          - {python-version: "3.6", testenvs: "py36,build", experimental: False}
+          - {python-version: "3.7", testenvs: "py37,build", experimental: False}
+          - {python-version: "3.8", testenvs: "py38,build", experimental: False}
+          - {python-version: "3.9", testenvs: "py39,build", experimental: False}
+          - {python-version: "3.10.0-alpha.3", testenvs: "py310-dev,build", experimental: True}
 
     steps:
       - name: Checkout 🛎️

diff --git a/repo_helper.yml b/repo_helper.yml
@@ -29,6 +29,7 @@ python_versions:
  - 3.7
  - 3.8
  - 3.9
+ - 3.10-dev
 
 # travis secure password for PyPI
 
@@ -93,4 +94,4 @@ yapf_exclude:
  - pyms-demo/.*/.*
 
 tox_unmanaged:
- - testenv
+ - tox
diff --git a/tox.ini b/tox.ini
@@ -1,8 +1,8 @@
 # This file is managed by 'repo_helper'.
 # You may add new sections, but any changes made to the following sections will be lost:
-#     * tox
 #     * envlists
 #     * gh-actions
+#     * testenv
 #     * testenv:docs
 #     * testenv:build
 #     * testenv:lint
@@ -15,16 +15,8 @@
 #     * check-wheel-contents
 #     * pytest
 
-[tox]
-envlist = py36, py37, py38, py39, mypy, build
-skip_missing_interpreters = True
-requires =
-    pip>=20.3.1
-    tox-envlist>=0.1.0
-isolated_build = True
-
 [envlists]
-test = py36, py37, py38, py39
+test = py36, py37, py38, py39, py310-dev
 qa = mypy, lint
 cov = py36, coverage
 
@@ -34,6 +26,13 @@ python =
     3.7: py37, build
     3.8: py38, build
     3.9: py39, build
+    3.10.0-alpha.3: py310-dev, build
+
+[testenv]
+deps = -r{toxinidir}/tests/requirements.txt
+commands =
+    python --version
+    python -m pytest --cov=pyms -r aR tests/ {posargs}
 
 [testenv:docs]
 setenv = SHOW_TODOS = 1
@@ -152,19 +151,29 @@ package = pyms
 addopts = --color yes --durations 25
 timeout = 300
 
-[travis]
-python =
-    3.6: py36, build, mypy
-    3.7: py37, build
-    3.8: py38, build
-    3.9: py39, build
+[tox]
+envlist = py36, py37, py38, py39, mypy, build
+skip_missing_interpreters = True
+requires =
+    pip>=20.3.1
+    tox-envlist>=0.1.0
+    tox-pip-version>=0.0.7
+isolated_build = True
 
-[testenv]
-setenv = PIP_USE_FEATURE = 2020-resolver
-deps = -r{toxinidir}/tests/requirements.txt
+[testenv:py310-dev]
+setenv = PYTHONDEVMODE = 1
+pip_version = pip==20.3.2
+deps =
+    -r{toxinidir}/tests/requirements.txt
+    https://github.com/domdfcoding/3.10-Wheels/raw/75854a403c7a359db927bdd0354102abe3160237/numpy-1.19.4-cp310-cp310-linux_x86_64.whl
+    https://github.com/domdfcoding/3.10-Wheels/raw/75854a403c7a359db927bdd0354102abe3160237/pandas-1.1.5-cp310-cp310-linux_x86_64.whl
+    https://github.com/domdfcoding/3.10-Wheels/raw/ab6111a652f07288970d02ac3741e30e02e7741e/scipy-1.5.4-cp310-cp310-linux_x86_64.whl
+    https://github.com/domdfcoding/3.10-Wheels/raw/9b682f3fe76c033752bc2a78fb801d2e21ebbf6d/netCDF4-1.5.5-cp310-cp310-linux_x86_64.whl
+    /home/domdf/Python/3.10-Wheels/cftime-1.3.0-cp310-cp310-linux_x86_64.whl
 commands =
     python --version
-    python -m pytest --cov=pyms -r aR tests/ {posargs}
+    python -m pytest --cov=pyms_agilent -r aR tests/ {posargs}
+
 
 [dep_checker]
 name_mapping =