Skip to content

Commit

Permalink
Merge pull request matthewwithanm#353 from vstoykov/improve-tox
Browse files Browse the repository at this point in the history
Fix test requirements for django 1.9 and Python3.5
  • Loading branch information
vstoykov committed Dec 26, 2015
2 parents 0c43553 + d280ad8 commit 5ce8b9f
Showing 2 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -43,8 +43,8 @@ def exec_file(filepath, globalz=None, localz=None):
zip_safe=False,
include_package_data=True,
tests_require=[
'beautifulsoup4==4.1.3',
'nose>=1.3.6,<1.4',
'beautifulsoup4==4.4.0',
'nose>=1.3.6,<1.5',
'nose-progressive==1.5.1',
'django-nose>=1.2,<1.5',
'Pillow<3.0',
16 changes: 8 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -13,20 +13,20 @@ commands = python setup.py test
[testenv:py35-django19]
basepython = python3.5
deps =
git+https://github.com/django/django.git@stable/1.9.x#egg=Django
Django>=1.9,<1.10
django-nose==1.4.2

[testenv:py34-django19]
basepython = python3.4
deps =
git+https://github.com/django/django.git@stable/1.9.x#egg=Django
Django>=1.9,<1.10
django-nose==1.4.2

[testenv:py34-django18]
basepython = python3.4
deps =
Django>=1.8,<1.9
django-nose==1.4
django-nose==1.4.2

[testenv:py34-django17]
basepython = python3.4
@@ -43,7 +43,7 @@ deps =
basepython = python3.3
deps =
Django>=1.8,<1.9
django-nose==1.4
django-nose==1.4.2

[testenv:py33-django17]
basepython = python3.3
@@ -65,7 +65,7 @@ deps =
basepython = python3.4
deps =
Django>=1.8,<1.9
django-nose==1.4
django-nose==1.4.2

[testenv:py32-django17]
basepython = python3.4
@@ -86,14 +86,14 @@ deps =
[testenv:py27-django19]
basepython = python2.7
deps =
git+https://github.com/django/django.git@stable/1.9.x#egg=Django
git+https://github.com/django-nose/django-nose@master#egg=django-nose
Django>=1.9,<1.10
django-nose==1.4.2

[testenv:py27-django18]
basepython = python2.7
deps =
Django>=1.8,<1.9
django-nose==1.4
django-nose==1.4.2

[testenv:py27-django17]
basepython = python2.7

0 comments on commit 5ce8b9f

Please sign in to comment.