Merge pull request #2378 from bsipocz/CI_restructure_dev_test

MNT: Adding more dev dependency testing

Author: bsipocz

.github/workflows/ci_crontests.yml

@@ -0,0 +1,46 @@
+name: CI-crontests
+
+on:
+  push:
+    # Run this job on release tags, but not on pushes to the main branch
+    tags:
+    - '*'
+  schedule:
+    # run every Monday at 5am UTC
+    - cron: '0 5 * * 1'
+
+jobs:
+  tests:
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.os }}
+    if: github.event_name == 'schedule' && github.repository == 'astropy/astroquery'
+    strategy:
+      fail-fast: true
+      matrix:
+        include:
+          - name: Python 3.8 with all dependencies with remote data
+            os: ubuntu-latest
+            python: '3.8'
+            toxenv: py38-test-alldeps-devdeps
+            toxargs: -v
+            toxposargs: --remote-data
+
+          - name: pre-repease dependencies with all dependencies
+            os: ubuntu-latest
+            python: '3.10'
+            toxenv: py310-test-alldeps-predeps
+            toxargs: -v
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python }}
+    - name: Install Python dependencies
+      run: python -m pip install --upgrade tox
+    - name: Run tests
+      run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}

.github/workflows/ci_devtests.yml

@@ -0,0 +1,48 @@
+# This test job is separated out into its own workflow to be able to obtain a separate badge for it
+name: CI-devtest
+
+on:
+  push:
+    branches:
+    - main
+    tags:
+    - '*'
+  pull_request:
+    branches:
+    - main
+  schedule:
+    # run every Monday at 5am UTC
+    - cron: '0 5 * * 1'
+
+jobs:
+  tests:
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        include:
+          - name: dev dependencies with all dependencies with coverage
+            os: ubuntu-latest
+            python: '3.10'
+            toxenv: py310-test-alldeps-devdeps-cov
+            toxargs: -v
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python }}
+    - name: Install Python dependencies
+      run: python -m pip install --upgrade tox
+    - name: Run tests
+      run: tox ${{ matrix.toxargs }} -e ${{ matrix.toxenv }} -- ${{ matrix.toxposargs }}
+    - name: Upload coverage to codecov
+      if: contains(matrix.toxenv,'-cov')
+      uses: codecov/codecov-action@v2
+      with:
+        file: ./coverage.xml

.github/workflows/ci_tests.yml

@@ -1,3 +1,4 @@
+# Developer version testing as well as cron testings are in separate workflows
 name: CI
 
 on:
@@ -33,12 +34,6 @@ jobs:
             toxenv: py37-test-oldestdeps
             toxargs: -v
 
-          - name: astropy dev with all dependencies with coverage
-            os: ubuntu-latest
-            python: '3.10'
-            toxenv: py310-test-alldeps-devastropy-cov
-            toxargs: -v
-
           - name: Python 3.8 with all optional dependencies (MacOS X)
             os: macos-latest
             python: 3.8
@@ -70,27 +65,6 @@ jobs:
       with:
         file: ./coverage.xml
 
-  # This needs to be outside of matrix because if is not supported
-  # for only one job in a matrix. But once that is supported, this can go
-  # back to the matrix above.
-  remote_data:
-    name: Python 3.8 with all dependencies with remote data
-    if: github.event_name == 'schedule' && github.repository == 'astropy/astroquery'
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.8'
-    - name: Install Python dependencies
-      run: python -m pip install --upgrade tox
-    - name: Run tests
-      run: tox -v -e py38-test-alldeps-devastropy -- --remote-data
-
   egg_info:
     name: egg_info with Python 3.7
     runs-on: ubuntu-latest

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py{37,38,39,310}-test{,-alldeps,-oldestdeps}{,-devastropy}{,-cov}
+    py{37,38,39,310}-test{,-alldeps,-oldestdeps,-devdeps,-predeps}{,-cov}
     codestyle
     build_docs
 requires =
@@ -27,12 +27,11 @@ changedir = .tmp/{envname}
 description = run tests
 
 deps =
-    devastropy: git+https://github.com/astropy/astropy.git#egg=astropy
+    devdeps: git+https://github.com/astropy/astropy.git#egg=astropy
+    devdeps: git+https://github.com/astropy/pyvo.git#egg=pyvo
 
-# TODO: Add more versions to oldestdeps. numpy<1.15 could not be installed
-# in CI, a much newer version was pulled in instead, thus setting
-# minimum numpy to 1.15. mpl while not a dependency, it's required for the
-# tests, and would pull up a newer numpy version if not pinned.
+# TODO: Add more versions to oldestdeps.
+# mpl while not a dependency, it's required for the tests, and would pull up a newer numpy version if not pinned.
 
     oldestdeps: astropy==4.0
     oldestdeps: numpy==1.16
@@ -51,6 +50,18 @@ commands =
     cov:  pytest --pyargs astroquery {toxinidir}/docs --ignore={toxinidir}/docs/gallery* --cov astroquery --cov-config={toxinidir}/setup.cfg {posargs}
     cov: coverage xml -o {toxinidir}/coverage.xml
 
+[testenv:predeps]
+description = run tests with pre-releases
+pip_pre = True
+
+deps = {[testenv]deps}
+passenv = {[testenv]passenv}
+pypi_filter = {[testenv]pypi_filter}
+changedir = {[testenv]changedir}
+extras = {[testenv]extras}
+commands = {[testenv]commands}
+
+
 [testenv:codestyle]
 changedir = {toxinidir}
 skip_install = true