Update to django2 and updating dependencies

Unknown
1 parent 2591cc34
Showing 6 changed files with 55 additions and 48 deletions Show diff stats
install/REQUIREMENTS.txt
src/common/models.py
src/dashboard/views.py
src/devices/views.py
src/pyros/settings.py
src/user_manager/views.py
@@ -2,29 +2,29 @@ amqp==1.4.9
 amqplib==1.0.2
 anyjson==0.3.3
 billiard==3.3.0.23
-requests==2.12.3
+requests==2.18.4
 celery==3.1.25
-DateTime==4.1.1
+DateTime==4.2
 Django==2.0.5
-django-admin-tools==0.7.2
-django-bootstrap3==7.0.1
-django-celery==3.1.17
-django-debug-toolbar==1.4
-django-extensions==1.6.1
-django-suit==0.2.18
-django-test-without-migrations==0.4
-gunicorn==19.4.5
-iso8601==0.1.11
-jdcal==1.2
-kombu==3.0.35
-lxml==3.6.0
+django-admin-tools==0.8.1
+django-bootstrap3==10.0.1
+django-celery==3.2.2
+django-debug-toolbar==1.9.1
+django-extensions==2.0.7
+django-suit==0.2.26
+django-test-without-migrations==0.6
+gunicorn==19.8.1
+iso8601==0.1.12
+jdcal==1.4
+kombu==3.0.37
+lxml==3.8.0
 mysqlclient==1.3.12
-pluggy==0.3.1
-py==1.4.31
-pytz==2016.4
-six==1.10.0
-sqlparse==0.1.19
-Twisted==16.0.0
-voevent-parse==0.9.5
-zope.interface==4.1.1
-flower
+pluggy==0.6.0
+py==1.5.3
+pytz==2018.4
+six==1.11.0
+sqlparse==0.2.4
+Twisted==18.4.0
+voevent-parse==1.0.2
+zope.interface==4.5.0
+flower==0.9.2
@@ -392,7 +392,7 @@ class Request(models.Model):
  
  
 class Alert(Request):
-    request = models.OneToOneField('Request', on_delete=models.CASCADE, default='')
+    request = models.OneToOneField('Request', on_delete=models.CASCADE, default='', parent_link=True)
     strategyobs = models.ForeignKey(
         'StrategyObs', models.DO_NOTHING, related_name="alerts", blank=True, null=True)
     voevent_file = models.CharField(max_length=45, blank=True, null=True)
 from django.http import HttpResponse
 from django.shortcuts import render, redirect
-from django.core import urlresolvers
+
 from django.contrib.auth.decorators import login_required
 import datetime
 from common.models import Log, WeatherWatch, SiteWatch, ScientificProgram, Config
@@ -10,7 +10,8 @@ from dashboard.forms import ConfigForm
 from django.views.generic.edit import UpdateView
 from django.shortcuts import get_object_or_404
 from django.utils.decorators import method_decorator
-from django.urls import reverse_lazy
+from django.urls import reverse_lazy, reverse
+from django.http import Http404
  
 log = l.setupLogger("dashboard", "dashboard")
  
@@ -26,28 +27,35 @@ def index(request):
  
 @login_required
 def retrieve_env(request):
-    weather_status = WeatherWatch.objects.latest('updated')
-    t = datetime.datetime.now() + datetime.timedelta(hours=-7) #temporary method to demonstrate the day/night display
-    isDay = False
-    if t.hour > 5 and t.hour < 20:
-        isDay = True
-    return render(request, 'dashboard/observation_status_env.html', locals())
+    try:
+        weather_status = WeatherWatch.objects.latest('updated')
+        t = datetime.datetime.now() + datetime.timedelta(hours=-7) #temporary method to demonstrate the day/night display
+        isDay = False
+        if t.hour > 5 and t.hour < 20:
+            isDay = True
+        return render(request, 'dashboard/observation_status_env.html', locals())
+    except WeatherWatch.DoesNotExist:
+            raise Http404("No WeatherWatch matches the given query.")
+    
  
 @login_required
 def retrieve_env_navbar(request):
     if request.is_ajax():
-        weather_status = WeatherWatch.objects.latest('updated')
-        weather = serializers.serialize('json', [weather_status])
-        return HttpResponse(weather, content_type="application/json")
+        try:
+            weather_status = WeatherWatch.objects.latest('updated')
+            weather = serializers.serialize('json', [weather_status])
+            return HttpResponse(weather, content_type="application/json")
+        except WeatherWatch.DoesNotExist:
+            raise Http404("No WeatherWatch matches the given query.")
  
 @login_required
 def users(request):
-    url_ = urlresolvers.reverse('admin:auth_user_changelist')
+    url_ = reverse('admin:auth_user_changelist')
     return redirect(url_) 
  
 @login_required
 def routines(request):
-    url_ = urlresolvers.reverse('admin:common_request_changelist')
+    url_ = reverse('admin:common_request_changelist')
     return redirect(url_)
  
  
@@ -108,7 +116,7 @@ def configUpdate(request):
  
 @login_required
 def devices(request):
-    url_ = urlresolvers.reverse('admin:common_device_changelist')
+    url_ = reverse('admin:common_device_changelist')
     return redirect(url_)
  
 @login_required
@@ -132,13 +140,13 @@ def system_retrieve_logs(request):
  
 @login_required
 def schedule(request):
-    url_ = urlresolvers.reverse('admin:common_schedule_changelist')
+    url_ = reverse('admin:common_schedule_changelist')
     return redirect(url_)
  
  
 @login_required
 def quotas(request):
-    url_ = urlresolvers.reverse('admin:common_pyrosuser_changelist')
+    url_ = reverse('admin:common_pyrosuser_changelist')
     return redirect(url_)
  
  
 from django.shortcuts import render
 from common.models import Log
 from django.http import HttpResponse
-from django.core import urlresolvers
 from django.core import serializers
 from django.contrib.auth.decorators import login_required
+import django.urls
  
 MAX_LOGS_LINES = 200
 # Create your views here.
@@ -53,7 +53,7 @@ SECRET_KEY = &#39;0*@w)$rq4x1c2w!c#gn58*$*u$w=s8uw2zpr_c3nj*u%qlxc23&#39;
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
  
-ALLOWED_HOSTS = ['localhost']
+ALLOWED_HOSTS = ['localhost', '127.0.0.1']
  
  
 # Application definition
@@ -85,13 +85,12 @@ INSTALLED_APPS = [
     #'kombu.transport.django'
 ]
  
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = [
     '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',
 ]
@@ -9,7 +9,7 @@ def home(request):
     '''
         Initial login view when coming on the website
     '''
-    if request.user.is_authenticated():
+    if request.user.is_authenticated:
         return(render(request, LOGGED_PAGE, {'message' : "You are already connected", 'success' : True}))
     return(render(request, "user_manager/home_login.html"))
  
@@ -17,7 +17,7 @@ def create_user(request):
     '''
         View called to open the user creation form
     '''
-    if request.user.is_authenticated():
+    if request.user.is_authenticated:
         return(render(request, LOGGED_PAGE, {'message' : "You are already connected", 'success' : True}))
     form = PyrosUserCreationForm()
     return (render(request, "user_manager/home_user_creation.html", locals()))
@@ -26,7 +26,7 @@ def user_signup_validation(request):
     '''
         View called to validate the user creation (form submitted)
     '''
-    if request.user.is_authenticated():
+    if request.user.is_authenticated:
         return(render(request, LOGGED_PAGE, {'message' : "You are already connected", 'success' : True}))
     form = PyrosUserCreationForm(request.POST)
     if request.POST:
@@ -48,7 +48,7 @@ def login_validation(request):
     '''
         View called when the user log in (form submitted)
     '''
-    if request.user.is_authenticated():
+    if request.user.is_authenticated:
         return(render(request, LOGGED_PAGE, {'message' : "You are already connected", 'success' : True}))
     username = password = ''
     if request.POST: