Merge branch 'master' into 'master'

Enable Django Debug Toolbar

See merge request librespacefoundation/satnogs/satnogs-network!784

network/settings.py

@@ -39,6 +39,12 @@ LOCAL_APPS = (
     'network.api',
 )
 
+if DEBUG:
+    DJANGO_APPS += ('debug_toolbar', )
+    DEBUG_TOOLBAR_CONFIG = {
+        'SHOW_TOOLBAR_CALLBACK':
+        lambda request: request.environ.get('SERVER_NAME', None) != 'testserver',
+    }
 if AUTH0:
     THIRD_PARTY_APPS += ('social_django', )
     LOCAL_APPS += ('auth0login', )
@@ -57,6 +63,9 @@ MIDDLEWARE = (
     'csp.middleware.CSPMiddleware',
 )
 
+if DEBUG:
+    MIDDLEWARE = ('debug_toolbar.middleware.DebugToolbarMiddleware', ) + MIDDLEWARE
+
 # Email
 if DEBUG:
     EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'

network/urls.py

@@ -24,6 +24,10 @@ if settings.AUTH0:
     urlpatterns += [url(r'^', include('auth0login.urls'))]
 
 if settings.DEBUG:
+    import debug_toolbar
+
+    urlpatterns = [url(r'^__debug__/', include(debug_toolbar.urls))] + urlpatterns
+
     urlpatterns += [
         url(r'^media/(?P<path>.*)$', serve, {'document_root': settings.MEDIA_ROOT}),
     ]

requirements-dev.txt

@@ -6,7 +6,7 @@
 
 apipkg==1.5
 atomicwrites==1.3.0
-attrs==19.1.0
+attrs==19.2.0
 coverage==4.5.4
 execnet==1.7.1
 factory-boy==2.11.1

requirements.txt

@@ -15,7 +15,7 @@ clint==0.5.1
 configparser==4.0.2
 contextlib2==0.5.5
 dj-database-url==0.5.0
-Django==1.11.24
+Django==1.11.25
 django-allauth==0.35.0
 django-appconf==1.0.3
 django-autoslug==1.9.6
@@ -24,6 +24,7 @@ django-braces==1.12.0
 django-compressor==2.2
 django-crispy-forms==1.7.2
 django-csp==3.4
+django-debug-toolbar==1.11
 django-filter==1.1.0
 django-jsonfield==1.0.1
 django-redis-cache==2.0.0
@@ -41,20 +42,20 @@ importlib-metadata==0.23
 internetarchive==1.7.7
 jsonpatch==1.24
 jsonpointer==2.0
-kombu==4.6.4
+kombu==4.6.5
 lxml==4.4.1
 Markdown==2.6.11
 monotonic==1.5
 more-itertools==5.0.0
 mysqlclient==1.3.14
 oauthlib==3.1.0
-pathlib2==2.3.4
+pathlib2==2.3.5
 Pillow==5.0.0
 PyJWT==1.7.1
 python-decouple==3.1
 python-dotenv==0.6.5
 python-openid==2.2.5
-pytz==2019.2
+pytz==2019.3
 rcssmin==1.0.6
 redis==3.3.8
 requests==2.22.0
@@ -69,6 +70,7 @@ shortuuid==0.5.0
 six==1.12.0
 social-auth-app-django==1.2.0
 social-auth-core==3.2.0
+sqlparse==0.3.0
 unicode-slugify==0.1.3
 Unidecode==1.1.1
 Unipath==1.1

setup.cfg

@@ -62,6 +62,8 @@ install_requires =
     # Astronomy
     ephem~=3.7.7.0
     satellitetle~=0.7.0
+    # Debugging
+    django-debug-toolbar~=1.11.0
 
 [options.extras_require]
 dev =