merged with master

arpwatch/urls.py

@@ -1,17 +1,18 @@
-from django.conf.urls import url
+from django.urls import path
 
 from arpwatch import views
 
+
 app_name = 'arpwatch'
 urlpatterns = [
-   url(r'^$', views.home, name='home'),
-   url(r'^import/$', views.import_files, name='import'),
-   url(r'^devices/$', views.device_list, name='devices'),
-   url(r'^device/(?P<device_id>[\d]+)/$', views.device, name='device'),
-   url(r'^device/$', views.device_logs_today, name='devices_today'),
-   url(r'^device/(?P<year>\d+)/(?P<month>\d+)/(?P<day>\d+)/$', views.device_logs_by_day, name='device_logs'),
-   url(r'^user/$', views.logins_today, name='user'),
-   url(r'^user/(?P<year>\d+)/(?P<month>\d+)/(?P<day>\d+)/$', views.logins_by_day, name='user_logs'),
+   path('', views.home, name='home'),
+   path('import/', views.import_files, name='import'),
+   path('devices/', views.device_list, name='devices'),
+   path('device/(<int:device_id>)/', views.device, name='device'),
+   path('device/', views.device_logs_today, name='devices_today'),
+   path('device/<int:year>/<int:month>/<day>/', views.device_logs_by_day, name='device_logs'),
+   path('user/', views.logins_today, name='user'),
+   path('user/<int:year>/<int:month>/<int:day>/', views.logins_by_day, name='user_logs'),
 ]
 
 

comlink/urls.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
-from django.conf.urls import url, include
+from django.urls import path,re_path
+
 
 from comlink import views
 
 app_name = 'comlink'
 urlpatterns = [
-    url(r'^$', views.home, name="home"),
-    url(r'^inbox/(?P<address>[\w.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4})/$', views.inbox, name='inbox'),
-    url(r'^mail/(?P<id>\d+)/$', views.view_mail, name='mail'),
-
-    url(r'^incoming/$', views.Incoming.as_view(), name='incoming'),
+    path('', views.home, name="home"),
+    path('incoming/', views.Incoming.as_view(), name='incoming'),
+    path('mail/<int:id>/', views.view_mail, name='mail'),
+    re_path(r'inbox/(?P<address>[\w.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4})/$', views.inbox, name='inbox'),
 ]

doors/keymaster/urls.py

@@ -1,14 +1,15 @@
-from django.conf.urls import url
+from django.urls import path
 
 from doors.keymaster import views
 
+
 app_name = 'doors'
 urlpatterns = [
-    url(r'^$', views.home, name='home'),
-    url(r'^logs/$', views.logs, name='logs'),
-    url(r'^keys/(?P<username>[^/]+)/$', views.user_keys, name='keys'),
-    url(r'^users/$', views.user_list, name='users'),
-    url(r'^add_key/$', views.add_key, name='add_key'),
-    url(r'^test_door/$', views.test_door, name='test'),
-    url(r'^keymaster/$', views.keymaster, name='keymaster'),
+    path('', views.home, name='home'),
+    path('logs/', views.logs, name='logs'),
+    path('keys/<username>/', views.user_keys, name='keys'),
+    path('users/', views.user_list, name='users'),
+    path('add_key/', views.add_key, name='add_key'),
+    path('test_door/', views.test_door, name='test'),
+    path('keymaster/', views.keymaster, name='keymaster'),
 ]

interlink/urls.py

@@ -1,18 +1,19 @@
-from django.conf.urls import url
+from django.urls import path
 
 from interlink import views
 
+
 app_name = 'interlink'
 urlpatterns = [
-    url(r'^$', views.home, name='home'),
-    url(r'^messages/(?P<list_id>[^/]+)/$', views.list_messages, name='messages'),
-    url(r'^subscribers/(?P<list_id>[^/]+)/$', views.list_subscribers, name='subscribers'),
-    url(r'^unsubscribe/(?P<list_id>[^/]+)/(?P<username>[^/]+)$', views.unsubscribe, name='unsubscribe'),
-    url(r'^subscribe/(?P<list_id>[^/]+)/(?P<username>[^/]+)$', views.subscribe, name='subscribe'),
-    url(r'^moderate/$', views.moderator_list, name='moderate'),
-    url(r'^moderate/(?P<id>[\d]+)/$', views.moderator_inspect, name='inspect'),
-    url(r'^moderate/(?P<id>[\d]+)/approve/$', views.moderator_approve, name='approve'),
-    url(r'^moderate/(?P<id>[\d]+)/reject/$', views.moderator_reject, name='reject'),
+    path('', views.home, name='home'),
+    path('messages/<int:list_id>/', views.list_messages, name='messages'),
+    path('subscribers/<int:list_id>/', views.list_subscribers, name='subscribers'),
+    path('unsubscribe/<int:list_id>/<username>/', views.unsubscribe, name='unsubscribe'),
+    path('subscribe/<int:list_id>/<username>/', views.subscribe, name='subscribe'),
+    path('moderate/', views.moderator_list, name='moderate'),
+    path('moderate/<int:id>/', views.moderator_inspect, name='inspect'),
+    path('moderate/<int:id>/approve/', views.moderator_approve, name='approve'),
+    path('moderate/<int:id>/reject/', views.moderator_reject, name='reject'),
 ]
 
 # Copyright 2018 Office Nomads LLC (http://www.officenomads.com/) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

