Skip to content

Commit ce9bf4e

Browse files
authored
Merge pull request #970 from aphearin/travis_bugfixes
Remove testing on Travis for python < 3.7
2 parents 0f40e0c + 8bb92d6 commit ce9bf4e

File tree

2 files changed

+14
-34
lines changed

2 files changed

+14
-34
lines changed

.travis.yml

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
language: python
22

33
python:
4-
- 2.7
5-
- 3.3
6-
- 3.4
7-
- 3.5
8-
- 3.6
4+
- 3.7
95

106
# Setting sudo to false opts in to Travis-CI container-based builds.
117
sudo: false
@@ -39,52 +35,36 @@ env:
3935

4036
matrix:
4137
include:
42-
# Do a coverage test in Python 3
43-
- python: 2.7
38+
# Coverage test in Python 3.7
39+
- python: 3.7
4440
env: SETUP_CMD='test --coverage'
4541

46-
# Check for sphinx doc build warnings - we do this first because it
47-
# may run for a long time
48-
- python: 2.7
49-
env: SETUP_CMD='build_sphinx -w'
50-
5142
# Significant docstring formatting changes in 3.6, so we check both
52-
- python: 3.6
43+
- python: 3.7
5344
env: SETUP_CMD='build_sphinx -w'
5445

55-
# Python3.3 is a bit old, thus conda doesn't have all version dependencies including newer numpies
56-
- python: 3.3
57-
env: NUMPY_VERSION=1.9
58-
ASTROPY_VERSION=1.3
59-
CONDA_DEPENDENCIES='cython scipy requests matplotlib h5py beautiful-soup'
60-
61-
- python: 3.4
62-
env: NUMPY_VERSION=1.11
63-
CONDA_DEPENDENCIES='cython scipy requests matplotlib h5py beautiful-soup'
64-
65-
- python: 3.5
66-
env: SETUP_CMD='test'
67-
NUMPY_VERSION=1.10
68-
6946
# Try Astropy development version
70-
- python: 3.6
47+
- python: 3.7
7148
env: ASTROPY_VERSION=development ASTROPY_USE_SYSTEM_PYTEST=1
7249

7350
# Try numpy pre-release version, this runs only when a pre-release
7451
# is available on pypi.
75-
- python: 3.6
52+
- python: 3.7
7653
env: NUMPY_VERSION=prerelease SETUP_CMD='test' ASTROPY_USE_SYSTEM_PYTEST=1
7754

7855
# try a version *without* h5py - we need this for readthedocs
79-
- python: 2.7
56+
- python: 3.7
8057
env: CONDA_DEPENDENCIES="`echo $CONDA_DEPENDENCIES | sed 's/ h5py//'`" # this magic incantation removes the substring " h5py" from the dependencies
8158

82-
before_install:
59+
# before_install:
8360

8461
# If there are matplotlib tests, comment these out to
8562
# Make sure that interactive matplotlib backends work
86-
- export DISPLAY=:99.0
87-
- sh -e /etc/init.d/xvfb start
63+
# - export DISPLAY=:99.0
64+
# - sh -e /etc/init.d/xvfb start
65+
66+
services:
67+
- xvfb
8868

8969
install:
9070

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ environment:
1414

1515
matrix:
1616

17-
- PYTHON_VERSION: "2.7"
17+
- PYTHON_VERSION: "3.7"
1818
ASTROPY_VERSION: "stable"
1919
NUMPY_VERSION: "stable"
2020

0 commit comments

Comments
 (0)