Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[requires.io] dependency update on master branch #23

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[requires.io] dependency update on master branch #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
82dda2b
[requires.io] dependency update
requires Mar 23, 2015
8682155
[requires.io] dependency update
requires May 13, 2015
9968667
[requires.io] dependency update
requires Jun 18, 2015
fc4245f
[requires.io] dependency update
requires Jun 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

django-debug-toolbar
sphinx
django>=1.4.0,<1.8.0
tox>=1.8.0,<1.9.0
django>=1.4.0,<1.9.0
tox>=2.0,<2.1
28 changes: 14 additions & 14 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[tox]
envlist = pypy-trunk,pypy-1.7.X,pypy-1.6.X,pypy-1.4.X,py34-trunk,py34-1.7.X,py34-1.6.X,py33-trunk,py33-1.7.X,py33-1.6.X,py32-trunk,py32-1.7.X,py32-1.6.X,py27-trunk,py27-1.7.X,py27-1.6.X,py27-1.4.X,py26-1.6.X,py26-1.4.X
envlist = pypy-1.8.X,pypy-1.7.X,pypy-1.6.X,pypy-1.4.X,py34-1.8.X,py34-1.7.X,py34-1.6.X,py33-1.8.X,py33-1.7.X,py33-1.6.X,py32-1.8.X,py32-1.7.X,py32-1.6.X,py27-1.8.X,py27-1.7.X,py27-1.6.X,py27-1.4.X,py26-1.6.X,py26-1.4.X

[testenv]
commands = {envpython} run_tests.py
deps = -r{toxinidir}/requirements/test.txt

[djangotrunk]
deps = https://github.com/django/django/archive/master.zip
[django18]
deps = django>=1.8,<1.9
{[testenv]deps}

[django17]
deps = django>=1.7,<1.8a1
deps = django>=1.7,<1.8
{[testenv]deps}

[django16]
Expand All @@ -21,9 +21,9 @@ deps = django>=1.6,<1.7
deps = django>=1.4,<1.5
{[testenv]deps}

[testenv:pypy-trunk]
[testenv:pypy-1.8.X]
basepython = pypy
deps = {[djangotrunk]deps}
deps = {[django18]deps}

[testenv:pypy-1.7.X]
basepython = pypy
Expand All @@ -37,9 +37,9 @@ deps = {[django16]deps}
basepython = pypy
deps = {[django14]deps}

[testenv:py34-trunk]
[testenv:py34-1.8.X]
basepython = python3.4
deps = {[djangotrunk]deps}
deps = {[django18]deps}

[testenv:py34-1.7.X]
basepython = python3.4
Expand All @@ -49,9 +49,9 @@ deps = {[django17]deps}
basepython = python3.4
deps = {[django16]deps}

[testenv:py33-trunk]
[testenv:py33-1.8.X]
basepython = python3.3
deps = {[djangotrunk]deps}
deps = {[django18]deps}

[testenv:py33-1.7.X]
basepython = python3.3
Expand All @@ -61,9 +61,9 @@ deps = {[django17]deps}
basepython = python3.3
deps = {[django16]deps}

[testenv:py32-trunk]
[testenv:py32-1.8.X]
basepython = python3.2
deps = {[djangotrunk]deps}
deps = {[django18]deps}

[testenv:py32-1.7.X]
basepython = python3.2
Expand All @@ -73,9 +73,9 @@ deps = {[django17]deps}
basepython = python3.2
deps = {[django16]deps}

[testenv:py27-trunk]
[testenv:py27-1.8.X]
basepython = python2.7
deps = {[djangotrunk]deps}
deps = {[django18]deps}

[testenv:py27-1.7.X]
basepython = python2.7
Expand Down