Adding new version of Django (4.1), fixing urls with that change

Alexis Koralewski
1 parent a98ca72e
Showing 12 changed files with 67 additions and 69 deletions Show diff stats
install/requirements.txt
src/core/pyros_django/alert_manager/urls.py
src/core/pyros_django/analyzer/urls.py
src/core/pyros_django/devices/urls.py
src/core/pyros_django/majordome/urls.py
src/core/pyros_django/monitoring/urls.py
src/core/pyros_django/observation_manager/urls.py
src/core/pyros_django/pyros/urls.py
src/core/pyros_django/routine_manager/urls.py
src/core/pyros_django/scheduler/urls.py
src/core/pyros_django/scientific_program/urls.py
src/core/pyros_django/user_manager/urls.py
 anyjson==0.3.3
 click==8.0.3
 DateTime==4.3
-Django==3.2
+Django==4.1
 django-admin-tools==0.9.1
 django-bootstrap3==21.1
 django-extensions==3.1.5
-from django.conf.urls import url
+from django.urls import include, path  # For django versions from 2.0 and up
 from . import views
  
 urlpatterns = [
-               url(r'^start_simulation', views.start_simulation, name="start_simulation"),
-               url(r'^change_obs_strategy/(?P<alert_id>\d+)$', views.change_obs_strategy, name="change_obs_strategy"),
-               url(r'^change_obs_strategy_validate/(?P<alert_id>\d+)$', views.change_obs_strategy_validate, name="change_obs_strategy_validate"),
-               url(r'^alerts$', views.alerts_list, name='alerts_list'),
-               url(r'^change_default_strategy/(?P<strat_id>\d+)$', views.change_default_strategy, name='change_default_strategy'),
+               path('start_simulation', views.start_simulation, name="start_simulation"),
+               path('change_obs_strategy/(?P<alert_id>\d+)$', views.change_obs_strategy, name="change_obs_strategy"),
+               path('change_obs_strategy_validate/(?P<alert_id>\d+)$', views.change_obs_strategy_validate, name="change_obs_strategy_validate"),
+               path('alerts$', views.alerts_list, name='alerts_list'),
+               path('change_default_strategy/(?P<strat_id>\d+)$', views.change_default_strategy, name='change_default_strategy'),
               ]
-from django.conf.urls import url
+
 from . import views
  
 urlpatterns = [
-from django.conf.urls import url
+from django.urls import include, path  # For django versions from 2.0 and up
 from . import views
  
  
 urlpatterns = [
-url(r'^observation_status$', views.observation_status, name="observation_status"),
-url(r'^update_cagire_logs$', views.update_cagire_logs, name="update_cagire_logs"),
-url(r'^update_telescope_logs$', views.update_telescope_logs, name="update_telescope_logs"),
-url(r'^update_ddrago_r_logs$', views.update_ddrago_r_logs, name="update_ddrago_r_logs"),
-url(r'^update_ddrago_b_logs$', views.update_ddrago_b_logs, name="update_ddrago_b_logs"),
+path('observation_status', views.observation_status, name="observation_status"),
+path('update_cagire_logs', views.update_cagire_logs, name="update_cagire_logs"),
+path('update_telescope_logs', views.update_telescope_logs, name="update_telescope_logs"),
+path('update_ddrago_r_logs', views.update_ddrago_r_logs, name="update_ddrago_r_logs"),
+path('update_ddrago_b_logs', views.update_ddrago_b_logs, name="update_ddrago_b_logs"),
 ]
 \ No newline at end of file
-from django.conf.urls import url
+
 from . import views
  
 urlpatterns = []
-from django.conf.urls import url
+
 from django.urls import path
 from . import views
  
-from django.conf.urls import url
+
 from . import views
  
 urlpatterns = [
@@ -16,7 +16,6 @@ Including another URLconf
 from django.contrib import admin
  
 from django.conf import settings
-from django.conf.urls import include, url  # For django versions before 2.0
 from django.urls import include, path  # For django versions from 2.0 and up
  
 from django.conf.urls.static import static
@@ -29,21 +28,21 @@ urlpatterns = [
 ]
 '''
 urlpatterns = [
-    url(r'^admin/', admin.site.urls),
-    url(r'^dashboard/', include('dashboard.urls')),
-    url(r'^devices/', include('devices.urls')),
-    url(r'^scheduler/', include('scheduler.urls')),
-    url(r'^alert_manager/', include('alert_manager.urls')),
-    url(r'^analyzer/', include('analyzer.urls')),
-    url(r'^majordome/', include('majordome.urls')),
-    url(r'^monitoring/', include('monitoring.urls')),
-    url(r'^observation_manager/', include('observation_manager.urls')),
-    url(r'^routine_manager/', include('routine_manager.urls')),
-    url(r'^user_manager/', include('user_manager.urls')),
-    url(r'^scientific_program/', include('scientific_program.urls')),
-    url(r'^obs_config/', include('obsconfig.urls')),
-    url(r'^api/', include('api.urls')),
-    url(r'^$', dashboard.views.index)
+    path('admin/', admin.site.urls),
+    path('dashboard/', include('dashboard.urls')),
+    path('devices/', include('devices.urls')),
+    path('scheduler/', include('scheduler.urls')),
+    path('alert_manager/', include('alert_manager.urls')),
+    path('analyzer/', include('analyzer.urls')),
+    path('majordome/', include('majordome.urls')),
+    path('monitoring/', include('monitoring.urls')),
+    path('observation_manager/', include('observation_manager.urls')),
+    path('routine_manager/', include('routine_manager.urls')),
+    path('user_manager/', include('user_manager.urls')),
+    path('scientific_program/', include('scientific_program.urls')),
+    path('obs_config/', include('obsconfig.urls')),
+    path('api/', include('api.urls')),
+    path('', dashboard.views.index)
 ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
  
 if settings.DEBUG:
-from django.conf.urls import url
+from django.urls import re_path
 from django.urls import path
 from . import views
  
 urlpatterns = [
-    url(r'^$', views.sequences_list, name="sequences_list"),
-    url(r'^(?P<status>-?\d)/(?P<message>.+)$',
+    re_path(r'^$', views.sequences_list, name="sequences_list"),
+    re_path(r'^(?P<status>-?\d)/(?P<message>.+)$',
         views.sequences_list, name="sequences_list"),
  
-    url(r'^action_request/(?P<req_id>\d+)/(?P<action>[a-z_]{1,20})$',
+    re_path(r'^action_request/(?P<req_id>\d+)/(?P<action>[a-z_]{1,20})$',
         views.action_request, name="action_request"),
-    url(r'^action_request/(?P<req_id>\d+)/(?P<action>[a-z_]{1,20})/(?P<status>-?\d)/(?P<message>.+)$',
+    re_path(r'^action_request/(?P<req_id>\d+)/(?P<action>[a-z_]{1,20})/(?P<status>-?\d)/(?P<message>.+)$',
         views.action_request, name="action_request_message"),
  
-    url(r'^action_sequence/(?P<seq_id>\d+)/(?P<action>[a-z_]{1,20})$',
+    re_path(r'^action_sequence/(?P<seq_id>\d+)/(?P<action>[a-z_]{1,20})$',
         views.action_sequence, name="action_sequence"),
-    url(r'^action_sequence/(?P<seq_id>\d+)/(?P<action>[a-z_]{1,20})/(?P<status>-?\d)/(?P<message>.+)$',
+    re_path(r'^action_sequence/(?P<seq_id>\d+)/(?P<action>[a-z_]{1,20})/(?P<status>-?\d)/(?P<message>.+)$',
         views.action_sequence, name="action_sequence_message"),
  
-    url(r'^action_album/(?P<alb_id>\d+)/(?P<action>[a-z_]{1,20})$',
+    re_path(r'^action_album/(?P<alb_id>\d+)/(?P<action>[a-z_]{1,20})$',
         views.action_album, name="action_album"),
-    url(r'^action_album/(?P<alb_id>\d+)/(?P<action>[a-z_]{1,20})/(?P<status>-?\d)/(?P<message>.+)$',
+    re_path(r'^action_album/(?P<alb_id>\d+)/(?P<action>[a-z_]{1,20})/(?P<status>-?\d)/(?P<message>.+)$',
         views.action_album, name="action_album_message"),
  
-    url(r'^action_plan/(?P<plan_id>\d+)/(?P<action>[a-z_]{1,20})$',
+    re_path(r'^action_plan/(?P<plan_id>\d+)/(?P<action>[a-z_]{1,20})$',
         views.action_plan, name="action_plan"),
-    url(r'^action_plan/(?P<plan_id>\d+)/(?P<action>[a-z_]{1,20})/(?P<status>-?\d)/(?P<message>.+)$',
+    re_path(r'^action_plan/(?P<plan_id>\d+)/(?P<action>[a-z_]{1,20})/(?P<status>-?\d)/(?P<message>.+)$',
         views.action_plan, name="action_plan_message"),
  
-    url(r'^request_validate/(?P<req_id>\d+)$',
+    re_path(r'^request_validate/(?P<req_id>\d+)$',
         views.request_validate, name="request_validate"),
-    url(r'^sequence_validate/(?P<seq_id>\d+)$',
+    re_path(r'^sequence_validate/(?P<seq_id>\d+)$',
         views.sequence_validate, name="sequence_validate"),
-    url(r'^album_validate/(?P<alb_id>\d+)$',
+    re_path(r'^album_validate/(?P<alb_id>\d+)$',
         views.album_validate, name="album_validate"),
-    url(r'^plan_validate/(?P<plan_id>\d+)$',
+    re_path(r'^plan_validate/(?P<plan_id>\d+)$',
         views.plan_validate, name="plan_validate"),
  
-    url(r'^create_request$', views.create_request, name="create_request"),
-    #url(r'^create_sequence/(?P<req_id>\d+)$', views.create_sequence, name="create_sequence"),
-    url(r'^create_sequence/', views.create_sequence, name="create_sequence"),
-    url(r'^create_album/(?P<seq_id>\d+)$',
+    re_path(r'^create_request$', views.create_request, name="create_request"),
+    #re_path(r'^create_sequence/(?P<req_id>\d+)$', views.create_sequence, name="create_sequence"),
+    re_path(r'^create_sequence/', views.create_sequence, name="create_sequence"),
+    re_path(r'^create_album/(?P<seq_id>\d+)$',
         views.create_album, name="create_album"),
-    url(r'^create_plan/(?P<alb_id>\d+)$', views.create_plan, name="create_plan"),
+    re_path(r'^create_plan/(?P<alb_id>\d+)$', views.create_plan, name="create_plan"),
  
-    url(r'^submit_request/(?P<req_id>\d+)/(?P<redir>[a-z_]{1,20})$',
+    re_path(r'^submit_request/(?P<req_id>\d+)/(?P<redir>[a-z_]{1,20})$',
         views.submit_request, name="submit_request"),
-    url(r'^unsubmit_request/(?P<req_id>\d+)$',
+    re_path(r'^unsubmit_request/(?P<req_id>\d+)$',
         views.unsubmit_request, name="unsubmit_request"),
  
-    url(r'^export_request/(?P<req_id>\d+)$',
+    re_path(r'^export_request/(?P<req_id>\d+)$',
         views.export_request, name="export_request"),
-    url(r'^import_request$', views.import_request, name="import_request"),
+    re_path(r'^import_request$', views.import_request, name="import_request"),
     # path("test_create_plan",views.test_create_plan,name="test_create_plan"),
     path("edit_plan/<int:id>", views.edit_plan, name="edit_plan"),
     path("delete_albums/<int:seq_id>", views.delete_albums, name="delete_albums"),
-from django.conf.urls import url
+from django.urls import include, path  # For django versions from 2.0 and up
 from . import views
  
 from django.conf import settings
 from django.conf.urls.static import static
  
 urlpatterns = [
-            url(r'^$', views.current_schedule, name="current_schedule"),
-            url(r'^retrieve_schedule$', views.retrieve_schedule, name="retrieve_schedule"),
-            url(r'^simulation$', views.schedule_simulation, name="schedule_simulation"),
+            path('', views.current_schedule, name="current_schedule"),
+            path('retrieve_schedule', views.retrieve_schedule, name="retrieve_schedule"),
+            path('simulation', views.schedule_simulation, name="schedule_simulation"),
               ]
 \ No newline at end of file
-from django.conf.urls import url
+
 from django.urls import path
 from . import views
  
-from django.conf.urls import url
-from django.urls import path
+from django.urls import path, re_path
 from . import views
 from django.contrib.auth import views as auth_views
 from .forms import UserPasswordResetForm
  
 urlpatterns = [
                path('users', views.users, name="users"),
-               url(r'^create$', views.create_user, name="create_user"),
-               url(r'^forgotten_password$', views.forgotten_password, name="forgotten_password"),
-               url(r'^creation_validate$', views.user_signup_validation, name="user_signup_validation"),
-               url(r'^login$', views.login_validation, name="login_validation"),
-               url(r'^logout$', views.user_logout, name="user_logout"),
+               re_path(r'^create$', views.create_user, name="create_user"),
+               re_path(r'^forgotten_password$', views.forgotten_password, name="forgotten_password"),
+               re_path(r'^creation_validate$', views.user_signup_validation, name="user_signup_validation"),
+               re_path(r'^login$', views.login_validation, name="login_validation"),
+               re_path(r'^logout$', views.user_logout, name="user_logout"),
                path('signin', views.user_signin, name="user_signin"),
                path('sp_profile', views.superoperator_return, name="sp_profile"),
                path('users/<int:pk>', views.user_detail_view, name='user_detail'),