Merge pull request #27 from chopdgd/feature-support-django2

Added support for django2

Author: genomics-geek

.travis.yml

@@ -1,27 +1,21 @@
+
 # Config file for automatic testing at travis-ci.org
 
 language: python
 
 python:
+  - "3.6"
   - "3.5"
 
-env:
-  - TOX_ENV=py35-django-110
-  - TOX_ENV=py34-django-110
-  - TOX_ENV=py27-django-110
-  - TOX_ENV=py35-django-111
-  - TOX_ENV=py34-django-111
-  - TOX_ENV=py27-django-111
-  - TOX_ENV=flake8
-
 matrix:
   fast_finish: true
 
-# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
-install: pip install -r requirements_test.txt
+install:
+  - pip install -r requirements_test.txt
+  - pip install tox-travis
+
+before_script: flake8
 
-# command to run tests using coverage, e.g. python setup.py test
-script: tox -e $TOX_ENV
+script: tox
 
-after_success:
-  - codecov -e TOX_ENV
+after_success: codecov

setup.py

@@ -68,16 +68,13 @@ def get_version(*file_paths):
     classifiers=[
         'Development Status :: 4 - Beta',
         'Framework :: Django',
-        'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
 )

tests/test_urls.py

@@ -8,7 +8,7 @@
 Tests for `django-user-activities` urls module.
 """
 
-from django.core.urlresolvers import reverse, resolve
+from django.urls import resolve, reverse
 
 from test_plus.test import TestCase
 

tests/urls.py

@@ -4,9 +4,8 @@
 from django.contrib import admin
 from django.conf.urls import url, include
 
-from user_activities.urls import urlpatterns as user_activities_urls
 
 urlpatterns = [
-    url(r'^', include(user_activities_urls, namespace='user_activities')),
+    url(r'^', include('user_activities.urls', namespace='user_activities')),
     url(r'^admin/', admin.site.urls),
 ]

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 envlist =
-    {py27,py34,py35}-django-110
-    {py27,py34,py35}-django-111
+    {py35,py36}-django-111
+    {py35,py36}-django-2
     flake8
 
 [pytest]
@@ -23,10 +23,9 @@ setenv =
     PYTHONPATH = {toxinidir}:{toxinidir}/user_activities
 commands = py.test --basetemp={envtmpdir} --cov={toxinidir}/user_activities --cov-report=term-missing --verbose
 deps =
-    django-110: Django>=1.10,<1.11
     django-111: Django>=1.11,<2.0
+    django-2: Django>=2.0
     -r{toxinidir}/requirements_test.txt
 basepython =
+    py36: python3.6
     py35: python3.5
-    py34: python3.4
-    py27: python2.7

user_activities/urls.py

@@ -4,6 +4,7 @@
 from . import viewsets
 
 
+app_name = 'user_activities'
 router = routers.SimpleRouter()
 router.register(r'', viewsets.ActivityViewSet)
 router.register(r'comments', viewsets.CommentViewSet)