try to get working conda installations in CI for obspy 1.1.0

obspy · Nov 1, 2017 · 97105e9 · 97105e9
1 parent 84b06e4
commit 97105e9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: c
 
 env:
   global:
-    - OBSPY_VERSION=1.0.3
+    - OBSPY_VERSION=1.1.0
 
 sudo: false
 
@@ -22,7 +22,7 @@ matrix:
       env: PYTHON_VERSION=2.7 CONDA_PLATFORM=osx-64 CONDA_PYSUFFIX=py27
 
     - os: linux
-      env: PYTHON_VERSION=3.5 CONDA_PLATFORM=linux-64 CONDA_PYSUFFIX=py35
+      env: PYTHON_VERSION=3.6 CONDA_PLATFORM=linux-64 CONDA_PYSUFFIX=py36
     - os: linux
       env: PYTHON_VERSION=3.5 CONDA_PLATFORM=linux-32 CONDA_PYSUFFIX=py35 ARCHITECTURE_32BIT="True"
       addons:
@@ -32,7 +32,7 @@ matrix:
             - libstdc++6:i386
             - gcc-multilib
     - os: osx
-      env: PYTHON_VERSION=3.5 CONDA_PLATFORM=osx-64 CONDA_PYSUFFIX=py35
+      env: PYTHON_VERSION=3.6 CONDA_PLATFORM=osx-64 CONDA_PYSUFFIX=py36
 
 install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
@@ -48,10 +48,8 @@ install:
       fi
   - if [[ "$PYTHON_VERSION" == "2.7" ]]; then
     export MINICONDA="Miniconda2-latest";
-    elif [[ "$PYTHON_VERSION" == "3.5" ]]; then
-      export MINICONDA="Miniconda3-3.5.5";
     else
-      export MINICONDA="";
+      export MINICONDA="Miniconda3-3.5.5";
     fi
   - wget https://repo.continuum.io/miniconda/${MINICONDA}-${OS}-x86${ARCH}.sh -O miniconda.sh;
   - bash miniconda.sh -b -p $HOME/miniconda
@@ -69,15 +67,15 @@ install:
   - source activate test
   # Useful for debugging any issues with conda
   - conda info -a
+  - if [[ "$PYTHON_VERSION" == "2.7" ]]; then
+    conda install mock;
+    fi
   - |
       if [[ "$ARCHITECTURE_32BIT" == "True" ]]; then
-        # linux32 doesnt have basemap-data-hires
-        conda install obspy==${OBSPY_VERSION} ipython jupyter basemap nomkl sqlalchemy gdal
-      elif [[ "$OS" == "Linux" ]]; then
-        # only linux64 has geographiclib
-        conda install obspy==${OBSPY_VERSION} ipython jupyter basemap nomkl sqlalchemy gdal basemap-data-hires geographiclib
+        # linux32 doesnt have basemap-data-hires and also no geographiclib
+        conda install obspy==${OBSPY_VERSION} ipython jupyter basemap nomkl sqlalchemy pyshp cryptography
       else
-        conda install obspy==${OBSPY_VERSION} ipython jupyter basemap nomkl sqlalchemy gdal basemap-data-hires
+        conda install obspy==${OBSPY_VERSION} ipython jupyter basemap nomkl sqlalchemy pyshp cryptography basemap-data-hires geographiclib
       fi
   # list package versions
   - conda env export

diff --git a/appveyor.yml b/appveyor.yml
@@ -9,7 +9,7 @@ environment:
     # /E:ON and /V:ON options are not enabled in the batch script intepreter
     # See: http://stackoverflow.com/a/13751649/163740
     CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\misc\\appveyor\\run_with_env.cmd"
-    OBSPY_VERSION: "1.0.3"
+    OBSPY_VERSION: "1.1.0"
 
   matrix:
     # Pre-installed Python versions, which Appveyor may upgrade to
@@ -29,16 +29,16 @@ environment:
       CONDA_PYSUFFIX: "py27"
 
     - PYTHON: "C:\\Miniconda35-x64"
-      PYTHON_VERSION: "3.5"
+      PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "64"
       CONDA_PLATFORM: "win-64"
-      CONDA_PYSUFFIX: "py35"
+      CONDA_PYSUFFIX: "py36"
 
     - PYTHON: "C:\\Miniconda35"
-      PYTHON_VERSION: "3.5"
+      PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "32"
       CONDA_PLATFORM: "win-32"
-      CONDA_PYSUFFIX: "py35"
+      CONDA_PYSUFFIX: "py36"
 
 platform:
   - x64
@@ -67,7 +67,11 @@ install:
   - "conda info -a"
   - "conda create -q --yes -n test python=%PYTHON_VERSION%"
   - "activate test"
-  - "conda install --yes obspy==%OBSPY_VERSION% ipython jupyter basemap basemap-data-hires sqlalchemy gdal mkl"
+  - ps: |
+      If ($env:PYTHON_VERSION -eq "2.7") {
+          conda install --yes mock
+      }
+  - "conda install --yes obspy==%OBSPY_VERSION% ipython jupyter basemap basemap-data-hires sqlalchemy pyshp mkl geographiclib cryptography"
   # list package versions
   - "conda env export"
   - "conda list --explicit"