From 88b3c274dda6a013efd51628f015542641d3dfc6 Mon Sep 17 00:00:00 2001 From: Brigitta Sipocz Date: Wed, 18 Apr 2018 04:06:33 +0100 Subject: [PATCH 1/2] Limit keyring version for legacy Python --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3bf721ef5b..5096d4f120 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ matrix: - os: linux stage: Tests with other Python/Numpy versions, remote data env: EVENT_TYPE='push cron' PYTHON_VERSION=2.7 - SETUP_CMD='test --remote-data -V' CONDA_DEPENDENCIES=$CONDA_DEPENDENCIES_REMOTE + SETUP_CMD='test --remote-data -V' CONDA_DEPENDENCIES=$CONDA_DEPENDENCIES_REMOTE KEYRING_VERSION='<12.0' # No need to run it from cron # Try MacOS X @@ -96,7 +96,7 @@ matrix: # time. We don't expect any of these to fail in master for cron jobs. - os: linux stage: Tests with other Python/Numpy versions, remote data - env: PYTHON_VERSION=2.7 NUMPY_VERSION=1.9 + env: PYTHON_VERSION=2.7 NUMPY_VERSION=1.9 KEYRING_VERSION='<12.0' - os: linux stage: Tests with other Python/Numpy versions, remote data env: PYTHON_VERSION=3.4 NUMPY_VERSION=1.10 @@ -129,7 +129,7 @@ matrix: # Try with optional dependencies disabled - os: linux stage: Test docs, astropy dev, and without optional dependencies - env: PYTHON_VERSION=2.7 + env: PYTHON_VERSION=2.7 KEYRING_VERSION='<12.0' CONDA_DEPENDENCIES='requests beautifulsoup4 html5lib keyring' - os: linux stage: Test docs, astropy dev, and without optional dependencies From 626502b7561c990cc9a6720164026665cae8c68a Mon Sep 17 00:00:00 2001 From: Brigitta Sipocz Date: Wed, 18 Apr 2018 12:31:05 +0100 Subject: [PATCH 2/2] Trying using the default conda channels instead of conda-forge [skip travis] --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 5b7c1c0a4c..c069b9a2fe 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ environment: # to the matrix section. CONDA_DEPENDENCIES: "requests beautifulsoup4 matplotlib html5lib keyring aplpy" PIP_DEPENDENCIES: "pyregion" - CONDA_CHANNELS: "astropy conda-forge" + CONDA_CHANNELS: "astropy" ASTROPY_USE_SYSTEM_PYTEST: 1 matrix: