Skip to content

Commit 53fa9ad

Browse files
thijstriemstrathijstriemstra
authored
add py36 tox target (#2)
* add py36 tox target and travis builds * adjust import for django 2.0 * add python 3.6 classifier * update copyright year * test against latest django 2.x
1 parent 3f58299 commit 53fa9ad

14 files changed

+42
-32
lines changed

‎.travis.yml

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
language: python
2-
sudo: required
3-
cache:
4-
directories:
5-
- $HOME/.cache/pip
6-
install: pip install --upgrade pip tox wheel
2+
sudo: false
3+
cache: pip
4+
install: pip install --upgrade setuptools pip tox wheel
75
script: tox
8-
env:
9-
- TOXENV=py27-django-19
10-
- TOXENV=py34-django-19
11-
- TOXENV=py35-django-19
12-
- TOXENV=py27-django-110
13-
- TOXENV=py34-django-110
14-
- TOXENV=py35-django-110
15-
- TOXENV=py27-django-111
16-
- TOXENV=py34-django-111
17-
- TOXENV=py35-django-111
18-
- TOXENV=coveralls
6+
7+
matrix:
8+
include:
9+
- python: 2.7
10+
env: TOXENV=py27-django-19,py27-django-110,py27-django-111
11+
- python: 3.4
12+
env: TOXENV=py34-django-19,py34-django-110,py34-django-111,py34-django-20
13+
- python: 3.5
14+
env: TOXENV=py35-django-19,py35-django-110,py35-django-111,py35-django-20
15+
- python: 3.6
16+
env: TOXENV=py36-django-19,py36-django-110,py36-django-111,py36-django-20
17+
- python: 3.5
18+
env: TOXENV=coveralls

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (C) 2013-2016 Collab
1+
Copyright (C) 2013-2018 Collab
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy of
44
this software and associated documentation files (the "Software"), to deal in

‎admin_appmenu/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright Collab 2013-2016
1+
# Copyright Collab 2013-2018
22
# See LICENSE for details.
33

44
"""

‎admin_appmenu/templatetags/navigation.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# Copyright Collab 2013-2016
1+
# Copyright Collab 2013-2018
2+
# See LICENSE for details.
23

34
"""
45
Navigation template tags for the :py:mod:`admin_appmenu` application.

‎admin_appmenu/tests/admin.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# Copyright Collab 2013-2016
1+
# Copyright Collab 2013-2018
2+
# See LICENSE for details.
23

34
"""
45
Custom admin used for testing.
@@ -7,7 +8,10 @@
78
from __future__ import unicode_literals
89

910
from django.conf.urls import url
10-
from django.core.urlresolvers import reverse
11+
try:
12+
from django.core.urlresolvers import reverse
13+
except ImportError:
14+
from django.urls import reverse
1115
from django.template.response import TemplateResponse
1216
from django.utils.translation import ugettext_lazy as _
1317

‎admin_appmenu/tests/custom_admin_urls.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright Collab 2013-2016
1+
# Copyright Collab 2013-2018
22
# See LICENSE for details.
33

44
"""

‎admin_appmenu/tests/models.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright Collab 2016
1+
# Copyright Collab 2013-2018
22

33
"""
44
Models used for testing.

‎admin_appmenu/tests/settings.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright Collab 2013-2016
1+
# Copyright Collab 2013-2018
22
# See LICENSE for details.
33

44
import os

‎admin_appmenu/tests/test_templatetags.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# Copyright Collab 2013-2016
1+
# Copyright Collab 2013-2018
2+
# See LICENSE for details.
23

34
"""
45
Tests for the :py:mod:`admin_appmenu.templatetags`.

‎admin_appmenu/tests/test_version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright Collab 2013-2016
1+
# Copyright Collab 2013-2018
22
# See LICENSE for details.
33

44
"""

‎admin_appmenu/tests/urls.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright Collab 2015-2016
1+
# Copyright Collab 2015-2018
22
# See LICENSE for details.
33

44
"""

‎admin_appmenu/util.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright Collab 2016
1+
# Copyright Collab 2016-2018
22

33
"""
44
Utilities.

‎setup.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python
2-
# Copyright Collab 2013-2016
2+
# Copyright Collab 2013-2018
33
# See LICENSE for details.
44

55
import os
@@ -33,6 +33,8 @@
3333
'Programming Language :: Python :: 3',
3434
'Programming Language :: Python :: 3.3',
3535
'Programming Language :: Python :: 3.4',
36+
'Programming Language :: Python :: 3.5',
37+
'Programming Language :: Python :: 3.6'
3638
],
3739
author='Collab',
3840
author_email='[email protected]',

‎tox.ini

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright Collab 2013-2017
1+
# Copyright Collab 2013-2018
22
# See LICENSE for details.
33
#
44
# Tox (https://tox.testrun.org/) is a tool for running tests
@@ -9,8 +9,9 @@
99
[tox]
1010
envlist =
1111
{py27}-django-{19,110,111}
12-
{py34}-django-{19,110,111}
13-
{py35}-django-{19,110,111}
12+
{py34}-django-{19,110,111,20}
13+
{py35}-django-{19,110,111,20}
14+
{py36}-django-{19,110,111,20}
1415
skipsdist = False
1516
skip_missing_interpreters = True
1617

@@ -32,6 +33,7 @@ deps =
3233
django-19: Django>=1.9,<1.10
3334
django-110: Django>=1.10,<1.11
3435
django-111: Django>=1.11,<2.0.0
36+
django-20: Django>=2.0,<3.0.0
3537
{[base]deps}
3638

3739

0 commit comments

Comments
 (0)