Skip to content

Commit

Permalink
Merge pull request #42 from mixxorz/update-django-tests
Browse files Browse the repository at this point in the history
Update tested Django versions
  • Loading branch information
mixxorz committed Aug 21, 2015
2 parents ade734b + 0c7e427 commit d83a3b3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ python:
- "3.3"
- "3.4"
env:
- DJANGO=django==1.4.20
- DJANGO=django==1.4.22
- DJANGO=django==1.5.12
- DJANGO=django==1.6.11
- DJANGO=django==1.7.8
- DJANGO=django==1.8.2
- DJANGO=django==1.7.10
- DJANGO=django==1.8.4
install:
- if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install importlib argparse; fi
- pip install $DJANGO
Expand All @@ -19,10 +19,10 @@ script: python manage.py behave --tags=~@failing && python tests.py
matrix:
exclude:
- python: "2.6"
env: DJANGO=django==1.7.8
env: DJANGO=django==1.7.10
- python: "2.6"
env: DJANGO=django==1.8.2
env: DJANGO=django==1.8.4
- python: "3.3"
env: DJANGO=django==1.4.20
env: DJANGO=django==1.4.22
- python: "3.4"
env: DJANGO=django==1.4.20
env: DJANGO=django==1.4.22
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Support
behave-django supports all current Django and Python versions.
Specifically, our tests cover:

Django 1.4.20, 1.5.12, 1.6.11, 1.7.8, 1.8.2, and Python 2.6, 2.7, 3.3, 3.4.
Django 1.4.22, 1.5.12, 1.6.11, 1.7.10, 1.8.4, and Python 2.6, 2.7, 3.3, 3.4.

.. install-marker
Expand Down

0 comments on commit d83a3b3

Please sign in to comment.