Skip to content

Commit

Permalink
Fully drop support for Django 1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
codeinthehole committed Apr 29, 2014
1 parent 6c17fff commit dc45043
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
packages=find_packages(exclude=["sandbox*", "tests*"]),
include_package_data=True,
install_requires=[
'django>=1.4.9,<1.7',
'django>=1.5.7,<1.7',
# PIL is required for image fields, Pillow is the "friendly" PIL fork
'pillow>=1.7.8,<2.5',
# Oscar ships with migrations
Expand Down
12 changes: 6 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,29 @@ commands = python runtests.py []
[testenv:py26-1.5]
basepython = python2.6
deps = -r{toxinidir}/requirements_py2.txt
django==1.5.5
django==1.5.7

[testenv:py27-1.5]
basepython = python2.7
deps = -r{toxinidir}/requirements_py2.txt
django==1.5.5
django==1.5.7

[testenv:py33-1.5]
basepython = python3.3
deps = -r{toxinidir}/requirements.txt
django==1.5.5
django==1.5.7

[testenv:py26-1.6]
basepython = python2.6
deps = -r{toxinidir}/requirements_py2.txt
django==1.6.1
django==1.6.4

[testenv:py27-1.6]
basepython = python2.7
deps = -r{toxinidir}/requirements_py2.txt
django==1.6.1
django==1.6.4

[testenv:py33-1.6]
basepython = python3.3
deps = -r{toxinidir}/requirements.txt
django==1.6.1
django==1.6.4

0 comments on commit dc45043

Please sign in to comment.