Skip to content

Commit

Permalink
drop support for python<2.7,django<1.18, support newer versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@brad
brad committed Dec 28, 2016
1 parent d6e1544 commit 053630f
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 140 deletions.
22 changes: 3 additions & 19 deletions log/tests/test_admin.py
View file
Expand Up @@ -44,16 +44,7 @@ def test_log_list(self):
change_url = self._admin_url(Log, log)
res = self.client.get(list_url)
self.assertContains(res, '5 logs')
self.assertRegexpMatches(
res.content.decode(), '<tr.*%s.*%s.*%s.*%s.*%s.*</tr>' % (
log.user.username, log.session, log.varname,
date_format(timezone.localtime(log.stamp)), log.value
))
if self.django_version[0] >= '1' and self.django_version[1] > '4':
self.assertContains(res, change_url)
else:
# Django 1.4 used relative change url
self.assertContains(res, '%i/' % log.id)
self.assertContains(res, change_url)
self.assertContains(res, add_url)

def test_requestlog_list(self):
Expand All @@ -80,15 +71,8 @@ def test_requestlog_list(self):
self.assertContains(res, request_log.session)
self.assertContains(res, request_log.url)
self.assertContains(res, request_log_stamp)
self.assertRegexpMatches(
res.content.decode(), '<tr.*%s.*%s.*%s.*%s.*</tr>' % (
request_log.user.username, request_log.session,
request_log.url, request_log_stamp))
if self.django_version[0] >= '1' and self.django_version[1] > '4':
self.assertContains(res, change_url)
else:
# Django 1.4 used relative change url
self.assertContains(res, '%i/' % request_log.id)

self.assertContains(res, change_url)
self.assertContains(res, add_url)

def _admin_url(self, model, obj=None):
Expand Down
5 changes: 4 additions & 1 deletion setup.py
View file
Expand Up @@ -21,8 +21,11 @@
'License :: OSI Approved :: Apache Software License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: Implementation :: PyPy',
'Topic :: Software Development :: Libraries :: Python Modules',
],
)
13 changes: 12 additions & 1 deletion testproject/settings.py
View file
Expand Up @@ -40,4 +40,15 @@
USE_TZ = True
ROOT_URLCONF = 'testproject.urls'
SECRET_KEY = '&6hr-f+2+5k!$-oq6*l7p79+^+txtckz7imdoi%!a&0h1t3d(@'
TEMPLATE_DIRS = (os.path.join(PROJECT_PATH, 'templates'),)
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [os.path.join(PROJECT_PATH, 'templates')],
'OPTIONS': {
'loaders': [
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
],
},
},
]
10 changes: 5 additions & 5 deletions testproject/urls.py
View file
@@ -1,13 +1,13 @@
from django.conf.urls import include, patterns, url
from django.conf.urls import include, url
from django.contrib import admin

from . import views


admin.autodiscover()

urlpatterns = patterns('',
(r'^admin/', include(admin.site.urls)),
urlpatterns = [
url(r'^admin/', include(admin.site.urls)),
url(r'^create-log/$', views.create_requestlog, name='create_requestlog'),
(r'', include('django.contrib.auth.urls')),
)
url(r'', include('django.contrib.auth.urls')),
]
121 changes: 7 additions & 114 deletions tox.ini
View file
@@ -1,118 +1,11 @@
[tox]
envlist = pypy-trunk,pypy-1.8.X,pypy-1.7.X,pypy-1.6.X,pypy-1.4.X,py34-trunk,py34-1.8.X,py34-1.7.X,py34-1.6.X,py33-trunk,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-trunk,py27-1.8.X,py27-1.7.X,py27-1.6.X,py27-1.4.X,py26-1.6.X,py26-1.4.X
envlist = py{py,27,34,35}-{trunk,1.10.X,1.9.X},py{py,27,33,34}-1.8.X

[testenv]
commands = coverage run --omit=log/tests/** --branch manage.py test
deps = -r{toxinidir}/requirements/test.txt

[djangotrunk]
deps = https://github.com/django/django/archive/master.tar.gz
{[testenv]deps}

[django18]
deps = django<1.9
{[testenv]deps}

[django17]
deps = django<1.8
{[testenv]deps}

[django16]
deps = django<1.7
{[testenv]deps}

[django14]
deps = django<1.5
{[testenv]deps}

[testenv:pypy-trunk]
basepython = pypy
deps = {[djangotrunk]deps}

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

[testenv:pypy-1.7.X]
basepython = pypy
deps = {[django17]deps}

[testenv:pypy-1.6.X]
basepython = pypy
deps = {[django16]deps}

[testenv:pypy-1.4.X]
basepython = pypy
deps = {[django14]deps}

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

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

[testenv:py34-1.7.X]
basepython = python3.4
deps = {[django17]deps}

[testenv:py34-1.6.X]
basepython = python3.4
deps = {[django16]deps}

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

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

[testenv:py33-1.7.X]
basepython = python3.3
deps = {[django17]deps}

[testenv:py33-1.6.X]
basepython = python3.3
deps = {[django16]deps}

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

[testenv:py32-1.7.X]
basepython = python3.2
deps = {[django17]deps}

[testenv:py32-1.6.X]
basepython = python3.2
deps = {[django16]deps}

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

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

[testenv:py27-1.7.X]
basepython = python2.7
deps = {[django17]deps}

[testenv:py27-1.6.X]
basepython = python2.7
deps = {[django16]deps}

[testenv:py27-1.4.X]
basepython = python2.7
deps = {[django14]deps}

[testenv:py26-1.6.X]
basepython = python2.6
deps = {[django16]deps}

[testenv:py26-1.4.X]
basepython = python2.6
deps = {[django14]deps}
deps =
-r{toxinidir}/requirements/test.txt
1.8.X: Django>=1.8,<1.9
1.9.X: Django>=1.9,<1.10
1.10.X: Django>=1.10,<1.11
trunk: https://github.com/django/django/archive/master.zip

0 comments on commit 053630f

Please sign in to comment.