Skip to content

Temporarily imit keyring version for all <3.6 python versions #1123

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 4 commits into from
Apr 27, 2018
Merged

Temporarily imit keyring version for all <3.6 python versions #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
762aba5
Temporarily imit keyring version for all <3.6 python versions
bsipocz Apr 24, 2018
39e5551
Limit keyring in conda_dependencies as ci-helpers can't yet handle in…
bsipocz Apr 27, 2018
8d7bc35
Apparently the newer python is required...
bsipocz Apr 27, 2018
581ee76
Pin sip, too for appveyor [skip travis]
bsipocz Apr 27, 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
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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.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'
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 @@ -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 sip=4.18"
PIP_DEPENDENCIES: "pyregion"
CONDA_CHANNELS: "astropy"
ASTROPY_USE_SYSTEM_PYTEST: 1
Expand Down