Do not test against Py3.5

insilichem · Feb 20, 2018 · 1d93d02 · 1d93d02
1 parent 39b0e01
commit 1d93d02
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -3,11 +3,6 @@ environment:
   BINSTAR_TOKEN:
     secure: zW96v77uhbDdArc0805i/CDIvVpZvqCJyJ+WgSE1b65nPLO0nGUwmZ9qshUICIba
   matrix:
-    - PYTHON: "C:\\Python35_64"
-      PYTHON_VERSION: "3.5"
-      PYTHON_ARCH: "64"
-      CONDA_PY: "35"
-
     - PYTHON: "C:\\Python36_64"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "64"
@@ -30,7 +25,7 @@ install:
   - conda build -c omnia -c bioconda devtools/conda-recipe
   - IF "%conda_upload%"=="true" conda install -y  constructor
   - IF "%conda_upload%"=="true" conda remove -y --force constructor
-  - IF "%conda_upload%"=="true" pip install -U https://github.com/jaimergp/constructor/archive/jinja-env.zip
+  - IF "%conda_upload%"=="true" pip install -U --no-deps https://github.com/jaimergp/constructor/archive/jinja-env.zip
   - IF "%conda_upload%"=="true" constructor .
 
 artifacts:

diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@
 env:
   matrix:
   - MYCONDAPY=2.7
-  - MYCONDAPY=3.5
   - MYCONDAPY=3.6
 
 ####
@@ -94,7 +93,7 @@ before_deploy:
 - if [ "${MYCONDAPY}" = "3.6" ]; then
     conda install constructor;
     conda remove --force constructor;
-    pip install -U https://github.com/jaimergp/constructor/archive/jinja-env.zip;
+    pip install -U --no-deps https://github.com/jaimergp/constructor/archive/jinja-env.zip;
     export CONDA_PREFIX=$HOME/miniconda;
     constructor . ;
   fi

diff --git a/construct.yaml b/construct.yaml
@@ -10,6 +10,7 @@ channels:
   - https://conda.anaconda.org/insilichem
   - https://conda.anaconda.org/omnia
   - https://repo.continuum.io/pkgs/main/
+  - https://conda.anaconda.org/conda-forge     [win]
 
 conda_default_channels:
   - https://conda.anaconda.org/insilichem

diff --git a/devtools/ci/install-miniconda.ps1 b/devtools/ci/install-miniconda.ps1
@@ -7,10 +7,10 @@ $MINICONDA_URL = "http://repo.continuum.io/miniconda/"
 
 function DownloadMiniconda ($python_version, $platform_suffix) {
     $webclient = New-Object System.Net.WebClient
-    if ($python_version -match "3.4") {
-        $filename = "Miniconda3-latest-Windows-" + $platform_suffix + ".exe"
-    } else {
+    if ($python_version -match "2.7") {
         $filename = "Miniconda2-latest-Windows-" + $platform_suffix + ".exe"
+    } else {
+        $filename = "Miniconda3-latest-Windows-" + $platform_suffix + ".exe"
     }
     $url = $MINICONDA_URL + $filename