Skip to content

Limit keyring version for legacy Python #1103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 18, 2018
Merged

Limit keyring version for legacy Python #1103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88b3c27
Limit keyring version for legacy Python
bsipocz Apr 18, 2018
626502b
Trying using the default conda channels instead of conda-forge [skip …
bsipocz Apr 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down