Merge pull request #25 from enthought/update-test-matrix

Update test matrix
enthought · Jun 1, 2017 · 2c28f1a · 2c28f1a
2 parents a778abb + 83c3d71
commit 2c28f1a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,13 +10,6 @@ python:
   - "3.5"
   - "3.6"
 
-env:
-  - SPHINX="sphinx==1.5.*"
-  - SPHINX="sphinx==1.4.*"
-  - SPHINX="sphinx==1.3.*"
-  - SPHINX="sphinx==1.2.*"
-  - SPHINX="sphinx"
-
 addons:
   apt:
     packages:
@@ -30,13 +23,22 @@ cache:
 before_install:
   - ccache -s
   - export PATH=/usr/lib/ccache:${PATH}
-  - pip install --upgrade pip
+  - pip install --upgrade pip wheel
   - pip install --upgrade -r requirements.txt
-  - pip install $SPHINX codecov
   - pip install -r test-requirements.txt
 install:
   - pip install -e .
 script:
+  - pip install sphinx==1.2.*
+  - coverage run -m haas
+  - pip install sphinx==1.3.*
+  - coverage run -m haas
+  - pip install sphinx==1.4.*
+  - coverage run -m haas
+  - pip install sphinx==1.5.*
+  - coverage run -m haas
+  - pip install --upgrade sphinx
   - coverage run -m haas
 after_success:
+  - pip install codecov
   - codecov
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
 traits
 sphinx
-astor>=0.5
+astor ; python_version < '3'
+git+https://github.com/berkerpeksag/astor.git#astor ; python_version > '2.7'