Merge pull request #279 from andamian/310

Bumped CI dependencies

.github/workflows/cibuild.yml

@@ -22,12 +22,11 @@ jobs:
   tests:
     needs: egginfo
     runs-on: ubuntu-latest
-    name: ${{ matrix.python-version }} with ${{ matrix.astropy-version }}
+    name: ${{ matrix.python-version }}
     strategy:
       fail-fast: true
       matrix:
-        python-version: [3.7, 3.8, 3.9]
-        astropy-version:  [latest ,astropy40, astropy41]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
@@ -44,7 +43,7 @@ jobs:
         # remove "." from matrix.python-version to get the defaults tox python versions
         tox_python_target=$(echo py${{matrix.python-version}} | sed 's/\.//')
         echo "Tox python target: " $tox_python_target
-        tox -e $tox_python_target-${{ matrix.astropy-version }}
+        tox -e $tox_python_target-test
 
 
   mac_windows:
@@ -91,9 +90,23 @@ jobs:
         with:
           file: ./coverage.xml
 
-  astropydev:
+  devastropy:
     # TODO: this job should be allowed to fail except that the functionality
     # is not available in actions yet.
+    runs-on: ubuntu-latest
+    needs: tests
+    steps: 
+      - uses: actions/checkout@v2
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v2
+        with:
+          python-version: "3.10"
+      - name: Install tox
+        run: python -m pip install --upgrade tox
+      - name: Run tests against devastropy
+        run: tox -e py310-test-devastropy
+
+  oldestastropy:
     runs-on: ubuntu-latest
     needs: tests
     steps: 
@@ -104,8 +117,8 @@ jobs:
           python-version: 3.8
       - name: Install tox
         run: python -m pip install --upgrade tox
-      - name: Run tests against astropy dev
-        run: tox -e py38-astropydev
+      - name: Run tests against oldestastropy
+        run: tox -e py38-test-oldestastropy
 
   #publish:
   #needs: coverage

setup.cfg

@@ -40,7 +40,7 @@ license = BSD
 url = https://github.com/astropy/pyvo
 edit_on_github = False
 github_project = astropy/pyvo
-install_requires = astropy requests
+install_requires = astropy>=4.0 requests
 # version should be PEP440 compatible (http://www.python.org/dev/peps/pep-0440)
 version = 1.2.dev
 

tox.ini

@@ -1,7 +1,9 @@
 [tox]
+# Please note that not all the combinations below are guaranteed to work
+# as oldestastropy and devastropy might not support the full python range
+# listed here
 envlist =
-    py{37,38,39}-{latest,astropy40,astropy41}
-    py38-astropydev
+    py{37,38,39,310}-test{,-oldestastropy, -devastropy}
     egg_info
     cov
     linkcheck
@@ -20,12 +22,13 @@ commands =
 
 description =
     run tests
-    astropy40: with astropy 4.0.*
-    astropy41: with astropy 4.1.*
-    latest: with astropy latest
+    oldestdeps: with astropy 4.0.*
+    devastropy: with astropy latest
 
 deps =
-    #-rpip-requirements
+    devastropy: git+https://github.com/astropy/astropy.git#egg=astropy
+    oldestdeps: astropy==4.0
+    astropy
     requests
     mimeparse
     pytest-astropy