Skip to content

Commit

Permalink
Rewrite travis config to use travis env/version matrix instead of tox
Browse files Browse the repository at this point in the history
  • Loading branch information
rlskoeser committed Jul 25, 2016
1 parent f42525c commit bc4941d
Showing 1 changed file with 21 additions and 2 deletions.
23 changes: 21 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ language: python
sudo: false

python:
# - "2.6" # do we really need to test/support 2.6?
- "2.7"
- "3.3"
- "3.4"
# - "3.5" # 3.5 not available by default on travis-ci

addons:
apt:
Expand All @@ -15,6 +19,20 @@ addons:
# (install script doesn't yet support more than one)
env:
- FCREPO_VERSION=fedora-3.8.1
# - DJANGO_VERSION=">=1.5,<1.6"
- DJANGO="" # no django
- DJANGO"Django>=1.6,<1.7"
- DJANGO="Django>=1.7,<1.8"
- DJANGO="Django>=1.8,<1.9"
- DJANGO="Django>=1.9,<1.10"

# if we enable py2.6, restrict which django versions are tested
# matrix:
# exclude:
# - python: 2.6
# env: DJANGO="Django>=1.7,<1.8"
# env: DJANGO="Django>=1.8,<1.9"
# env: DJANGO="Django>=1.9,<1.10"

before_install:
- export FCREPO_FOLDER=${HOME}/jfs/${FCREPO_VERSION}
Expand All @@ -26,15 +44,16 @@ install:
- pip install --upgrade setuptools
- pip install -e .
- pip install -e ".[test]"
- pip install -q $DJANGO
- pip install coveralls
- cp ci/testsettings.py test/localsettings.py

before_script:
- ci/start-fedora.sh

script:
tox
# nosetests test --with-coverage --cover-package=eulfedora --cover-xml --with-xunit
nosetests test --with-coverage --cover-package=eulfedora --cover-xml --with-xunit
# tox

after_success:
- coveralls
Expand Down

0 comments on commit bc4941d

Please sign in to comment.