Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ env:
- MAIN_CMD='python setup.py'
- NUMPY_VERSION=stable
- ASTROPY_VERSION=stable
- CONDA_DEPENDENCIES='requests beautifulsoup4 matplotlib html5lib keyring aplpy pyregion qt=4'
- CONDA_DEPENDENCIES='requests beautifulsoup4 matplotlib html5lib keyring aplpy pyregion'
- PIP_DEPENDENCIES=''
- SETUP_CMD='test'
- CONDA_CHANNELS='astropy-ci-extras astropy'
- CONDA_DEPENDENCIES_OLD='requests beautiful-soup matplotlib html5lib qt=4'
- CONDA_DEPENDENCIES_OLD='requests beautiful-soup matplotlib html5lib'
- PIP_DEPENDENCIES_OLD='pyregion aplpy keyring'

matrix:
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
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 pyregion qt=4"
CONDA_DEPENDENCIES: "requests beautifulsoup4 matplotlib html5lib keyring aplpy pyregion"
CONDA_CHANNELS: "astropy"

matrix:
Expand Down