[CI] Enable all Python version and suppress clobber messages.

tharen · Jun 22, 2018 · faf27ec · faf27ec
1 parent b55b793
commit faf27ec
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/.appveyor/setup_conda.bat b/.appveyor/setup_conda.bat
@@ -10,7 +10,7 @@ REM Create the conda environment
 REM conda env create -q -n pyfvs -f %APPVEYOR_BUILD_FOLDER%\\environment.yml
 
 set pkg=numpy pandas cython pyodbc click setuptools wheel sphinx alabaster matplotlib pip twine
-conda create -y -q --update-dependencies -n=pyfvs python=%PYTHON_VERSION% %pkg%
+conda create -y -q --update-deps --clobber -n=pyfvs python=%PYTHON_VERSION% %pkg%
 call activate pyfvs
 pip install pytest sphinxcontrib-napoleon
 

diff --git a/.travis-ci/setup_conda.sh b/.travis-ci/setup_conda.sh
@@ -8,7 +8,7 @@ conda config --add channels conda-forge
 
 export pkg="numpy pandas cython pyodbc click setuptools wheel sphinx alabaster matplotlib pip twine"
 
-conda create -y -q --update-deps -n pyfvs python=$TRAVIS_PYTHON_VERSION $pkg
+conda create -y -q --update-deps --clobber -n pyfvs python=$TRAVIS_PYTHON_VERSION $pkg
 source activate pyfvs
 pip install pytest sphinxcontrib-napoleon
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -5,8 +5,8 @@ environment:
     MPLBACKEND: "agg"
     MINGW_PATH: "C:\\mingw-w64\\x86_64-6.3.0-posix-seh-rt_v5-rev1\\mingw64"
 
-    # FVS_VARIANTS: "pnc;wcc;soc;cac;ecc;oc;op"
-    FVS_VARIANTS: pnc
+    FVS_VARIANTS: "pnc;wcc;soc;cac;ecc;oc;op"
+    #FVS_VARIANTS: pnc
 
     TWINE_PASSWORD:
         secure: lLhgSTVGnQNINPD18gIe2g==
@@ -16,22 +16,22 @@ environment:
   matrix:
     # https://www.appveyor.com/docs/build-environment/#miniconda
 
-    # - MINICONDA: "C:\\Miniconda-x64"
-      # PYTHON_VERSION: "2.7"
-      # PYTHON_ARCH: "64"
-
     # NOTE: Using the 36 install, since it is the most current version of conda
+    - MINICONDA: "C:\\Miniconda36-x64"
+      PYTHON_VERSION: "2.7"
+      PYTHON_ARCH: "64"
+
     - MINICONDA: "C:\\Miniconda36-x64"
       PYTHON_VERSION: "3.4"
       PYTHON_ARCH: "64"
 
-    # - MINICONDA: "C:\\Miniconda35-x64"
-      # PYTHON_VERSION: "3.5"
-      # PYTHON_ARCH: "64"
+    - MINICONDA: "C:\\Miniconda36-x64"
+      PYTHON_VERSION: "3.5"
+      PYTHON_ARCH: "64"
 
-    # - MINICONDA: "C:\\Miniconda36-x64"
-      # PYTHON_VERSION: "3.6"
-      # PYTHON_ARCH: "64"
+    - MINICONDA: "C:\\Miniconda36-x64"
+      PYTHON_VERSION: "3.6"
+      PYTHON_ARCH: "64"
 
 init:
     - echo PYTHON_VERSION %PYTHON_VERSION%