Skip to content

Commit fa9a34b

Browse files
authored
Merge pull request #1697 from bsipocz/travis_fix_reproject_install [nodeploy]
Travis fix reproject install
2 parents b176522 + 96d3167 commit fa9a34b

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

.travis.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ env:
3434
- MAIN_CMD='python setup.py'
3535
- NUMPY_VERSION=stable
3636
- ASTROPY_VERSION=stable
37-
- CONDA_DEPENDENCIES='requests beautifulsoup4 html5lib keyring aplpy matplotlib pyregion jinja2 flask regions'
38-
- CONDA_DEPENDENCIES_REMOTE='requests beautifulsoup4 html5lib keyring aplpy matplotlib pyregion jinja2 flask regions'
39-
- PIP_DEPENDENCIES='https://github.com/keflavich/httpbin/archive/master.zip astropy_healpix mocpy>=0.5.2 pytest-dependency pytest-astropy pyvo'
37+
- CONDA_DEPENDENCIES='requests beautifulsoup4 html5lib keyring matplotlib jinja2 flask'
38+
- CONDA_DEPENDENCIES_REMOTE='requests beautifulsoup4 html5lib keyring matplotlib jinja2 flask'
39+
- PIP_DEPENDENCIES='https://github.com/keflavich/httpbin/archive/master.zip aplpy pyregion regions astropy_healpix mocpy>=0.5.2 pytest-dependency pytest-astropy pyvo'
4040
- HTTP_BIN_CMD="import httpbin; httpbin.app.run()"
4141
- RUN_HTTPBIN='python -c "$HTTP_BIN_CMD" & ACTIVE_HTTPBIN=True'
4242
- SETUP_CMD='test'
@@ -58,27 +58,30 @@ jobs:
5858
# both short and long versions for remote-data to help test the
5959
# astropy test command.
6060
- os: linux
61+
name: Remote data test with astropy dev, Python 3.7
6162
stage: Remote data tests
6263
env: EVENT_TYPE='push cron' DEBUG=True ASTROPY_VERSION=dev
6364
SETUP_CMD='test -R -V -a "--durations=50"'
6465
CONDA_DEPENDENCIES=$CONDA_DEPENDENCIES_REMOTE
6566

6667
- stage: Initial tests
68+
name: egg info
6769
env: PYTHON_VERSION=3.7 SETUP_CMD='egg_info'
6870

69-
# No need to run it from cron
70-
# Try MacOS X
7171
- os: osx
72+
name: OSX from cron
7273
stage: Cron tests
7374
env: EVENT_TYPE='cron'
7475

7576
- os: linux
7677
stage: Initial tests
78+
name: Python 3.7 and all dependencies
7779
env: SETUP_CMD='test --coverage'
7880

7981
# Check for sphinx doc build warnings - we do this first because it
8082
# may run for a long time
8183
- os: linux
84+
name: Docs build
8285
stage: Test docs, astropy dev, and without optional dependencies
8386
env: SETUP_CMD='build_docs -w'
8487

@@ -89,21 +92,26 @@ jobs:
8992
# master for cron jobs. secretstorage is a keyring dependency, we
9093
# need to pin the version number to make this job work.
9194
# Test the oldest astropy version without optional dependencies.
95+
# Reproject is listed as dependency to avoid upgrading astropy
9296
- os: linux
97+
name: Oldest dependencies
9398
stage: Tests with other Python/Numpy versions
9499
env: PYTHON_VERSION=3.6 NUMPY_VERSION=1.14 KEYRING_VERSION='<12.0'
95-
ASTROPY_VERSION=3.0 APLPY_VERSION='<2.0' DEBUG=True
96-
100+
ASTROPY_VERSION=3.0 DEBUG=True
101+
PIP_DEPENDENCIES="`echo $PIP_DEPENDENCIES reproject==0.5 | sed 's/aplpy/aplpy<2.0/'`"
97102
- os: linux
103+
name: Python 3.6, np 1.15, astropy 3.2
98104
stage: Tests with other Python/Numpy versions
99105
env: PYTHON_VERSION=3.6 NUMPY_VERSION=1.15 ASTROPY_VERSION=3.2
100106

101107
- os: linux
108+
name: Python 3.7, astropy dev
102109
stage: Test docs, astropy dev, and without optional dependencies
103110
env: ASTROPY_VERSION=development EVENT_TYPE='pull_request'
104111

105112
# Try with optional dependencies disabled
106113
- os: linux
114+
name: Python 3.8, mandatory dependencies only
107115
stage: Test docs, astropy dev, and without optional dependencies
108116
env: PYTHON_VERSION=3.8
109117
CONDA_DEPENDENCIES='requests beautifulsoup4 html5lib keyring'
@@ -112,12 +120,14 @@ jobs:
112120

113121
# Do a PEP8 test with pycodestyle
114122
- os: linux
123+
name: Code style
115124
stage: Initial tests
116125
env: MAIN_CMD='pycodestyle astroquery --count'
117126
SETUP_CMD='' EVENT_TYPE='push pull_request'
118127

119128
# Do the windows test at the end as installing takes a long time
120129
- os: windows
130+
name: Windows test
121131
stage: Windows test
122132
env: PYTHON_VERSION=3.7 SETUP_CMD='test'
123133

@@ -137,6 +147,7 @@ jobs:
137147
allow_failures:
138148
# Allow remote-data tests to fail.
139149
- os: linux
150+
name: Remote data test with astropy dev, Python 3.7
140151
stage: Remote data tests
141152
env: EVENT_TYPE='push cron' DEBUG=True ASTROPY_VERSION=dev
142153
SETUP_CMD='test -R -V -a "--durations=50"'

0 commit comments

Comments
 (0)