From 94bca64bc4841db4ff2182b582ebdd4e929fc430 Mon Sep 17 00:00:00 2001 From: Levi Naden Date: Mon, 11 Nov 2019 07:46:45 -0500 Subject: [PATCH 1/4] Update tests for python 3.8 AppVeyor ins't there yet, but we will likely drop support for it in the future --- .travis.yml | 4 ++-- appveyor.yml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index b2d9ec32..ed508ab5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,8 +32,8 @@ script: env: matrix: - python=2.7 CONDA_PY=27 - - python=3.5 CONDA_PY=35 - - python=3.6 CONDA_PY=36 + - python=3.7 CONDA_PY=37 + - python=3.8 CONDA_PY=38 global: - ORGNAME="conda-forge" diff --git a/appveyor.yml b/appveyor.yml index 88cb0066..106c87d1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,18 +12,18 @@ environment: CONDA_PY: "27" CONDA_NPY: "112" - - PYTHON: "C:\\Python35_64" - PYTHON_VERSION: "3.5" - PYTHON_ARCH: "64" - CONDA_PY: "35" - CONDA_NPY: "112" - - PYTHON: "C:\\Python36_64" PYTHON_VERSION: "3.6" PYTHON_ARCH: "64" CONDA_PY: "36" CONDA_NPY: "112" + - PYTHON: "C:\\Python37_64" + PYTHON_VERSION: "3.7" + PYTHON_ARCH: "64" + CONDA_PY: "37" + CONDA_NPY: "112" + install: # this installs the appropriate Miniconda (Py2/Py3, 32/64 bit), # as well as pip, conda-build, and the binstar CLI From 9d55cb6033408a33c1eb1cdeeaa6b9e34e082f05 Mon Sep 17 00:00:00 2001 From: Levi Naden Date: Mon, 11 Nov 2019 09:29:32 -0500 Subject: [PATCH 2/4] Relax MD5testing a bit, Remove the conda-build pin --- devtools/travis-ci/install.sh | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/devtools/travis-ci/install.sh b/devtools/travis-ci/install.sh index 774273b3..8a4c57f6 100644 --- a/devtools/travis-ci/install.sh +++ b/devtools/travis-ci/install.sh @@ -3,28 +3,22 @@ pushd . cd $HOME # Install Miniconda -MINICONDA=Miniconda2-latest-Linux-x86_64.sh +# Sed cuts out everything before the first digit, then traps the first digit and everything after MINICONDA_HOME=$HOME/miniconda MINICONDA_MD5=$(curl -s https://repo.continuum.io/miniconda/ | grep -A3 $MINICONDA | sed -n '4p' | sed -n 's/ *\(.*\)<\/td> */\1/p') -wget -q http://repo.continuum.io/miniconda/$MINICONDA -# Parse version out of file as fall back -# Sed cuts out everything before the first digit, then traps the first digit and everything after -MINICONDA_DL_VER=$(head $MINICONDA | grep VER | sed -n 's/[^0-9]*\([0-9.]*\)/\1/p') -MINICONDA_FILE_VER="Miniconda2-$MINICONDA_DL_VER-Linux-x86_64.sh" -MINICONDA_MD5_VER=$(curl -s https://repo.continuum.io/miniconda/ | grep -A3 $MINICONDA_FILE_VER | sed -n '4p' | sed -n 's/ *\(.*\)<\/td> */\1/p') +wget -q https://repo.continuum.io/miniconda/$MINICONDA if [[ $MINICONDA_MD5 != $(md5sum $MINICONDA | cut -d ' ' -f 1) ]]; then - if [[ $MINICONDA_MD5_VER != $(md5sum $MINICONDA | cut -d ' ' -f 1) ]]; then - echo "Miniconda MD5 mismatch" - exit 1 - fi + echo "Miniconda MD5 mismatch" + exit 1 fi + bash $MINICONDA -b -p $MINICONDA_HOME # Configure miniconda export PIP_ARGS="-U" export PATH=$MINICONDA_HOME/bin:$PATH conda update --yes conda -conda install --yes conda-build=2.1.17 jinja2 anaconda-client pip +conda install --yes conda-build jinja2 anaconda-client pip # Restore original directory popd From 027e049d872c10588cca8d1f4890580ebd0374d1 Mon Sep 17 00:00:00 2001 From: Levi Naden Date: Mon, 11 Nov 2019 16:14:45 -0500 Subject: [PATCH 3/4] Fix the travis script, fix the appveyor? --- appveyor.yml | 2 +- devtools/travis-ci/install.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 106c87d1..7756ae7b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,8 +29,8 @@ install: # as well as pip, conda-build, and the binstar CLI - ps: . ".\\devtools\\appveyor\\install.ps1" - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - - conda update conda-build jinja2 - conda config --add channels conda-forge + - conda install conda-build jinja2 build: false diff --git a/devtools/travis-ci/install.sh b/devtools/travis-ci/install.sh index 8a4c57f6..586ab6d1 100644 --- a/devtools/travis-ci/install.sh +++ b/devtools/travis-ci/install.sh @@ -3,6 +3,7 @@ pushd . cd $HOME # Install Miniconda +MINICONDA=Miniconda3-latest-Linux-x86_64.sh # Sed cuts out everything before the first digit, then traps the first digit and everything after MINICONDA_HOME=$HOME/miniconda MINICONDA_MD5=$(curl -s https://repo.continuum.io/miniconda/ | grep -A3 $MINICONDA | sed -n '4p' | sed -n 's/ *\(.*\)<\/td> */\1/p') From 754f0ed58951ac9d7bda061a1f0b6d69c2b6c441 Mon Sep 17 00:00:00 2001 From: Levi Naden Date: Tue, 12 Nov 2019 19:30:32 -0500 Subject: [PATCH 4/4] May as well try to fix appveyor by at least not letting it hang --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 7756ae7b..5c68c344 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,7 +30,7 @@ install: - ps: . ".\\devtools\\appveyor\\install.ps1" - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - conda config --add channels conda-forge - - conda install conda-build jinja2 + - conda install --yes conda-build jinja2 build: false