From 762aba516956fc94e69cb0b9683f32243a6e1658 Mon Sep 17 00:00:00 2001 From: Brigitta Sipocz Date: Tue, 24 Apr 2018 12:01:42 +0100 Subject: [PATCH 1/4] Temporarily imit keyring version for all <3.6 python versions --- .travis.yml | 4 +++- appveyor.yml | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5096d4f120..daad35600c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,6 +48,7 @@ env: - EVENT_TYPE='pull_request push' - ASTROPY_USE_SYSTEM_PYTEST=1 - SPHINX_VERSION='>=1.6' + - DEBUG=true matrix: - PYTHON_VERSION=2.7 SETUP_CMD='egg_info' @@ -102,7 +103,8 @@ matrix: env: PYTHON_VERSION=3.4 NUMPY_VERSION=1.10 - os: linux stage: Tests with other Python/Numpy versions, remote data - env: PYTHON_VERSION=3.5 NUMPY_VERSION=1.11 + env: PYTHON_VERSION=3.5 NUMPY_VERSION=1.11 KEYRING_VERSION='<12.0' + - os: linux stage: Tests with other Python/Numpy versions, remote data env: NUMPY_VERSION=1.12 ASTROPY_VERSION=1.3 PYTEST_VERSION='<3.2' diff --git a/appveyor.yml b/appveyor.yml index c069b9a2fe..22a9e85827 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,6 +19,7 @@ environment: - PYTHON_VERSION: "2.7" ASTROPY_VERSION: "LTS" NUMPY_VERSION: "1.13" + KEYRING_VERSION: "<12" - PYTHON_VERSION: "3.6" ASTROPY_VERSION: "stable" From 39e5551d284d3c4e57da4879a3cc0e3342c5e52d Mon Sep 17 00:00:00 2001 From: Brigitta Sipocz Date: Fri, 27 Apr 2018 16:12:27 +0100 Subject: [PATCH 2/4] Limit keyring in conda_dependencies as ci-helpers can't yet handle individual limits for appveyor [skip travis] --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 22a9e85827..d75defb2df 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,7 +10,7 @@ environment: PYTHON_ARCH: "64" # needs to be set for CMD_IN_ENV to succeed. If a mix # of 32 bit and 64 bit builds are needed, move this # to the matrix section. - CONDA_DEPENDENCIES: "requests beautifulsoup4 matplotlib html5lib keyring aplpy" + CONDA_DEPENDENCIES: "requests beautifulsoup4 matplotlib html5lib keyring=11 aplpy" PIP_DEPENDENCIES: "pyregion" CONDA_CHANNELS: "astropy" ASTROPY_USE_SYSTEM_PYTEST: 1 @@ -19,7 +19,6 @@ environment: - PYTHON_VERSION: "2.7" ASTROPY_VERSION: "LTS" NUMPY_VERSION: "1.13" - KEYRING_VERSION: "<12" - PYTHON_VERSION: "3.6" ASTROPY_VERSION: "stable" From 8d7bc358950add6539331c6b22de49f96de2b472 Mon Sep 17 00:00:00 2001 From: Brigitta Sipocz Date: Fri, 27 Apr 2018 16:40:16 +0100 Subject: [PATCH 3/4] Apparently the newer python is required... --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index daad35600c..266d1e98dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -103,7 +103,7 @@ matrix: env: PYTHON_VERSION=3.4 NUMPY_VERSION=1.10 - os: linux stage: Tests with other Python/Numpy versions, remote data - env: PYTHON_VERSION=3.5 NUMPY_VERSION=1.11 KEYRING_VERSION='<12.0' + env: PYTHON_VERSION=3.5.5 NUMPY_VERSION=1.11 KEYRING_VERSION='<12.0' - os: linux stage: Tests with other Python/Numpy versions, remote data From 581ee763720fc892382822a4b78cef462b7c7152 Mon Sep 17 00:00:00 2001 From: Brigitta Sipocz Date: Fri, 27 Apr 2018 17:52:49 +0100 Subject: [PATCH 4/4] Pin sip, too for appveyor [skip travis] --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index d75defb2df..3b7926a76c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,7 +10,7 @@ environment: PYTHON_ARCH: "64" # needs to be set for CMD_IN_ENV to succeed. If a mix # of 32 bit and 64 bit builds are needed, move this # to the matrix section. - CONDA_DEPENDENCIES: "requests beautifulsoup4 matplotlib html5lib keyring=11 aplpy" + CONDA_DEPENDENCIES: "requests beautifulsoup4 matplotlib html5lib keyring=11 aplpy sip=4.18" PIP_DEPENDENCIES: "pyregion" CONDA_CHANNELS: "astropy" ASTROPY_USE_SYSTEM_PYTEST: 1