Skip to content

Commit 006b884

Browse files
alanjdsAlexandr Shurigin
authored and
Alexandr Shurigin
committed
Added Py3.{5,6} & Django 1.11. Removed Py2.6 & Django <1.8 (#9)
* Quick fix for the DJANGO_VERSION error when using Python >= 3.6 (version calculation caching removed because it is not a performance penalty, urls are lazy and are calculated only once per an app start). * Added Py3.{5,6} & Django 1.11. Removed Py2.6 & Django <1.8 The latest Django LTS is 1.11. Its ok to support up to the "LTS -1" (1.8) only. The next Django LTS is 2.0, and will be Py3k only, so lets start testing with Py3k! * Mark as Py3k compat on setup.py
1 parent 063ca0a commit 006b884

File tree

3 files changed

+14
-26
lines changed

3 files changed

+14
-26
lines changed

.travis.yml

+9-20
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,20 @@
11
language: python
22
sudo: false
33
python:
4-
- "2.6"
54
- "2.7"
5+
- "3.5"
6+
- "3.6"
67
env:
7-
- DJANGO=1.4
8-
- DJANGO=1.5
9-
- DJANGO=1.6
10-
- DJANGO=1.7
11-
- DJANGO=1.8
12-
- DJANGO=1.9
13-
- DJANGO=1.10
8+
- DJANGO=1.8.0
9+
- DJANGO=1.9.0
10+
- DJANGO=1.10.0
11+
- DJANGO=1.11.0
1412
install:
15-
- pip install -q Django==$DJANGO
13+
- pip install -q Django~=$DJANGO
1614
script:
1715
- DJANGO_SETTINGS_MODULE=tests.settings python setup.py test
1816

1917
matrix:
2018
exclude:
21-
- python: "2.6"
22-
env: DJANGO=1.7
23-
24-
- python: "2.6"
25-
env: DJANGO=1.8
26-
27-
- python: "2.6"
28-
env: DJANGO=1.9
29-
30-
- python: "2.6"
31-
env: DJANGO=1.10
19+
- python: "2.7"
20+
env: DJANGO=2.0.0

macrosurl/__init__.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,9 @@ def __unicode__(self):
7373

7474
def url(regex, view, kwargs=None, name=None, prefix=''):
7575
from django.conf.urls import url as baseurl
76-
global DJANGO_VERSION
76+
from django import get_version
7777

78-
if DJANGO_VERSION is None:
79-
from django import get_version
80-
81-
DJANGO_VERSION = get_version()
78+
DJANGO_VERSION = get_version()
8279

8380
# Handle include()'s in views.
8481
end_dollar = True

setup.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@ def read(filename):
3333
'Natural Language :: English',
3434
'Operating System :: OS Independent',
3535
'Programming Language :: Python',
36+
'Programming Language :: Python :: 2',
37+
'Programming Language :: Python :: 3',
3638
'Topic :: Internet :: WWW/HTTP',
3739
'Topic :: Internet :: WWW/HTTP :: WSGI',
3840
'Topic :: Software Development :: Libraries',
3941
'Topic :: Software Development :: Libraries :: Python Modules',
4042
'Topic :: Software Development :: Pre-processors'
4143
],
4244
install_requires=['django']
43-
)
45+
)

0 commit comments

Comments
 (0)