@@ -14,7 +14,6 @@ addons:
1414
1515python :
1616 - 2.7
17- - 3.3
1817 - 3.4
1918
2019env :
2322 # overidden underneath. They are defined here in order to save having
2423 # to repeat them for all configurations.
2524 - MAIN_CMD='python setup.py'
26- - NUMPY_VERSION=1.9
25+ - NUMPY_VERSION=1.10
2726 - ASTROPY_VERSION=stable
2827 - CONDA_DEPENDENCIES='requests beautiful-soup matplotlib html5lib'
2928 - PIP_DEPENDENCIES='keyring aplpy pyregion'
3635matrix :
3736 include :
3837
38+ # Test for py 3.5 (move this up to the main matrix once beautiful-soup is in conda)
39+ - python : 3.5
40+ env : SETUP_CMD='egg_info'
41+ - python : 3.5
42+ env : SETUP_CMD='test'
43+ CONDA_DEPENDENCIES='requests matplotlib html5lib'
44+ PIP_DEPENDENCIES='keyring aplpy pyregion beautifulsoup4'
45+
3946 # Do a coverage test in Python 2.
4047 - python : 2.7
4148 env : SETUP_CMD='test --coverage'
@@ -45,23 +52,40 @@ matrix:
4552 - python : 2.7
4653 env : SETUP_CMD='build_sphinx -w'
4754
48- # Try Astropy development version
55+ # Python 3.3 doesn't have numpy 1.10 in conda, revoke this commit once
56+ # it's available in the astropy-ci-extras channel
57+ - python : 3.3
58+ env : SETUP_CMD='egg_info'
59+ - python : 3.3
60+ env : SETUP_CMD='test' NUMPY_VERSION=1.9
61+
62+ # Try Astropy development and LTS version
4963 - python : 2.7
5064 env : ASTROPY_VERSION=development SETUP_CMD='test'
51- - python : 3.4
65+ - python : 3.5
5266 env : ASTROPY_VERSION=development SETUP_CMD='test'
67+ CONDA_DEPENDENCIES='requests matplotlib html5lib'
68+ PIP_DEPENDENCIES='keyring aplpy pyregion beautifulsoup4'
69+ - python : 2.7
70+ env : ASTROPY_VERSION=lts SETUP_CMD='test'
71+ - python : 3.5
72+ env : ASTROPY_VERSION=lts SETUP_CMD='test'
73+ CONDA_DEPENDENCIES='requests matplotlib html5lib'
74+ PIP_DEPENDENCIES='keyring aplpy pyregion beautifulsoup4'
5375
5476 # Try with optional dependencies disabled
5577 - python : 2.7
5678 env : SETUP_CMD='test'
5779 CONDA_DEPENDENCIES='requests beautiful-soup html5lib'
5880 PIP_DEPENDENCIES='keyring'
59- - python : 3.4
81+ - python : 3.5
6082 env : SETUP_CMD='test'
61- CONDA_DEPENDENCIES='requests beautiful-soup html5lib'
62- PIP_DEPENDENCIES='keyring'
83+ CONDA_DEPENDENCIES='requests html5lib'
84+ PIP_DEPENDENCIES='keyring beautifulsoup4 '
6385
6486 # Try older numpy versions
87+ - python : 2.7
88+ env : NUMPY_VERSION=1.9 SETUP_CMD='test'
6589 - python : 2.7
6690 env : NUMPY_VERSION=1.8 SETUP_CMD='test'
6791 - python : 2.7
0 commit comments