Merge pull request #2102 from ericpre/disable_python35_test_appveyor

Disable a couple of CI builds
hyperspy · Dec 6, 2018 · 1158b95 · 1158b95
2 parents cf2e23b + 8451306
commit 1158b95
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 41 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,9 +21,11 @@ matrix:
   - env: export PYTHON=3.6; FAIL_ON_EXTERNAL_DEPRECATION='False'; MINIMAL_ENV='False'
     os: osx
     language: generic
+    if: tag IS present
   - env: export PYTHON=3.5; FAIL_ON_EXTERNAL_DEPRECATION='False'; MINIMAL_ENV='False'
     os: osx
     language: generic
+    if: tag IS present
   allow_failures:
     # Only test for the latest supported version as chances are that it'll
     # contain the most up-to-date external libraries.

diff --git a/appveyor.yml b/appveyor.yml
@@ -5,65 +5,39 @@ environment:
 
   global:
     TEST_DEPS: "pytest pytest-cov pytest-mpl wheel"
+    DEPS: "numpy scipy matplotlib=2.2.3 ipython h5py sympy scikit-learn dill setuptools natsort scikit-image cython ipyparallel dask numexpr sparse numba"
     MPLBACKEND: "agg"
 
 
   matrix:
-
-    # Pre-installed Python versions, which Appveyor may upgrade to
-    # a later point release.
      - PYTHON: "C:\\Miniconda35"
-       PYTHON_VERSION: "3.5.x"
-       PYTHON_MAJOR: 3
-       PYTHON_ARCH: "32"
-       CONDA_PY: "35"
-       DEPS: "numpy scipy matplotlib=2.2.3 ipython h5py sympy scikit-learn dill setuptools natsort scikit-image cython ipyparallel dask numexpr sparse numba"
-
+       TAG_SCENARIO: true
      - PYTHON: "C:\\Miniconda35-x64"
-       PYTHON_VERSION: "3.5.x"
-       PYTHON_MAJOR: 3
-       PYTHON_ARCH: "64"
-       CONDA_PY: "35"
-       DEPS: "numpy scipy matplotlib=2.2.3 ipython h5py sympy scikit-learn dill setuptools natsort scikit-image cython ipyparallel dask numexpr sparse numba"
-
+       TAG_SCENARIO: true
      - PYTHON: "C:\\Miniconda36"
-       PYTHON_VERSION: "3.6.x"
-       PYTHON_MAJOR: 3
-       PYTHON_ARCH: "32"
-       CONDA_PY: "36"
-       DEPS: "numpy scipy matplotlib=2.2.3 ipython h5py sympy scikit-learn dill setuptools natsort scikit-image cython ipyparallel dask numexpr sparse numba"
-
+       TAG_SCENARIO: true
      - PYTHON: "C:\\Miniconda36-x64"
-       PYTHON_VERSION: "3.6.x"
-       PYTHON_MAJOR: 3
-       PYTHON_ARCH: "64"
-       CONDA_PY: "36"
-       DEPS: "numpy scipy matplotlib=2.2.3 ipython h5py sympy scikit-learn dill setuptools natsort scikit-image cython ipyparallel dask numexpr sparse numba"
-
      - PYTHON: "C:\\Miniconda37"
-       PYTHON_VERSION: "3.7.x"
-       PYTHON_MAJOR: 3
-       PYTHON_ARCH: "32"
-       CONDA_PY: "37"
-       DEPS: "numpy scipy matplotlib=2.2.3 ipython h5py sympy scikit-learn dill setuptools natsort scikit-image cython ipyparallel dask numexpr sparse numba"
-
      - PYTHON: "C:\\Miniconda37-x64"
-       PYTHON_VERSION: "3.7.x"
-       PYTHON_MAJOR: 3
-       PYTHON_ARCH: "64"
-       CONDA_PY: "37"
-       DEPS: "numpy scipy matplotlib=2.2.3 ipython h5py sympy scikit-learn dill setuptools natsort scikit-image cython ipyparallel dask numexpr sparse numba"
+
+for:
+-
+  # tagged scenario
+  matrix:
+    only:
+      - TAG_SCENARIO: true
+
+  skip_non_tags: true
 
 
 init:
-  - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
+  - "ECHO %PYTHON%"
   - "ECHO %APPVEYOR_BUILD_FOLDER%"
   - "ECHO %CMD_IN_ENV%"
 
 install:
   - ps: Add-AppveyorMessage "Starting install..."
-  # Prepend Python to the PATH
-  - "SET ORIGPATH=%PATH%"
+  # Prepend miniconda Python to the PATH
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
 
   # Check that we have the expected version and architecture for Python