Browse files

up to django 1.6 =)

  • Loading branch information...
1 parent c223206 commit d3d732cc826db6f9c9f1e13597711dcfa0255a41 @vandersonmota committed Nov 7, 2013
Showing with 6 additions and 6 deletions.
  1. +1 −1 requirements.txt
  2. +1 −1 setup.py
  3. +4 −4 tox.ini
View
2 requirements.txt
@@ -1,3 +1,3 @@
-Django<1.6
+Django<1.7
mock==1.0.1
six==1.3.0
View
2 setup.py
@@ -11,7 +11,7 @@
include_package_data=True, # declarations in MANIFEST.in
install_requires=open(join(dirname(__file__), 'requirements.txt')).readlines(),
tests_require=[
- 'django<1.5',
+ 'django<1.7',
'pil',
'tox',
],
View
8 tox.ini
@@ -58,7 +58,7 @@ commands=./runtests.py --use-tz
[testenv:django1.6-py2]
basepython = python2.7
deps =
- https://www.djangoproject.com/download/1.6b4/tarball/
+ django==1.6
Pillow==2.1.0
mock==1.0.1
six==1.3.0
@@ -67,7 +67,7 @@ commands=./runtests.py
[testenv:django1.6-py2-timezone]
basepython = python2.7
deps =
- https://www.djangoproject.com/download/1.6b4/tarball/
+ django==1.6
Pillow==2.1.0
mock==1.0.1
six==1.3.0
@@ -76,7 +76,7 @@ commands=./runtests.py --use-tz
[testenv:django1.6-py3]
basepython = python3.3
deps =
- https://www.djangoproject.com/download/1.6b4/tarball/
+ django==1.6
Pillow==2.1.0
mock==1.0
six==1.3.0
@@ -85,7 +85,7 @@ commands=./runtests.py
[testenv:django1.6-py3-timezone]
basepython = python3.3
deps =
- https://www.djangoproject.com/download/1.6b4/tarball/
+ django==1.6
Pillow==2.1.0
mock==1.0.1
six==1.3.0

0 comments on commit d3d732c

Please sign in to comment.