Skip to content

Commit

Permalink
Drop support for Django 1.3
Browse files Browse the repository at this point in the history
- django-mptt imports django.utils.six, which arrived in 1.4.2
  • Loading branch information
vkurup committed Aug 22, 2014
1 parent 19125cd commit 3a30d3a
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 28 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ env:
- TOXENV=py27-1.6.X,py26-1.6.X
- TOXENV=py27-1.5.X,py26-1.5.X
- TOXENV=py27-1.4.X,py26-1.4.X
- TOXENV=py27-1.3.X,py26-1.3.X
- TOXENV=docs

install:
- pip install tox
- pip install flake8

script:
- tox
- flake8 .

matrix:
allow_failures:
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Features

Requirements
------------
- `django <https://github.com/django/django/>`_ >= 1.3
- `django <https://github.com/django/django/>`_ >= 1.4
- `django-mptt <http://github.com/django-mptt/django-mptt/>`_ >= 0.5.2

Using the demo
Expand Down
5 changes: 5 additions & 0 deletions docs/releases.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ Release History

Release and change history for django-treenav

vNEXT (Released DATE)
---------------------

- Dropped support for Django prior to 1.4
- Setup Travis

v0.9.1 (Released 2012-10-26)
------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion sample_project/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
django==1.3.1
django==1.6.6
django-mptt==0.5.2
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
],
long_description=open('README.rst').read(),
install_requires=[
"django>=1.3",
"django>=1.4.2",
"django-mptt>=0.5.2",
],
)
10 changes: 1 addition & 9 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
downloadcache = {toxworkdir}/_download/
envlist = py27-trunk,py27-1.7.X,py27-1.6.X,py26-1.6.X,py27-1.5.X,py26-1.5.X,py27-1.4.X,py26-1.4.X,py27-1.3.X,py26-1.3.X,docs
envlist = py27-trunk,py27-1.7.X,py27-1.6.X,py26-1.6.X,py27-1.5.X,py26-1.5.X,py27-1.4.X,py26-1.4.X,docs

[testenv]
commands = {envpython} runtests.py
Expand Down Expand Up @@ -37,14 +37,6 @@ deps = django>=1.4,<1.5
basepython = python2.6
deps = django>=1.4,<1.5

[testenv:py27-1.3.X]
basepython = python2.7
deps = django>=1.3,<1.4

[testenv:py26-1.3.X]
basepython = python2.6
deps = django>=1.3,<1.4

[testenv:docs]
basepython = python2.7
deps = Sphinx==1.2.2
Expand Down
6 changes: 1 addition & 5 deletions treenav/admin.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
from functools import update_wrapper
try:
from django.conf.urls import patterns, url
except ImportError:
# Django <= 1.3
from django.conf.urls.defaults import patterns, url
from django.conf.urls import patterns, url
from django.contrib import admin
from django.contrib.contenttypes import generic
from django.shortcuts import redirect
Expand Down
6 changes: 1 addition & 5 deletions treenav/tests/urls.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
try:
from django.conf.urls import url, patterns, include, handler404
except ImportError:
# Django <= 1.3
from django.conf.urls.defaults import url, patterns, include, handler404
from django.conf.urls import url, patterns, include, handler404
from django.http import HttpResponse, HttpResponseNotFound
from django.template import Template, Context

Expand Down
6 changes: 1 addition & 5 deletions treenav/urls.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
try:
from django.conf.urls import patterns, url
except ImportError:
# Django <= 1.3
from django.conf.urls.defaults import patterns, url
from django.conf.urls import patterns, url


urlpatterns = patterns('treenav.views', # noqa
Expand Down

0 comments on commit 3a30d3a

Please sign in to comment.