[gsoc2020] Remove django-netjsongraph

frankfanslc · Jun 17, 2020 · 118267d · 118267d
1 parent 6734a2d
commit 118267d
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -46,7 +46,6 @@ You can build with your own python package by creating a file named `.build.env`
 - `OPENWISP_UTILS_SOURCE`
 - `DJANGO_SOURCE`
 - `DJANGO_NETJSONCONFIG_SOURCE`
-- `DJANGO_NETJSONGRAPH_SOURCE`
 - `DJANGO_X509_SOURCE`
 - `DJANGO_FREERADIUS_SOURCE`
 

diff --git a/build/common/openwisp/settings.py b/build/common/openwisp/settings.py
@@ -219,6 +219,13 @@
         'level': os.environ['DJANGO_LOG_LEVEL'],
         'handlers': ['console', 'mail_admins',],
     },
+    'loggers': {
+        'pre_django_setup': {
+            'level': os.environ['DJANGO_LOG_LEVEL'],
+            'handlers': ['console'],
+            'propagate': False,
+        }
+    }
 }
 
 # Sentry

diff --git a/build/openwisp_base/Dockerfile b/build/openwisp_base/Dockerfile
@@ -21,7 +21,7 @@ ENV PYTHONPATH=/install/lib/python3.7/site-packages
 # Python Packages
 ARG OPENWISP_CONTROLLER_SOURCE=openwisp-controller~=0.5.0
 RUN pip install --upgrade --prefix='/install' ${OPENWISP_CONTROLLER_SOURCE}
-ARG OPENWISP_TOPOLOGY_SOURCE=openwisp-network-topology~=0.3.0
+ARG OPENWISP_TOPOLOGY_SOURCE=openwisp-network-topology~=0.4.0
 RUN pip install --upgrade --prefix='/install' ${OPENWISP_TOPOLOGY_SOURCE}
 ARG DJANGO_FREERADIUS_SOURCE=https://github.com/openwisp/django-freeradius/tarball/a36d5cd5af8bf552afede6be628f6d439f6eade8
 RUN pip install --upgrade --prefix='/install' ${DJANGO_FREERADIUS_SOURCE}
@@ -31,8 +31,6 @@ ARG OPENWISP_USERS_SOURCE=openwisp-users~=0.2.0
 RUN pip install --upgrade --prefix='/install' ${OPENWISP_USERS_SOURCE}
 ARG DJANGO_NETJSONCONFIG_SOURCE=django-netjsonconfig~=0.10.0
 RUN pip install --upgrade --prefix='/install' ${DJANGO_NETJSONCONFIG_SOURCE}
-ARG DJANGO_NETJSONGRAPH_SOURCE=django-netjsongraph~=0.6.0
-RUN pip install --upgrade --prefix='/install' ${DJANGO_NETJSONGRAPH_SOURCE}
 ARG DJANGO_X509_SOURCE=django-x509~=0.6.0
 RUN pip install --upgrade --prefix='/install' ${DJANGO_X509_SOURCE}
 ARG OPENWISP_UTILS_SOURCE=openwisp-utils~=0.4.0

diff --git a/build/openwisp_dashboard/module_settings.py b/build/openwisp_dashboard/module_settings.py
@@ -56,7 +56,6 @@
 
 EXTENDED_APPS = [
     'django_freeradius',
-    'django_netjsongraph',
     'django_netjsonconfig',
     'django_x509',
     'django_loci',
@@ -69,5 +68,4 @@
     EXTENDED_APPS.remove('django_freeradius')
     INSTALLED_APPS.remove('openwisp_radius')
 if not env_bool(os.environ['USE_OPENWISP_TOPOLOGY']):
-    EXTENDED_APPS.remove('django_netjsongraph')
     INSTALLED_APPS.remove('openwisp_network_topology')
diff --git a/build/openwisp_topology/module_settings.py b/build/openwisp_topology/module_settings.py
@@ -16,5 +16,3 @@
     # rest framework
     'rest_framework',
 ]
-
-EXTENDED_APPS = ['django_netjsongraph']
diff --git a/build/openwisp_topology/urls.py b/build/openwisp_topology/urls.py
@@ -2,5 +2,5 @@
 from openwisp_network_topology.api import urls as api
 
 urlpatterns = [
-    path('api/', include(api)),
+    path('api/v1/', include(api)),
 ]
diff --git a/build/openwisp_websocket/module_settings.py b/build/openwisp_websocket/module_settings.py
@@ -35,7 +35,6 @@
 ]
 
 EXTENDED_APPS = [
-    'django_netjsongraph',
     'django_netjsonconfig',
     'django_x509',
     'django_loci',