Remove helpers being installed as a standalone package and simpify py…

…test usage
radio-astro-tools · Mar 4, 2019 · cd82f7e · cd82f7e
1 parent f3af095
commit cd82f7e
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,16 +27,17 @@ env:
         - SETUP_CMD='test -a "--boxed"'
         - NUMPY_VERSION=1.13
         - ASTROPY_VERSION=stable
-        - CONDA_DEPENDENCIES='sip<4.19 aplpy pytest=3.9.3 pytest-xdist astropy-helpers joblib glue-core scipy'
-        - CONDA_CHANNELS='astropy-ci-extras astropy glueviz'
+        - CONDA_DEPENDENCIES='sip<4.19 aplpy pytest-xdist joblib glue-core scipy'
+        - PYTEST_VERSION=3.9.3
+        - CONDA_CHANNELS='astropy glueviz'
         - PIP_DEPENDENCIES='matplotlib<2 Cython https://github.com/radio-astro-tools/pvextractor/archive/master.zip radio_beam https://github.com/astropy/regions/archive/master.zip https://github.com/astropy/reproject/archive/master.zip'
         - SETUP_XVFB=True
 
     matrix:
         - SETUP_CMD='egg_info'
         - # run with default settings
         - ASTROPY_VERSION='development'
-        - CONDA_DEPENDENCIES='pytest=3.9.3 pytest-xdist' PIP_DEPENDENCIES='radio_beam'
+        - CONDA_DEPENDENCIES='pytest-xdist' PIP_DEPENDENCIES='radio_beam'
 
 matrix:
     include:
@@ -47,7 +48,7 @@ matrix:
         - python: 3.6
           env: SETUP_CMD='test --coverage'
                PYTEST_VERSION="<3.10"
-               CONDA_DEPENDENCIES='matplotlib aplpy yt bottleneck sip<4.19 aplpy pytest=3.9.3 pytest-xdist astropy-helpers joblib glue-core scipy'
+               CONDA_DEPENDENCIES='matplotlib aplpy yt bottleneck sip<4.19 aplpy pytest-xdist joblib glue-core scipy'
                # pytest 3.9.3 suggested by @e-koch, @astrofrog.  3.10.1 doesn't work, 4.x doesn't work
                # overrode python version too, per bsipocz
 
@@ -61,7 +62,8 @@ matrix:
           env: PIP_DEPENDENCIES='https://github.com/radio-astro-tools/pvextractor/archive/master.zip radio_beam'
 
         - python: 3.6
-          env: NUMPY_VERSION=1.11 ASTROPY_VERSION=LTS CONDA_DEPENDENCIES='matplotlib aplpy bottleneck pytest pytest-xdist astropy-helpers'
+          env: NUMPY_VERSION=1.11 ASTROPY_VERSION=LTS CONDA_DEPENDENCIES='matplotlib aplpy bottleneck pytest-xdist'
+               PYTEST_VERSION=''
 
         # Test with development versions
         - python: 3.5
@@ -76,8 +78,9 @@ matrix:
 
         - python: 3.6
           env:
-              CONDA_DEPENDENCIES='matplotlib=3 aplpy yt bottleneck pytest pytest-xdist astropy-helpers joblib'
+              CONDA_DEPENDENCIES='matplotlib=3 aplpy yt bottleneck pytest-xdist joblib'
               PIP_DEPENDENCIES='https://github.com/radio-astro-tools/radio_beam/archive/master.zip https://github.com/radio-astro-tools/pvextractor/archive/master.zip'
+              PYTEST_VERSION=''
               ASTROPY_VERSION='development'
 
 install: