Update packages and migrate to plyara

Author: Taskr

.gitignore

@@ -10,6 +10,4 @@ yarn.lock
 npm
 logs
 static
-node_modules
-plyara/build/*
-plyara/plyara/parsetab.py
+node_modules

Pipfile

@@ -11,7 +11,6 @@ django-filter = "*"
 djangorestframework = "*"
 django-rest-framework-social-oauth2 = "*"
 drfdocs = "*"
-ply = "*"
 psycopg2 = "*"
 pyjwkest = "*"
 python-dateutil = "*"
@@ -24,12 +23,12 @@ greenlet= "*"
 gevent = "*"
 gunicorn = "*"
 whitenoise = "*"
-Django = ">=1.11,<2.0"
+Django = "*"
 Markdown = "*"
 Pygments = "*"
 SQLAlchemy = "*"
 Unipath = "*"
-"b1d46b9" = {path = "./plyara", editable = true}
+plyara = "*"
 
 [dev-packages]
 coveralls = "*"

Pipfile.lock

@@ -8,7 +8,7 @@
 
 
 urlpatterns = [
-    url(r'^', include('rest_framework_docs.urls')),
+    # url(r'^', include('rest_framework_docs.urls')), 
     url(r'^token-auth/', views.obtain_auth_token),
     url(r'^account/', include(YaraGuardian.API.account)),
     url(r'^groups/', include(YaraGuardian.API.groups)),

YaraGuardian/API/urls.py

@@ -1,2 +1,2 @@
-__version__ = '1.5.0'
+__version__ = '1.6.0'
 VERSION = __version__

YaraGuardian/__init__.py

@@ -152,15 +152,14 @@ def retrieve_setting(setting, env=settings_environment,
     'rules'
 ]
 
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = [
     # Add Angular URL Middleware
     'djng.middleware.AngularUrlMiddleware',
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
@@ -293,7 +292,7 @@ def retrieve_setting(setting, env=settings_environment,
     INSTALLED_APPS.insert(INSTALLED_APPS.index('django.contrib.staticfiles'), 'whitenoise.runserver_nostatic')
 
     # Load whitenoise middleware to serve staticfiles
-    MIDDLEWARE_CLASSES.insert(MIDDLEWARE_CLASSES.index('django.middleware.security.SecurityMiddleware') + 1, 'whitenoise.middleware.WhiteNoiseMiddleware')
+    MIDDLEWARE.insert(MIDDLEWARE.index('django.middleware.security.SecurityMiddleware') + 1, 'whitenoise.middleware.WhiteNoiseMiddleware')
 
 
 # Social Authentication Configurations

YaraGuardian/settings.py

@@ -2,7 +2,7 @@
 from django.http import HttpResponseRedirect, HttpResponse
 from django.views.generic import View, TemplateView, FormView
 from django.contrib.auth import login, logout
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.urls import reverse, reverse_lazy
 from django.contrib.auth.forms import AuthenticationForm, PasswordResetForm
 
 from core.permissions import LoginRequiredModifiedMixin, RegistrationIsEnabledMixin

YaraGuardian/views.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.contrib.auth.mixins import UserPassesTestMixin, LoginRequiredMixin
 
 from .services import check_registration_enabled

core/permissions.py

@@ -2,7 +2,7 @@
 
 from django.test import TestCase
 from django.contrib.auth.models import Group
-from django.core.urlresolvers import reverse, resolve
+from django.urls import reverse, resolve
 from rest_framework.test import APIRequestFactory, force_authenticate
 
 from .testing_core import generate_test_user