sipwise
/
repoapi
mirror of https://github.com/sipwise/repoapi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

TT#121955 django.conf.urls.url() removed

Browse Source 
https://docs.djangoproject.com/en/3.2/internals/deprecation/#deprecation-removed-in-4-0

Change-Id: I6515688706f50422eb7751d305a8ed87ca0394e8
pull/5/head
Victor Seva 3 years ago
parent 27b46f9745
commit 1652418a6d
5 changed files with 75 additions and 66 deletions
Show Stats Download Patch File Download Diff File

10
build/urls.py
Unescape View File

@ -1,4 +1,4 @@
# Copyright (C) 2017 The Sipwise Team - http://sipwise.com
# Copyright (C) 2017-2022 The Sipwise Team - http://sipwise.com
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the Free
@ -12,19 +12,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
from django.conf.urls import url
from django.urls import re_path
from . import views
app_name = "build"
urlpatterns = [
url(r"^$", views.BuildReleaseList.as_view(), name="list"),
url(
re_path(r"^$", views.BuildReleaseList.as_view(), name="list"),
re_path(
r"^(?P<pk>[0-9]+)/?$",
views.BuildReleaseDetail.as_view(),
name="detail",
),
url(
re_path(
r"^(?P<release_uuid>[^/]+)/(?P<project>[^/]+)/$",
views.BuildProject.as_view(),
name="build_project",

16
panel/urls.py
Unescape View File

@ -1,4 +1,4 @@
# Copyright (C) 2015 The Sipwise Team - http://sipwise.com
# Copyright (C) 2015-2022 The Sipwise Team - http://sipwise.com
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the Free
@ -12,28 +12,28 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
from django.conf.urls import url
from django.urls import re_path
from . import views
app_name = "panel"
urlpatterns = [
url(r"^$", views.index, name="index"),
url(
re_path(r"^$", views.index, name="index"),
re_path(
r"^release/(?P<_uuid>[^/]+)/$", views.release_uuid, name="release-uuid"
),
url(r"^(?P<_release>[^/]+)/$", views.release, name="release-view"),
url(
re_path(r"^(?P<_release>[^/]+)/$", views.release, name="release-view"),
re_path(
r"^(?P<_release>[^/]+)/(?P<_project>[^/]+)/$",
views.project,
name="project-view",
),
url(
re_path(
r"^(?P<_release>[^/]+)/(?P<_project>[^/]+)/latest/$",
views.latest_uuid,
name="latest_uuid-view",
),
url(
re_path(
r"^(?P<_release>[^/]+)/(?P<_project>[^/]+)/(?P<_uuid>[^/]+)/$",
views.uuid,
name="uuid-view",

10
release_changed/urls.py
Unescape View File

@ -1,4 +1,4 @@
# Copyright (C) 2020 The Sipwise Team - http://sipwise.com
# Copyright (C) 2020-2022 The Sipwise Team - http://sipwise.com
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the Free
@ -12,19 +12,19 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
from django.conf.urls import url
from django.urls import re_path
from . import views
app_name = "release_changed"
urlpatterns = [
url(r"^$", views.ReleaseChangedList.as_view(), name="list"),
url(
re_path(r"^$", views.ReleaseChangedList.as_view(), name="list"),
re_path(
r"^(?P<pk>[0-9]+)/?$",
views.ReleaseChangedDetail.as_view(),
name="detail",
),
url(
re_path(
r"^(?P<label>[^/]+)/(?P<vmtype>[^/]+)/(?P<release>[^/]+)/$",
views.ReleaseChangedCheck.as_view(),
name="check",

48
release_dashboard/urls.py
Unescape View File

@ -1,4 +1,4 @@
# Copyright (C) 2015 The Sipwise Team - http://sipwise.com
# Copyright (C) 2015-2022 The Sipwise Team - http://sipwise.com
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the Free
@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
from django.conf.urls import url
from django.urls import re_path
from .views import build
from .views import docker
@ -20,54 +20,60 @@ from .views import Index
app_name = "release_dashboard"
urlpatterns = [
url(r"^$", Index.as_view(), name="index"),
url(r"^old/$", Index.as_view(old_links=True), name="index_old"),
url(r"^old/build/$", build.build_release_old, name="build_release_old"),
url(r"^old/build_deps/$", build.build_deps_old, name="build_deps_old"),
url(
re_path(r"^$", Index.as_view(), name="index"),
re_path(r"^old/$", Index.as_view(old_links=True), name="index_old"),
re_path(
r"^old/build/$", build.build_release_old, name="build_release_old"
),
re_path(r"^old/build_deps/$", build.build_deps_old, name="build_deps_old"),
re_path(
r"^old/build_trunk_deps/$",
build.build_trunk_deps_old,
name="build_trunk_deps_old",
),
url(
re_path(
r"^old/build_trunk/$",
build.build_trunk_release_old,
name="build_trunk_release_old",
),
url(
re_path(
r"^old/build_tag/$",
build.build_release_old,
{"tag_only": True},
name="build_release_tag_old",
),
url(r"^build/$", build.index, name="build_index"),
url(
re_path(r"^build/$", build.index, name="build_index"),
re_path(
r"^build/(?P<release>[^/]+)/$",
build.build_release,
name="build_release",
),
url(r"^hotfix/$", build.hotfix, name="hotfix"),
url(r"^hotfix/(?P<branch>[^/]+)/(?P<project>[^/]+)/$", build.hotfix_build),
url(r"^refresh/$", build.refresh_all, name="refresh_all"),
url(r"^refresh/(?P<project>[^/]+)/$", build.refresh, name="refresh"),
url(
re_path(r"^hotfix/$", build.hotfix, name="hotfix"),
re_path(
r"^hotfix/(?P<branch>[^/]+)/(?P<project>[^/]+)/$", build.hotfix_build
),
re_path(r"^refresh/$", build.refresh_all, name="refresh_all"),
re_path(r"^refresh/(?P<project>[^/]+)/$", build.refresh, name="refresh"),
re_path(
r"^build_docker/$",
docker.build_docker_images,
name="build_docker_images",
),
url(r"^docker/refresh/$", docker.refresh_all, name="refresh_docker_all"),
url(
re_path(
r"^docker/refresh/$", docker.refresh_all, name="refresh_docker_all"
),
re_path(
r"^docker/refresh/(?P<project>[^/]+)/$",
docker.refresh,
name="refresh_docker",
),
url(r"^docker/$", docker.docker_images, name="docker_images"),
url(
re_path(r"^docker/$", docker.docker_images, name="docker_images"),
re_path(
r"^docker/(?P<project>[^/]+)/$",
docker.docker_project_images,
name="docker_project_images",
),
url(
re_path(
r"^docker/(?P<project>[^/]+)/(?P<image>[^/]+)$",
docker.docker_image_tags,
name="docker_image_tag",

57
repoapi/urls.py
Unescape View File

@ -1,4 +1,4 @@
# Copyright (C) 2015 The Sipwise Team - http://sipwise.com
# Copyright (C) 2015-2022 The Sipwise Team - http://sipwise.com
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the Free
@ -12,9 +12,9 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
from django.conf.urls import include
from django.conf.urls import url
from django.contrib import admin
from django.urls import include
from django.urls import re_path
from rest_framework.urlpatterns import format_suffix_patterns
from build import views as build_views
@ -23,92 +23,95 @@ from release_dashboard.views import docker
from repoapi import views
api_patterns = [
url(r"^$", views.api_root, name="index"),
url(
re_path(r"^$", views.api_root, name="index"),
re_path(
r"^jenkinsbuildinfo/$",
views.JenkinsBuildInfoList.as_view(),
name="jenkinsbuildinfo-list",
),
url(
re_path(
r"^jenkinsbuildinfo/(?P<pk>[0-9]+)/$",
views.JenkinsBuildInfoDetail.as_view(),
name="jenkinsbuildinfo-detail",
),
url(r"^release/$", views.ReleaseList.as_view(), name="release-list"),
url(
re_path(r"^release/$", views.ReleaseList.as_view(), name="release-list"),
re_path(
r"^release/(?P<release>[^/]+)/$",
views.ProjectList.as_view(),
name="project-list",
),
url(
re_path(
r"^release_jobs/(?P<release_uuid>[^/]+)/$",
build_views.ReleaseJobs.as_view(),
name="release-job-list",
),
url(
re_path(
r"^release_jobs/(?P<release_uuid>[^/]+)/(?P<job>[^/]+)/$",
build_views.ReleaseJobsUUID.as_view(),
name="release-job-uuid-list",
),
url(
re_path(
r"^release_jobs_full/(?P<release_uuid>[^/]+)/$",
build_views.ReleaseJobsFull.as_view(),
name="release-job-full-list",
),
url(
re_path(
r"^release_full/(?P<release>[^/]+)/$",
views.ProjectFullList.as_view(),
name="project-fulllist",
),
url(
re_path(
r"^release/(?P<release>[^/]+)/(?P<project>[^/]+)/latest/$",
views.LatestUUID.as_view(),
name="latestuuid-list",
),
url(
re_path(
r"^release/(?P<release>[^/]+)/(?P<project>[^/]+)/$",
views.ProjectUUIDList.as_view(),
name="projectuuid-list",
),
url(
re_path(
r"^release/(?P<release>[^/]+)" "/(?P<project>[^/]+)/(?P<uuid>[^/]+)/$",
views.UUIDInfoList.as_view(),
name="uuidinfo-list",
),
url(
re_path(
r"^docker/image/$",
docker.DockerImageList.as_view(),
name="dockerimage-list",
),
url(
re_path(
r"^docker/image/(?P<pk>[0-9]+)/$",
docker.DockerImageDetail.as_view(),
name="dockerimage-detail",
),
url(
re_path(
r"^docker/tag/(?P<pk>[0-9]+)/$",
docker.DockerTagDetail.as_view(),
name="dockertag-detail",
),
url(
re_path(
r"^gerrit/refresh/$",
rd_api.RefreshGerritInfo.as_view(),
name="gerrit-refresh",
),
url(r"^build/", include("build.urls")),
url(r"^release_changed/", include("release_changed.urls")),
re_path(r"^build/", include("build.urls")),
re_path(r"^release_changed/", include("release_changed.urls")),
]
api_patterns = format_suffix_patterns(api_patterns)
urlpatterns = [
url(r"^admin/", admin.site.urls),
url(r"^", include(api_patterns)),
url(
re_path(r"^admin/", admin.site.urls),
re_path(r"^", include(api_patterns)),
re_path(
r"^api-auth/",
include("rest_framework.urls", namespace="rest_framework"),
),
url(r"^docs/", views.schema_view),
url(r"^panel/", include("panel.urls")),
url(r"^release_panel/", include("release_dashboard.urls"),),
re_path(r"^docs/", views.schema_view),
re_path(r"^panel/", include("panel.urls")),
re_path(
r"^release_panel/",
include("release_dashboard.urls"),
),
]

Write Preview
Loading…
Cancel
Save