Skip to content

Commit

Permalink
upgraded requirements and test environments
Browse files Browse the repository at this point in the history
got us up to speed with Django's support timeline as of Dec 2015
  • Loading branch information
thornomad committed Dec 23, 2015
1 parent 6845023 commit 7325fac
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 18 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Expand Up @@ -2,14 +2,13 @@ language: python
python: 3.5
sudo: false
env:
- TOX_ENV=py35-django19
- TOX_ENV=py34-django19
- TOX_ENV=py27-django19
- TOX_ENV=py34-django18
- TOX_ENV=py33-django18
- TOX_ENV=py32-django18
- TOX_ENV=py27-django18
- TOX_ENV=py34-django17
- TOX_ENV=py33-django17
- TOX_ENV=py32-django17
- TOX_ENV=py27-django17
- TOX_ENV=py27-djangomaster
- TOX_ENV=py34-djangomaster
- TOX_ENV=py35-djangomaster
Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
@@ -1 +1 @@
Sphinx==1.3.1
Sphinx==1.3.3
4 changes: 2 additions & 2 deletions example_project/requirements.txt
@@ -1,2 +1,2 @@
Django==1.8.5
pytz==2015.6
Django==1.9
pytz==2015.7
2 changes: 1 addition & 1 deletion requirements.txt
Expand Up @@ -4,5 +4,5 @@
-r tests/requirements.txt
-r example_project/requirements.txt
-r docs/requirements.txt
twine==1.6.3
twine==1.6.5
wheel==0.26.0
12 changes: 6 additions & 6 deletions tests/requirements.txt
@@ -1,7 +1,7 @@
pytest==2.8.1
pytest-django==2.9.1
mock==1.3.0
coverage==3.7.1 # version 4.0 is throwing errors in Python3.2
tox==2.1.1
selenium==2.47.3
flake8==2.4.1
flake8==2.5.1
mock==1.3.0
pytest==2.8.5
pytest-django==2.9.1
selenium==2.48.0
tox==2.3.1
8 changes: 4 additions & 4 deletions tox.ini
@@ -1,15 +1,15 @@
[tox]
envlist =
{py27,py32,py33,py34}-django{17,18},
{py27,py34,py35}-djangomaster
{py27,py32,py33,py34}-django{18},
{py27,py34,py35}-django{19,master}

[testenv]
commands = coverage run --source="hitcount" runtests.py
setenv =
PYTHONDONTWRITEBYTECODE=1
deps =
django17: Django==1.7.10
django18: Django==1.8.5
django18: Django==1.8.7
django19: Django==1.9
djangomaster: https://github.com/django/django/archive/master.tar.gz
-rtests/requirements.txt
passenv = TRAVIS

0 comments on commit 7325fac

Please sign in to comment.