From 63f9c28aed9e3e0978d77ec6ac998f27e105a39b Mon Sep 17 00:00:00 2001 From: Samuel Gaist <samuel.gaist@idiap.ch> Date: Wed, 22 Apr 2020 09:20:07 +0200 Subject: [PATCH] [api_urls] Pre-commit cleanup --- beat/web/accounts/api_urls.py | 50 ++++++++------------- beat/web/algorithms/api_urls.py | 70 +++++++++++++---------------- beat/web/attestations/api_urls.py | 27 +++--------- beat/web/backend/api_urls.py | 18 ++++---- beat/web/databases/api_urls.py | 17 +++++-- beat/web/dataformats/api_urls.py | 35 ++++++++++++--- beat/web/experiments/api_urls.py | 1 + beat/web/libraries/api_urls.py | 54 ++++++++++------------- beat/web/plotters/api_urls.py | 71 +++++++++++++++++++----------- beat/web/reports/api_urls.py | 73 ++++++++++--------------------- beat/web/search/api_urls.py | 36 +++++---------- beat/web/team/api_urls.py | 17 +++---- beat/web/toolchains/api_urls.py | 34 +++++--------- 13 files changed, 226 insertions(+), 277 deletions(-) diff --git a/beat/web/accounts/api_urls.py b/beat/web/accounts/api_urls.py index 2d037b3df..b57b22e5c 100644 --- a/beat/web/accounts/api_urls.py +++ b/beat/web/accounts/api_urls.py @@ -25,62 +25,50 @@ # # ############################################################################### -from django.conf.urls import * +from django.conf.urls import url + from . import api urlpatterns = [ + url(r"^$", api.SupervisorListView.as_view(), name="list_supervisee"), url( - r'^$', - api.SupervisorListView.as_view(), - name='list_supervisee' - ), - - url( - r'^(?P<supervisee_name>[\w\W]+)/validate/$', + r"^(?P<supervisee_name>[\w\W]+)/validate/$", api.SupervisorAddSuperviseeView.as_view(), - name='validate_supervisee' + name="validate_supervisee", ), - url( - r'^(?P<supervisee_name>[\w\W]+)/remove/$', + r"^(?P<supervisee_name>[\w\W]+)/remove/$", api.SupervisorRemoveSuperviseeView.as_view(), - name='remove_supervisee' + name="remove_supervisee", ), - url( - r'^(?P<supervisor_name>[\w\W]+)/add/$', + r"^(?P<supervisor_name>[\w\W]+)/add/$", api.SuperviseeAddSupervisorView.as_view(), - name='add_supervisor' + name="add_supervisor", ), - url( - r'^revalidate/$', + r"^revalidate/$", api.SuperviseeReValidationView.as_view(), - name='revalidate_account' + name="revalidate_account", ), - url( - r'^set_supervisor_mode/$', + r"^set_supervisor_mode/$", api.SetSupervisorModeView.as_view(), - name='set_supervisor_mode' + name="set_supervisor_mode", ), - url( - r'^remove_supervisor_mode/$', + r"^remove_supervisor_mode/$", api.RemoveSupervisorModeView.as_view(), - name='remove_supervisor_mode' + name="remove_supervisor_mode", ), - url( - r'^list_supervisor_candidates/$', + r"^list_supervisor_candidates/$", api.ListSupervisorCandidatesView.as_view(), - name='list_supervisor_candidates' + name="list_supervisor_candidates", ), - url( - r'^grant_supervisor_access/$', + r"^grant_supervisor_access/$", api.UpdateSupervisorCandidateView.as_view(), - name='update_supervisor_candidate' + name="update_supervisor_candidate", ), - ] diff --git a/beat/web/algorithms/api_urls.py b/beat/web/algorithms/api_urls.py index 561482271..34ec26de3 100755 --- a/beat/web/algorithms/api_urls.py +++ b/beat/web/algorithms/api_urls.py @@ -29,51 +29,43 @@ from django.conf.urls import url from . import api -urlpatterns = [ - - url(r'^$', - api.ListAlgorithmsView.as_view(), - name='all', - ), - - url(r'^check_name/$', - api.CheckAlgorithmNameView.as_view(), - name='check_name', - ), - url(r'^diff/(?P<author1>\w+)/(?P<name1>[-\w]+)/(?P<version1>\d+)/(?P<author2>\w+)/(?P<name2>[-\w]+)/(?P<version2>\d+)/$', +urlpatterns = [ + url(r"^$", api.ListAlgorithmsView.as_view(), name="all"), + url(r"^check_name/$", api.CheckAlgorithmNameView.as_view(), name="check_name"), + url( + r"^diff/(?P<author1>\w+)/(?P<name1>[-\w]+)/(?P<version1>\d+)/(?P<author2>\w+)/(?P<name2>[-\w]+)/(?P<version2>\d+)/$", api.DiffAlgorithmView.as_view(), - name='diff', - ), - - url(r'^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/(?P<version>\d+)/share/$', + name="diff", + ), + url( + r"^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/(?P<version>\d+)/share/$", api.ShareAlgorithmView.as_view(), - name='share', - ), - - url(r'^(?P<author_name>\w+)/$', + name="share", + ), + url( + r"^(?P<author_name>\w+)/$", api.ListCreateAlgorithmsView.as_view(), - name='list_create', - ), - - url(r'^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/(?P<version>\d+)/$', + name="list_create", + ), + url( + r"^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/(?P<version>\d+)/$", api.RetrieveUpdateDestroyAlgorithmsView.as_view(), - name='object', - ), - - url(r'^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/$', + name="object", + ), + url( + r"^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/$", api.RetrieveUpdateDestroyAlgorithmsView.as_view(), - name='object', - ), - - url(r'^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/(?P<version>\d+)/binary/$', + name="object", + ), + url( + r"^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/(?P<version>\d+)/binary/$", api.binary, - name='binary', - ), - - url(r'^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/binary/$', + name="binary", + ), + url( + r"^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/binary/$", api.binary, - name='binary', - ), - + name="binary", + ), ] diff --git a/beat/web/attestations/api_urls.py b/beat/web/attestations/api_urls.py index 7fe694b0a..cdb369bd9 100644 --- a/beat/web/attestations/api_urls.py +++ b/beat/web/attestations/api_urls.py @@ -26,30 +26,15 @@ ############################################################################### from django.conf.urls import url -from . import api - -urlpatterns = [ - url( - r'^$', - api.CreateAttestationView.as_view(), - name="create" - ), - url( - r'^unlock/(?P<number>\d+)/$', - api.UnlockAttestationView.as_view(), - name="unlock" - ), +from . import api - url( - r'^(?P<number>\d+)/$', - api.DeleteAttestationView.as_view(), - name="delete" - ), +urlpatterns = [ + url(r"^$", api.CreateAttestationView.as_view(), name="create"), url( - r'^(?P<username>\w+)/$', - api.ListUserAttestationView.as_view(), - name="all" + r"^unlock/(?P<number>\d+)/$", api.UnlockAttestationView.as_view(), name="unlock" ), + url(r"^(?P<number>\d+)/$", api.DeleteAttestationView.as_view(), name="delete"), + url(r"^(?P<username>\w+)/$", api.ListUserAttestationView.as_view(), name="all"), ] diff --git a/beat/web/backend/api_urls.py b/beat/web/backend/api_urls.py index cbf2f3724..b96631e84 100755 --- a/beat/web/backend/api_urls.py +++ b/beat/web/backend/api_urls.py @@ -26,26 +26,24 @@ ############################################################################### from django.conf.urls import url + from . import api -urlpatterns = [ +urlpatterns = [ url( - r'^environments/$', + r"^environments/$", api.accessible_environments_list, - name='backend-api-environments', + name="backend-api-environments", ), - url( - r'^local_scheduler/start/$', + r"^local_scheduler/start/$", api.start_local_scheduler, - name='local_scheduler-start', + name="local_scheduler-start", ), - url( - r'^local_scheduler/stop/$', + r"^local_scheduler/stop/$", api.stop_local_scheduler, - name='local_scheduler-stop', + name="local_scheduler-stop", ), - ] diff --git a/beat/web/databases/api_urls.py b/beat/web/databases/api_urls.py index ef0737b5d..3c3c9a1c1 100644 --- a/beat/web/databases/api_urls.py +++ b/beat/web/databases/api_urls.py @@ -29,9 +29,18 @@ from django.conf.urls import url from . import api + urlpatterns = [ - url(r'^$', api.ListCreateDatabasesView.as_view(), name='all'), - url(r'^templates/$', api.ListTemplatesView.as_view(), name='templates'), - url(r'^(?P<database_name>[-\w]+)/(?P<version>\d+)/$', api.RetrieveDatabaseView.as_view(), name='object'), - url(r'^(?P<database_name>[-\w]+)/$', api.RetrieveDatabaseView.as_view(), name='object'), + url(r"^$", api.ListCreateDatabasesView.as_view(), name="all"), + url(r"^templates/$", api.ListTemplatesView.as_view(), name="templates"), + url( + r"^(?P<database_name>[-\w]+)/(?P<version>\d+)/$", + api.RetrieveDatabaseView.as_view(), + name="object", + ), + url( + r"^(?P<database_name>[-\w]+)/$", + api.RetrieveDatabaseView.as_view(), + name="object", + ), ] diff --git a/beat/web/dataformats/api_urls.py b/beat/web/dataformats/api_urls.py index 23d170023..c3af3c942 100644 --- a/beat/web/dataformats/api_urls.py +++ b/beat/web/dataformats/api_urls.py @@ -29,12 +29,33 @@ from django.conf.urls import url from . import api + urlpatterns = [ - url(r'^$', api.ListDataFormatView.as_view(), name='all'), - url(r'^check_name/$', api.CheckDataFormatNameView.as_view(), name='check_name'), - url(r'^diff/(?P<author1>\w+)/(?P<name1>[-\w]+)/(?P<version1>\d+)/(?P<author2>\w+)/(?P<name2>[-\w]+)/(?P<version2>\d+)/$', api.DiffDataFormatView.as_view(), name='diff'), - url(r'^(?P<author_name>\w+)/(?P<object_name>[a-zA-Z0-9_\-]+)/(?P<version>\d+)/share/$', api.ShareDataFormatView.as_view(), name='share'), - url(r'^(?P<author_name>\w+)/$', api.ListCreateDataFormatsView.as_view(), name='list_create'), - url(r'^(?P<author_name>\w+)/(?P<object_name>[a-zA-Z0-9_\-]+)/(?P<version>\d+)/$', api.RetrieveUpdateDestroyDataFormatsView.as_view(), name='object'), - url(r'^(?P<author_name>\w+)/(?P<object_name>[a-zA-Z0-9_\-]+)/$', api.RetrieveUpdateDestroyDataFormatsView.as_view(), name='object'), + url(r"^$", api.ListDataFormatView.as_view(), name="all"), + url(r"^check_name/$", api.CheckDataFormatNameView.as_view(), name="check_name"), + url( + r"^diff/(?P<author1>\w+)/(?P<name1>[-\w]+)/(?P<version1>\d+)/(?P<author2>\w+)/(?P<name2>[-\w]+)/(?P<version2>\d+)/$", + api.DiffDataFormatView.as_view(), + name="diff", + ), + url( + r"^(?P<author_name>\w+)/(?P<object_name>[a-zA-Z0-9_\-]+)/(?P<version>\d+)/share/$", + api.ShareDataFormatView.as_view(), + name="share", + ), + url( + r"^(?P<author_name>\w+)/$", + api.ListCreateDataFormatsView.as_view(), + name="list_create", + ), + url( + r"^(?P<author_name>\w+)/(?P<object_name>[a-zA-Z0-9_\-]+)/(?P<version>\d+)/$", + api.RetrieveUpdateDestroyDataFormatsView.as_view(), + name="object", + ), + url( + r"^(?P<author_name>\w+)/(?P<object_name>[a-zA-Z0-9_\-]+)/$", + api.RetrieveUpdateDestroyDataFormatsView.as_view(), + name="object", + ), ] diff --git a/beat/web/experiments/api_urls.py b/beat/web/experiments/api_urls.py index c0f08a197..219a0bb31 100644 --- a/beat/web/experiments/api_urls.py +++ b/beat/web/experiments/api_urls.py @@ -26,6 +26,7 @@ ############################################################################### from django.conf.urls import url + from . import api diff --git a/beat/web/libraries/api_urls.py b/beat/web/libraries/api_urls.py index a4f30298b..236cd6c11 100644 --- a/beat/web/libraries/api_urls.py +++ b/beat/web/libraries/api_urls.py @@ -29,41 +29,33 @@ from django.conf.urls import url from . import api -urlpatterns = [ - - url(r'^$', - api.ListLibrariesView.as_view(), - name='all', - ), - - url(r'^check_name/$', - api.CheckLibraryNameView.as_view(), - name='check_name', - ), - url(r'^diff/(?P<author1>\w+)/(?P<name1>[-\w]+)/(?P<version1>\d+)/(?P<author2>\w+)/(?P<name2>[-\w]+)/(?P<version2>\d+)/$', +urlpatterns = [ + url(r"^$", api.ListLibrariesView.as_view(), name="all"), + url(r"^check_name/$", api.CheckLibraryNameView.as_view(), name="check_name"), + url( + r"^diff/(?P<author1>\w+)/(?P<name1>[-\w]+)/(?P<version1>\d+)/(?P<author2>\w+)/(?P<name2>[-\w]+)/(?P<version2>\d+)/$", api.DiffLibraryView.as_view(), - name='diff', - ), - - url(r'^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/(?P<version>\d+)/share/$', + name="diff", + ), + url( + r"^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/(?P<version>\d+)/share/$", api.ShareLibraryView.as_view(), - name='share', - ), - - url(r'^(?P<author_name>\w+)/$', + name="share", + ), + url( + r"^(?P<author_name>\w+)/$", api.ListCreateLibrariesView.as_view(), - name='list_create', - ), - - url(r'^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/(?P<version>\d+)/$', + name="list_create", + ), + url( + r"^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/(?P<version>\d+)/$", api.RetrieveUpdateDestroyLibrariesView.as_view(), - name='object', - ), - - url(r'^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/$', + name="object", + ), + url( + r"^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/$", api.RetrieveUpdateDestroyLibrariesView.as_view(), - name='object', - ), - + name="object", + ), ] diff --git a/beat/web/plotters/api_urls.py b/beat/web/plotters/api_urls.py index 4f9548939..8a2c447aa 100644 --- a/beat/web/plotters/api_urls.py +++ b/beat/web/plotters/api_urls.py @@ -29,34 +29,53 @@ from django.conf.urls import url from . import api -urlpatterns = [ - url(r'^$', api.ListPlotterView.as_view(), name='all'), - url(r'^format/(?P<author_name>\w+)/(?P<dataformat_name>[a-zA-Z0-9_\-]+)/(?P<version>\d+)/$', api.ListFormatPlotterView.as_view(), name='object'), - url(r'^plotterparameters/(?P<author_name>\w+)/(?P<object_name>[a-zA-Z0-9_\-]+)/(?P<version>\d+)/share/$', +urlpatterns = [ + url(r"^$", api.ListPlotterView.as_view(), name="all"), + url( + r"^format/(?P<author_name>\w+)/(?P<dataformat_name>[a-zA-Z0-9_\-]+)/(?P<version>\d+)/$", + api.ListFormatPlotterView.as_view(), + name="object", + ), + url( + r"^plotterparameters/(?P<author_name>\w+)/(?P<object_name>[a-zA-Z0-9_\-]+)/(?P<version>\d+)/share/$", api.SharePlotterParameterView.as_view(), - name='share', - ), - - url(r'^plotterparameters/(?P<author_name>\w+)/(?P<object_name>[a-zA-Z0-9_\-]+)/(?P<version>\d+)/$', api.RetrieveUpdateDestroyPlotterParametersView.as_view(), name='view'), - url(r'^plotterparameters/(?P<author_name>\w+)/$', api.ListPlotterParametersView.as_view(), name='view'), - url(r'^plotterparameters/$', api.ListPlotterParameterView.as_view(), name='all_plotterparameter'), - url(r'^plotterparameter/(?P<author_name>\w+)/(?P<dataformat_name>[a-zA-Z0-9_\-]+)/(?P<version>\d+)/$', api.ListPlotterParameterView.as_view(), name='plotterparameter'), - url(r'^defaultplotters/$', api.ListDefaultPlotterView.as_view(), name='all_defaultplotters'), - - url(r'^check_name/$', - api.CheckPlotterNameView.as_view(), - name='check_name', - ), - - - url(r'^(?P<author_name>\w+)/$', + name="share", + ), + url( + r"^plotterparameters/(?P<author_name>\w+)/(?P<object_name>[a-zA-Z0-9_\-]+)/(?P<version>\d+)/$", + api.RetrieveUpdateDestroyPlotterParametersView.as_view(), + name="view", + ), + url( + r"^plotterparameters/(?P<author_name>\w+)/$", + api.ListPlotterParametersView.as_view(), + name="view", + ), + url( + r"^plotterparameters/$", + api.ListPlotterParameterView.as_view(), + name="all_plotterparameter", + ), + url( + r"^plotterparameter/(?P<author_name>\w+)/(?P<dataformat_name>[a-zA-Z0-9_\-]+)/(?P<version>\d+)/$", + api.ListPlotterParameterView.as_view(), + name="plotterparameter", + ), + url( + r"^defaultplotters/$", + api.ListDefaultPlotterView.as_view(), + name="all_defaultplotters", + ), + url(r"^check_name/$", api.CheckPlotterNameView.as_view(), name="check_name"), + url( + r"^(?P<author_name>\w+)/$", api.ListCreatePlottersView.as_view(), - name='list_create', - ), - - url(r'^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/(?P<version>\d+)/$', + name="list_create", + ), + url( + r"^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/(?P<version>\d+)/$", api.RetrieveUpdateDestroyPlottersView.as_view(), - name='object', - ), + name="object", + ), ] diff --git a/beat/web/reports/api_urls.py b/beat/web/reports/api_urls.py index 1d0440b7a..41b1d78a2 100644 --- a/beat/web/reports/api_urls.py +++ b/beat/web/reports/api_urls.py @@ -25,86 +25,61 @@ # # ############################################################################### -from django.conf.urls import * +from django.conf.urls import url + from . import api urlpatterns = [ url( - r'^(?P<owner_name>\w+)/(?P<report_name>[\w\W]+)/rst/$', + r"^(?P<owner_name>\w+)/(?P<report_name>[\w\W]+)/rst/$", api.ReportRSTCompileView.as_view(), - name='rst_compiler' + name="rst_compiler", ), - url( - r'^(?P<number>\d+)/rst/$', + r"^(?P<number>\d+)/rst/$", api.ReportRSTCompileAnonView.as_view(), - name='rst_compiler' - ), - - url( - r'^$', - api.ReportListView.as_view(), - name='all' - ), - - url( - r'^(?P<number>\d+)/$', - api.ReportDetailView.as_view(), - name='object_report' - ), - - url( - r'^(?P<number>\d+)/results/$', - api.ReportResultsView.as_view(), - name='results' + name="rst_compiler", ), - + url(r"^$", api.ReportListView.as_view(), name="all"), + url(r"^(?P<number>\d+)/$", api.ReportDetailView.as_view(), name="object_report"), + url(r"^(?P<number>\d+)/results/$", api.ReportResultsView.as_view(), name="results"), url( - r'^(?P<owner_name>\w+)/(?P<report_name>[\w\W]+)/results_author/$', + r"^(?P<owner_name>\w+)/(?P<report_name>[\w\W]+)/results_author/$", api.ReportResultsAllExperimentsView.as_view(), - name='results' + name="results", ), - url( - r'^(?P<owner_name>\w+)/$', - api.UserReportListView.as_view(), - name='list_create' + r"^(?P<owner_name>\w+)/$", api.UserReportListView.as_view(), name="list_create" ), - url( - r'^(?P<owner_name>\w+)/(?P<report_name>[\w\W]+)/add/$', + r"^(?P<owner_name>\w+)/(?P<report_name>[\w\W]+)/add/$", api.ReportAddExperimentsView.as_view(), - name='add_experiments' + name="add_experiments", ), - url( - r'^(?P<owner_name>\w+)/(?P<report_name>[\w\W]+)/remove/$', + r"^(?P<owner_name>\w+)/(?P<report_name>[\w\W]+)/remove/$", api.ReportRemoveExperimentsView.as_view(), - name='remove_experiments' + name="remove_experiments", ), - url( - r'^(?P<owner_name>\w+)/(?P<report_name>[\w\W]+)/lock/$', + r"^(?P<owner_name>\w+)/(?P<report_name>[\w\W]+)/lock/$", api.LockReportView.as_view(), - name='lock' + name="lock", ), - url( - r'^(?P<owner_name>\w+)/(?P<report_name>[\w\W]+)/publish/$', + r"^(?P<owner_name>\w+)/(?P<report_name>[\w\W]+)/publish/$", api.PublishReportView.as_view(), - name='publish' + name="publish", ), - url( - r'^(?P<owner_name>\w+)/(?P<report_name>[\w\W]+)/algorithms/$', + r"^(?P<owner_name>\w+)/(?P<report_name>[\w\W]+)/algorithms/$", api.ReportAlgorithmsView.as_view(), - name='algorithms' + name="algorithms", ), - url( - r'^(?P<owner_name>\w+)/(?P<report_name>[\w\W]+)/$', + r"^(?P<owner_name>\w+)/(?P<report_name>[\w\W]+)/$", api.ReportDetailView.as_view(), - name='object' + name="object", ), ] diff --git a/beat/web/search/api_urls.py b/beat/web/search/api_urls.py index c12777868..0d604080a 100644 --- a/beat/web/search/api_urls.py +++ b/beat/web/search/api_urls.py @@ -26,43 +26,31 @@ ############################################################################### from django.conf.urls import url + from . import api urlpatterns = [ + url(r"^$", api.SearchView.as_view(), name="all"), url( - r'^$', - api.SearchView.as_view(), - name='all' - ), - - url( - r'^save/(?P<author_name>\w+)/(?P<name>[\w\-]+)/$', - api.SearchSaveView.as_view(), - name='save' - ), - - url( - r'^save/$', + r"^save/(?P<author_name>\w+)/(?P<name>[\w\-]+)/$", api.SearchSaveView.as_view(), - name='save' + name="save", ), - + url(r"^save/$", api.SearchSaveView.as_view(), name="save"), url( - r'^list/(?P<author_name>\w+)/$', + r"^list/(?P<author_name>\w+)/$", api.ListSearchView.as_view(), - name='list_for_author' + name="list_for_author", ), - url( - r'^(?P<author_name>\w+)/(?P<object_name>[\w\-]+)/$', + r"^(?P<author_name>\w+)/(?P<object_name>[\w\-]+)/$", api.RetrieveDestroySearchAPIView.as_view(), - name='object' + name="object", ), - url( - r'^share/(?P<author_name>\w+)/(?P<object_name>[\w\-]+)/$', + r"^share/(?P<author_name>\w+)/(?P<object_name>[\w\-]+)/$", api.ShareSearchView.as_view(), - name='share' - ) + name="share", + ), ] diff --git a/beat/web/team/api_urls.py b/beat/web/team/api_urls.py index 047e5b356..7bd5ef8f0 100644 --- a/beat/web/team/api_urls.py +++ b/beat/web/team/api_urls.py @@ -26,25 +26,18 @@ ############################################################################### from django.conf.urls import url + from . import api urlpatterns = [ + url(r"^$", api.TeamListView.as_view(), name="teamlist"), url( - r'^$', - api.TeamListView.as_view(), - name='teamlist' + r"^(?P<owner_name>\w+)/$", api.UserTeamListView.as_view(), name="user_teamlist" ), - - url( - r'^(?P<owner_name>\w+)/$', - api.UserTeamListView.as_view(), - name='user_teamlist' - ), - url( - r'^(?P<owner_name>\w+)/(?P<team_name>[\w\W]+)/$', + r"^(?P<owner_name>\w+)/(?P<team_name>[\w\W]+)/$", api.TeamDetailView.as_view(), - name='team_info' + name="team_info", ), ] diff --git a/beat/web/toolchains/api_urls.py b/beat/web/toolchains/api_urls.py index 20a5e1195..b85538c45 100644 --- a/beat/web/toolchains/api_urls.py +++ b/beat/web/toolchains/api_urls.py @@ -26,43 +26,31 @@ ############################################################################### from django.conf.urls import url + from . import api urlpatterns = [ + url(r"^$", api.ListToolchainView.as_view(), name="all"), + url(r"^check_name/$", api.CheckToolchainNameView.as_view(), name="check_name"), url( - r'^$', - api.ListToolchainView.as_view(), - name='all' - ), - - url( - r'^check_name/$', - api.CheckToolchainNameView.as_view(), - name='check_name' - ), - - url( - r'^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/(?P<version>\d+)/share/$', + r"^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/(?P<version>\d+)/share/$", api.ShareToolchainView.as_view(), - name='share' + name="share", ), - url( - r'^(?P<author_name>\w+)/$', + r"^(?P<author_name>\w+)/$", api.ListCreateToolchainsView.as_view(), - name='list_create' + name="list_create", ), - url( - r'^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/(?P<version>\d+)/$', + r"^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/(?P<version>\d+)/$", api.RetrieveUpdateDestroyToolchainsView.as_view(), - name='object' + name="object", ), - url( - r'^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/$', + r"^(?P<author_name>\w+)/(?P<object_name>[-\w]+)/$", api.RetrieveUpdateDestroyToolchainsView.as_view(), - name='object' + name="object", ), ] -- GitLab