member/urls/__init__.py

@@ -1,25 +1,25 @@
-from django.conf.urls import include, url
+from django.urls import include, path
 from django.shortcuts import redirect
 
 from member.views import core
 
 app_name = 'member'
 urlpatterns = [
-    url(r'^$', core.home, name='home'),
-    url(r'^faq/$', core.faq, name='faq'),
-    url(r'^help/(?P<slug>[^/]+)/$', core.help_topic, name='help'),
-    url(r'^view/$', core.view_members, name='members'),
-    url(r'^receipt/(?P<bill_id>\d+)$', core.bill_receipt, name='receipt'),
-    url(r'^register/$', core.register, name='register'),
-    url(r'^manage/(?P<username>[^/]+)/$', core.manage_member, name='manage'),
-    url(r'^not_active/$', core.not_active, name='not_active'),
+    path('', core.home, name='home'),
+    path('faq/', core.faq, name='faq'),
+    path('help/<slug:slug>/', core.help_topic, name='help'),
+    path('view/', core.view_members, name='members'),
+    path('receipt/<int:bill_id>', core.bill_receipt, name='receipt'),
+    path('register/', core.register, name='register'),
+    path('manage/<username>/', core.manage_member, name='manage'),
+    path('not_active/', core.not_active, name='not_active'),
 
-    url(r'^profile/', include('member.urls.profile', namespace='profile')),
-    url(r'^organization/', include('member.urls.organization', namespace="org")),
-    url(r'^tags/', include('member.urls.tags', namespace='tag')),
-    url(r'^connect/', include('member.urls.connect', namespace='connect')),
-    url(r'^events/', include('member.urls.events', namespace='event')),
-    url(r'^json/', include('member.urls.json', namespace='json')),
+    path('profile/', include('member.urls.profile', namespace='profile')),
+    path('organization/', include('member.urls.organization', namespace="org")),
+    path('tags/', include('member.urls.tags', namespace='tag')),
+    path('connect/', include('member.urls.connect', namespace='connect')),
+    path('events/', include('member.urls.events', namespace='event')),
+    path('json/', include('member.urls.json', namespace='json')),
 ]
 
 # Copyright 2018 Office Nomads LLC (http://www.officenomads.com/) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

member/urls/connect.py

@@ -1,20 +1,19 @@
-from django.conf.urls import url
-from django.shortcuts import redirect
+from django.urls import path
 
 from member.views import connect
 
 app_name = 'member'
 urlpatterns = [
-    url(r'^notifications/$', connect.notifications, name='notifications'),
-    url(r'^notifications/add/(?P<username>[^/]+)/$', connect.add_notification, name='add_notification'),
-    url(r'^notifications/delete/(?P<username>[^/]+)/$', connect.delete_notification, name='del_notification'),
-    url(r'^chat/$', connect.chat, name='chat'),
-    url(r'^lists/$', connect.mail, name='email_lists'),
-    url(r'^mail/(?P<id>\d+)/$', connect.mail_message, name='view_mail'),
-    url(r'^slack/$', connect.slack_redirect, name='slack_redirect'),
-    url(r'^slack/(?P<username>[^/]+)/$', connect.slack, name='slack'),
-    url(r'^slack_bots/$', connect.slack_bots, name='slack_bot'),
-    url(r'^(?P<username>[^/]+)/$', connect.connect, name='connect'),
+    path('notifications/', connect.notifications, name='notifications'),
+    path('notifications/add/<username>/', connect.add_notification, name='add_notification'),
+    path('notifications/delete/<username>/', connect.delete_notification, name='del_notification'),
+    path('chat/', connect.chat, name='chat'),
+    path('lists/', connect.mail, name='email_lists'),
+    path('mail/<id>/', connect.mail_message, name='view_mail'),
+    path('slack/', connect.slack_redirect, name='slack_redirect'),
+    path('slack/<username>/', connect.slack, name='slack'),
+    path('slack_bots/', connect.slack_bots, name='slack_bot'),
+    path('<username>)/', connect.connect, name='connect'),
 ]
 
 # Copyright 2018 Office Nomads LLC (http://www.officenomads.com/) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

member/urls/events.py

@@ -1,14 +1,13 @@
-from django.conf.urls import url
-from django.shortcuts import redirect
+from django.urls import path
 
 from member.views import events
 
 app_name = 'member'
 urlpatterns = [
-    url(r'^events/$', events.events_google, name='events'),
-    url(r'^booking/create/(?P<username>[^/]+)/$', events.create_booking, name='create_booking'),
-    url(r'^booking/confirm/(?P<room>[^/]+)/(?P<start>[^/]+)/(?P<end>[^/]+)/(?P<date>[^/]+)/(?P<rate>[^/]+)$', events.confirm_booking, name='confirm_booking'),
-    url(r'^calendar/$', events.calendar, name='calendar'),
+    path('events/', events.events_google, name='events'),
+    path('booking/create/<username>/', events.create_booking, name='create_booking'),
+    path('booking/confirm/<room>/<start>/<end>/<date>/<rate>/', events.confirm_booking, name='confirm_booking'),
+    path('calendar/', events.calendar, name='calendar'),
 ]
 
 # Copyright 2018 Office Nomads LLC (http://www.officenomads.com/) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

member/urls/json.py

@@ -1,14 +1,13 @@
-from django.conf.urls import url
-from django.shortcuts import redirect
+from django.urls import path
 
 from member.views import json
 
 app_name = 'member'
 urlpatterns = [
-    url(r'^user_search/$', json.user_search, name='user_search'),
-    url(r'^user_tags/$', json.user_tags, name='user_tags'),
-    url(r'^org_tags/$', json.org_tags, name='org_tags'),
-    url(r'^org_search/$', json.org_search, name='org_search'),
+    path('user_search/', json.user_search, name='user_search'),
+    path('user_tags/', json.user_tags, name='user_tags'),
+    path('org_tags/', json.org_tags, name='org_tags'),
+    path('org_search/', json.org_search, name='org_search'),
 ]
 
 # Copyright 2018 Office Nomads LLC (http://www.officenomads.com/) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

member/urls/organization.py

@@ -1,15 +1,15 @@
-from django.conf.urls import url
+from django.urls import path
 
 from member.views import organization
 
 app_name = 'member'
 urlpatterns = [
-    url(r'^$', organization.org_list, name='list'),
-    url(r'^add/$', organization.org_add, name='add'),
-    url(r'^(?P<org_id>\d+)/$', organization.org_view, name='view'),
-    url(r'^(?P<org_id>\d+)/member/$', organization.org_member, name='member'),
-    url(r'^(?P<org_id>\d+)/edit/$', organization.org_edit, name='edit'),
-    url(r'^(?P<org_id>\d+)/edit_photo/$', organization.org_edit_photo, name='edit_photo'),
+    path('', organization.org_list, name='list'),
+    path('add/', organization.org_add, name='add'),
+    path('<int:org_id>/', organization.org_view, name='view'),
+    path('<int:org_id>/member/', organization.org_member, name='member'),
+    path('<int:org_id>/edit/', organization.org_edit, name='edit'),
+    path('<int:org_id>/edit_photo/', organization.org_edit_photo, name='edit_photo'),
 ]
 
 # Copyright 2018 Office Nomads LLC (http://www.officenomads.com/) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

member/urls/profile.py

@@ -1,24 +1,23 @@
-from django.conf.urls import url
-from django.shortcuts import redirect
+from django.urls import path
 
 from member.views import profile
 
 app_name = 'member'
 urlpatterns = [
-    url(r'^$', profile.profile_redirect, name='redirect'),
-    url(r'^(?P<username>[^/]+)/$', profile.profile, name='view'),
-    url(r'^(?P<username>[^/]+)/private/$', profile.profile_private, name='private'),
-    url(r'^(?P<username>[^/]+)/memberships/$', profile.profile_membership, name='membership'),
-    url(r'^(?P<username>[^/]+)/organizations/$', profile.profile, name='orgs'),
-    url(r'^(?P<username>[^/]+)/documents/$', profile.profile_documents, name='documents'),
-    url(r'^(?P<username>[^/]+)/events/$', profile.profile_events, name='events'),
-    url(r'^(?P<username>[^/]+)/activity/$', profile.profile_activity, name='activity'),
-    url(r'^(?P<username>[^/]+)/billing/$', profile.profile_billing, name='billing'),
-    url(r'^(?P<username>[^/]+)/devices/$', profile.user_devices, name='devices'),
-    url(r'^(?P<username>[^/]+)/edit/$', profile.edit_profile, name='edit'),
-    url(r'^(?P<username>[^/]+)/edit_photo/$', profile.edit_photo, name='edit_photo'),
-    url(r'^(?P<username>[^/]+)/disable_billing/$', profile.disable_billing, name='disable_billing'),
-    url(r'^(?P<username>[^/]+)/file/(?P<disposition>[^/]+)/(?P<file_name>[^/]+)$', profile.file_view, name='file'),
+    path('', profile.profile_redirect, name='redirect'),
+    path('<username>/', profile.profile, name='view'),
+    path('<username>/private/', profile.profile_private, name='private'),
+    path('<username>/memberships/', profile.profile_membership, name='membership'),
+    path('<username>/organizations/', profile.profile, name='orgs'),
+    path('<username>/documents/', profile.profile_documents, name='documents'),
+    path('<username>/events/', profile.profile_events, name='events'),
+    path('<username>/activity/', profile.profile_activity, name='activity'),
+    path('<username>/billing/', profile.profile_billing, name='billing'),
+    path('<username>/devices/', profile.user_devices, name='devices'),
+    path('<username>/edit/', profile.edit_profile, name='edit'),
+    path('<username>/edit_photo/', profile.edit_photo, name='edit_photo'),
+    path('<username>/disable_billing/', profile.disable_billing, name='disable_billing'),
+    path('<username>/file/<disposition>/<file_name>', profile.file_view, name='file'),
 ]
 
 # Copyright 2018 Office Nomads LLC (http://www.officenomads.com/) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

member/urls/tags.py

@@ -1,17 +1,16 @@
-from django.conf.urls import url
-from django.shortcuts import redirect
+from django.urls import path
 
 from member.views import tags
 
 app_name = 'member'
 urlpatterns = [
-    url(r'^list/(?P<type>[^/]+)/$', tags.tag_list, name='list'),
-    url(r'^cloud/(?P<type>[^/]+)/$', tags.tag_cloud, name='cloud'),
-    url(r'^add/user/(?P<username>[^/]+)/$', tags.add_tag, name='add'),
-    url(r'^remove/user/(?P<username>[^/]+)/(?P<tag>[^/]+)/$', tags.remove_tag, name='remove'),
-    url(r'^add/org/(?P<org_id>\d+)/$', tags.add_org_tag, name='add_org'),
-    url(r'^remove/org/(?P<org_id>\d+)/(?P<tag>[^/]+)/$', tags.remove_org_tag, name='remove_org'),
-    url(r'^(?P<type>[^/]+)/(?P<tag>[^/]+)/$', tags.tag_view, name='view'),
+    path('list/<type>/', tags.tag_list, name='list'),
+    path('cloud/<type>/', tags.tag_cloud, name='cloud'),
+    path('add/user/<username>/', tags.add_tag, name='add'),
+    path('remove/user/<username>/<tag>/', tags.remove_tag, name='remove'),
+    path('add/org/<int:org_id>/', tags.add_org_tag, name='add_org'),
+    path('remove/org/<int:org_id>/<tag>/', tags.remove_org_tag, name='remove_org'),
+    path('<type>/<tag>/', tags.tag_view, name='view'),
 
 ]
 

requirements.txt

@@ -2,20 +2,19 @@
 Django==2.1
 Pillow==5.2.0
 psycopg2==2.7.5
-django-localflavor==2.0
+django-localflavor==2.1
 django-localflavor-us==1.1
-django-taggit==0.22.2
+django-taggit==0.23.0
 django-taggit-templatetags2==1.6.1
 django-crontab==0.7.1
 python-slugify==1.2.5
 pytz==2018.5
 requests==2.19.1
-gunicorn==19.9.0
-setuptools==40.0.0
+setuptools==40.2.0
 
 # Supporting libraries
 mailchimp3==3.0.4
-cryptography==2.3
+cryptography==2.3.1
 
 # LDAP Syncing
 #django-ldapdb==1.2.0
@@ -28,7 +27,7 @@ django-jsignature==0.8
 weasyprint==0.42.3
 
 # Libraries for Xero
-pyxero==0.9.0
+pyxero==0.9.1
 PyJWT==1.6.4
 
 # Libraries for Arpwatch
@@ -39,7 +38,7 @@ pysnmp-mibs==0.1.6
 suds-jurko==0.6
 
 # Stripe libraries
-#stripe==2.4.0
+#stripe==2.6.0
 
 # For the documentation:
 sphinx==1.7.6
@@ -51,6 +50,6 @@ Markdown==2.6.11
 CommonMark==0.5.4
 
 # A few handy tools
-safety==1.8.3
+safety==1.8.4
 django-debug-toolbar==1.9.1
 pip-review==1.0