Skip to content

Commit 3b5936a

Browse files
authored
Merge pull request #1123 from bsipocz/tests_keyring_pin
Temporarily imit keyring version for all <3.6 python versions
2 parents f955121 + 581ee76 commit 3b5936a

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ env:
4848
- EVENT_TYPE='pull_request push'
4949
- ASTROPY_USE_SYSTEM_PYTEST=1
5050
- SPHINX_VERSION='>=1.6'
51+
- DEBUG=true
5152

5253
matrix:
5354
- PYTHON_VERSION=2.7 SETUP_CMD='egg_info'
@@ -102,7 +103,8 @@ matrix:
102103
env: PYTHON_VERSION=3.4 NUMPY_VERSION=1.10
103104
- os: linux
104105
stage: Tests with other Python/Numpy versions, remote data
105-
env: PYTHON_VERSION=3.5 NUMPY_VERSION=1.11
106+
env: PYTHON_VERSION=3.5.5 NUMPY_VERSION=1.11 KEYRING_VERSION='<12.0'
107+
106108
- os: linux
107109
stage: Tests with other Python/Numpy versions, remote data
108110
env: NUMPY_VERSION=1.12 ASTROPY_VERSION=1.3 PYTEST_VERSION='<3.2'

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ environment:
1010
PYTHON_ARCH: "64" # needs to be set for CMD_IN_ENV to succeed. If a mix
1111
# of 32 bit and 64 bit builds are needed, move this
1212
# to the matrix section.
13-
CONDA_DEPENDENCIES: "requests beautifulsoup4 matplotlib html5lib keyring aplpy"
13+
CONDA_DEPENDENCIES: "requests beautifulsoup4 matplotlib html5lib keyring=11 aplpy sip=4.18"
1414
PIP_DEPENDENCIES: "pyregion"
1515
CONDA_CHANNELS: "astropy"
1616
ASTROPY_USE_SYSTEM_PYTEST: 1

0 commit comments

Comments
 (0)