Merge branch 'release/6.0.0'

praekeltfoundation · Dec 5, 2017 · df2dc22 · df2dc22
2 parents 35eb9ea + 9547051
commit df2dc22
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,16 @@
 CHANGE LOG
 ==========
 
+6.0.0
+-----
+- Official Release of PWA 6.0.0
+- No longer supporting Django 1.9, see upgrade considerations
+  https://docs.djangoproject.com/en/2.0/releases/1.10/
+
+6.0.0-beta.1
+------------
+- Upgrade to Django 1.10, Molo 6
+
 1.0.1
 -----
 - Added in-app Notification

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.1
+6.0.0
diff --git a/molo/pwa/urls.py b/molo/pwa/urls.py
@@ -1,23 +1,22 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from fcm_django.api.rest_framework import FCMDeviceViewSet
 from rest_framework.routers import DefaultRouter
 
 from .views import RegistrationTokenView, manifest, service_worker, fcm, toast
 
 
-urlpatterns = patterns('', )
+urlpatterns = []
 
 router = DefaultRouter()
 router.register(r'devices', FCMDeviceViewSet)
 
-urlpatterns += patterns(
-    '',
+urlpatterns += [
     url(
         r'^notification_devices/$', RegistrationTokenView.as_view(),
         name='registration-token'),
     url('^serviceworker.js$', service_worker),
     url('^manifest.json$', manifest),
     url('^fcm.js$', fcm),
     url('^toast.min.js$', toast),
-)
+]
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-molo.core<6.0.0,>=5.0.0
+molo.core<7.0.0,>=6.0.0
 celery<4.0
 django-celery
 psycopg2