force pytest version to 3.1.3, as 3.2 produces "INTERNALERROR" (docte…

…sts)

.travis.yml

@@ -47,7 +47,7 @@ env:
         # For this package-template, we include examples of Cython modules,
         # so Cython is required for testing. If your package does not include
         # Cython code, you can set CONDA_DEPENDENCIES=''
-        - CONDA_DEPENDENCIES='pip wheel numpy scipy astropy pytest cython h5py matplotlib pyproj sgp4'
+        - CONDA_DEPENDENCIES='pip wheel numpy scipy astropy pytest=3.1.3 cython h5py matplotlib pyproj sgp4'
 
         # List other runtime dependencies for the package that are available as
         # pip packages here.
@@ -101,13 +101,17 @@ matrix:
         - os: linux
           env: SETUP_CMD='test'
 
-        # Check for sphinx doc build warnings - we do this first because it
-        # may run for a long time
+        # This only builds docs
         - os: linux
           env:
             # - SETUP_CMD='build_docs -w'
             - SETUP_CMD='build_docs'
-            - DO_DOCS=YES
+
+        # This first runs tests, then builds docs and uploads if
+        # successful, only
+        - os: linux
+          env:
+            - UPLOAD_DOCS=YES
 
         # Now try Astropy dev with the latest 3.x.
         - os: linux
@@ -139,12 +143,6 @@ before_install:
 install:
 
     - mkdir -p ${TRAVIS_BUILD_DIR}/srtm/
-    # download SRTM data for tests
-    # - wget -P ${TRAVIS_BUILD_DIR}/srtm/ http://viewfinderpanoramas.org/dem3/M32.zip
-    # - wget -P ${TRAVIS_BUILD_DIR}/srtm/ http://viewfinderpanoramas.org/dem3/N32.zip
-    # - unzip ${TRAVIS_BUILD_DIR}/srtm/M32.zip -d ${TRAVIS_BUILD_DIR}/srtm/
-    # - unzip ${TRAVIS_BUILD_DIR}/srtm/N32.zip -d ${TRAVIS_BUILD_DIR}/srtm/
-    # - mv ${TRAVIS_BUILD_DIR}/srtm/{M,N}*/*.hgt ${TRAVIS_BUILD_DIR}/srtm/
 
     # We now use the ci-helpers package to set up our testing environment.
     # This is done by using Miniconda and then using conda and pip to install
@@ -160,7 +158,6 @@ install:
     - git clone git://github.com/astropy/ci-helpers.git
     - source ci-helpers/travis/setup_conda.sh
 
-
     # As described above, using ci-helpers, you should be able to set up an
     # environment with dependencies installed using conda and pip, but in some
     # cases this may not provide enough flexibility in how to install a
@@ -172,18 +169,19 @@ install:
 
 script:
    - $MAIN_CMD $SETUP_CMD
-   - echo "DO_DOCS" $DO_DOCS
+   - echo "UPLOAD_DOCS" $UPLOAD_DOCS
    # have to remove the c-files, generated during build with
    # git reset --hard HEAD;
    - set -e
-   - 'if [[ $TRAVIS_TAG && $DO_DOCS ]]; then
-        conda install doctr;
-        git reset --hard HEAD;
-        doctr deploy . --no-require-master --sync;
-     elif [[ $DO_DOCS ]]; then
+   - 'if [[ $UPLOAD_DOCS ]]; then
+        $MAIN_CMD build_docs;
         conda install doctr;
         git reset --hard HEAD;
-        doctr deploy --no-require-master --sync --built-docs docs/_build/html "latest";
+        if [[ $TRAVIS_TAG ]]; then
+          doctr deploy . --no-require-master --sync;
+        else
+          doctr deploy --no-require-master --sync --built-docs docs/_build/html "latest";
+        fi
      fi'
 
 after_success:

appveyor.yml

@@ -19,7 +19,7 @@ environment:
       # For this package-template, we include examples of Cython modules,
       # so Cython is required for testing. If your package does not include
       # Cython code, you can set CONDA_DEPENDENCIES=''
-      CONDA_DEPENDENCIES: "pip wheel numpy scipy astropy pytest cython h5py matplotlib pyproj sgp4"
+      CONDA_DEPENDENCIES: "pip wheel numpy scipy astropy pytest=3.1.3 cython h5py matplotlib pyproj sgp4"
 
       # Conda packages for affiliated packages are hosted in channel
       # "astropy" while builds for astropy LTS with recent numpy versions
@@ -46,15 +46,10 @@ platform:
 
 install:
     - "mkdir %SRTMDATA%"
-    # downloading srtm data
-    # - "powershell -command \"& { Invoke-WebRequest -Uri 'http://viewfinderpanoramas.org/dem3/M32.zip' -OutFile '%SRTMDATA%\\M32.zip' }\""
-    # - "powershell -command \"& { Expand-Archive '%SRTMDATA%\\M32.zip' -DestinationPath '%SRTMDATA%\\' }\""
-    # - "powershell -command \"& { Move-Item '%SRTMDATA%\\*\\*.hgt' '%SRTMDATA%\\' }\""
     - "git clone git://github.com/astropy/ci-helpers.git"
     - "powershell ci-helpers/appveyor/install-miniconda.ps1"
     - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
     - "activate test"
-    # - "powershell -command \"& { (New-Object Net.WebClient).DownloadFile('http://viewfinderpanoramas.org/dem3/M32.zip', '%SRTMDATA%/') }\""
 
 # Not a .NET project, we build the package in the install step instead
 build: false