Merge c56b15c into 3f58299

collab-project · Aug 14, 2018 · 8af7c71 · 8af7c71
2 parents 3f58299 + c56b15c
commit 8af7c71
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 32 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,18 +1,18 @@
 language: python
-sudo: required
-cache:
-  directories:
-  - $HOME/.cache/pip
-install: pip install --upgrade pip tox wheel
+sudo: false
+cache: pip
+install: pip install --upgrade setuptools pip tox wheel
 script: tox
-env:
-  - TOXENV=py27-django-19
-  - TOXENV=py34-django-19
-  - TOXENV=py35-django-19
-  - TOXENV=py27-django-110
-  - TOXENV=py34-django-110
-  - TOXENV=py35-django-110
-  - TOXENV=py27-django-111
-  - TOXENV=py34-django-111
-  - TOXENV=py35-django-111
-  - TOXENV=coveralls
+
+matrix:
+    include:
+        - python: 2.7
+          env: TOXENV=py27-django-19,py27-django-110,py27-django-111
+        - python: 3.4
+          env: TOXENV=py34-django-19,py34-django-110,py34-django-111,py34-django-20
+        - python: 3.5
+          env: TOXENV=py35-django-19,py35-django-110,py35-django-111,py35-django-20
+        - python: 3.6
+          env: TOXENV=py36-django-19,py36-django-110,py36-django-111,py36-django-20
+        - python: 3.5
+          env: TOXENV=coveralls
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2013-2016 Collab
+Copyright (C) 2013-2018 Collab
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

diff --git a/admin_appmenu/__init__.py b/admin_appmenu/__init__.py
@@ -1,4 +1,4 @@
-# Copyright Collab 2013-2016
+# Copyright Collab 2013-2018
 # See LICENSE for details.
 
 """

diff --git a/admin_appmenu/templatetags/navigation.py b/admin_appmenu/templatetags/navigation.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2013-2016
+# Copyright Collab 2013-2018
+# See LICENSE for details.
 
 """
 Navigation template tags for the :py:mod:`admin_appmenu` application.

diff --git a/admin_appmenu/tests/admin.py b/admin_appmenu/tests/admin.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2013-2016
+# Copyright Collab 2013-2018
+# See LICENSE for details.
 
 """
 Custom admin used for testing.
@@ -7,7 +8,10 @@
 from __future__ import unicode_literals
 
 from django.conf.urls import url
-from django.core.urlresolvers import reverse
+try:
+    from django.core.urlresolvers import reverse
+except ImportError:
+    from django.urls import reverse
 from django.template.response import TemplateResponse
 from django.utils.translation import ugettext_lazy as _
 

diff --git a/admin_appmenu/tests/custom_admin_urls.py b/admin_appmenu/tests/custom_admin_urls.py
@@ -1,4 +1,4 @@
-# Copyright Collab 2013-2016
+# Copyright Collab 2013-2018
 # See LICENSE for details.
 
 """

diff --git a/admin_appmenu/tests/models.py b/admin_appmenu/tests/models.py
@@ -1,4 +1,4 @@
-# Copyright Collab 2016
+# Copyright Collab 2013-2018
 
 """
 Models used for testing.

diff --git a/admin_appmenu/tests/settings.py b/admin_appmenu/tests/settings.py
@@ -1,4 +1,4 @@
-# Copyright Collab 2013-2016
+# Copyright Collab 2013-2018
 # See LICENSE for details.
 
 import os

diff --git a/admin_appmenu/tests/test_templatetags.py b/admin_appmenu/tests/test_templatetags.py
@@ -1,4 +1,5 @@
-# Copyright Collab 2013-2016
+# Copyright Collab 2013-2018
+# See LICENSE for details.
 
 """
 Tests for the :py:mod:`admin_appmenu.templatetags`.

diff --git a/admin_appmenu/tests/test_version.py b/admin_appmenu/tests/test_version.py
@@ -1,4 +1,4 @@
-# Copyright Collab 2013-2016
+# Copyright Collab 2013-2018
 # See LICENSE for details.
 
 """

diff --git a/admin_appmenu/tests/urls.py b/admin_appmenu/tests/urls.py
@@ -1,4 +1,4 @@
-# Copyright Collab 2015-2016
+# Copyright Collab 2015-2018
 # See LICENSE for details.
 
 """

diff --git a/admin_appmenu/util.py b/admin_appmenu/util.py
@@ -1,4 +1,4 @@
-# Copyright Collab 2016
+# Copyright Collab 2016-2018
 
 """
 Utilities.

diff --git a/setup.py b/setup.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright Collab 2013-2016
+# Copyright Collab 2013-2018
 # See LICENSE for details.
 
 import os
@@ -33,6 +33,8 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6'
     ],
     author='Collab',
     author_email='info@collab.nl',

diff --git a/tox.ini b/tox.ini
@@ -1,4 +1,4 @@
-# Copyright Collab 2013-2017
+# Copyright Collab 2013-2018
 # See LICENSE for details.
 #
 # Tox (https://tox.testrun.org/) is a tool for running tests
@@ -9,8 +9,9 @@
 [tox]
 envlist =
     {py27}-django-{19,110,111}
-    {py34}-django-{19,110,111}
-    {py35}-django-{19,110,111}
+    {py34}-django-{19,110,111,20}
+    {py35}-django-{19,110,111,20}
+    {py36}-django-{19,110,111,20}
 skipsdist = False
 skip_missing_interpreters = True
 
@@ -32,6 +33,7 @@ deps =
     django-19: Django>=1.9,<1.10
     django-110: Django>=1.10,<1.11
     django-111: Django>=1.11,<2.0.0
+    django-20: Django>=2.0,<3.0.0
     {[base]deps}