From 40a19ecdecb9210c45a504fc6497dbb62cd3842b Mon Sep 17 00:00:00 2001 From: Alex Manning Date: Thu, 4 May 2023 16:34:31 +0100 Subject: [PATCH] Remove deprecated django.conf.urls.url() --- jasmin_services/widgets.py | 4 ++-- poetry.lock | 41 +++++++++++++++++++------------------- pyproject.toml | 4 ++-- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/jasmin_services/widgets.py b/jasmin_services/widgets.py index 4601b9e..bee607f 100644 --- a/jasmin_services/widgets.py +++ b/jasmin_services/widgets.py @@ -4,8 +4,8 @@ import json +import django.urls from django import forms -from django.conf.urls import url from django.contrib import admin from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ObjectDoesNotExist @@ -44,7 +44,7 @@ def generic_object_text(request): admin_site_get_urls = admin.sites.AdminSite.get_urls admin.sites.AdminSite.get_urls = lambda model_admin, *args, **kwargs: [ *admin_site_get_urls(model_admin, *args, **kwargs), - url( + django.urls.re_path( r"^generic_object_text/$", model_admin.admin_view(generic_object_text), name="generic_object_text", diff --git a/poetry.lock b/poetry.lock index 8e4881b..b1bb763 100644 --- a/poetry.lock +++ b/poetry.lock @@ -398,14 +398,14 @@ files = [ [[package]] name = "django" -version = "3.2.18" +version = "3.2.19" description = "A high-level Python Web framework that encourages rapid development and clean, pragmatic design." category = "main" optional = false python-versions = ">=3.6" files = [ - {file = "Django-3.2.18-py3-none-any.whl", hash = "sha256:4d492d9024c7b3dfababf49f94511ab6a58e2c9c3c7207786f1ba4eb77750706"}, - {file = "Django-3.2.18.tar.gz", hash = "sha256:08208dfe892eb64fff073ca743b3b952311104f939e7f6dae954fe72dcc533ba"}, + {file = "Django-3.2.19-py3-none-any.whl", hash = "sha256:21cc991466245d659ab79cb01204f9515690f8dae00e5eabde307f14d24d4d7d"}, + {file = "Django-3.2.19.tar.gz", hash = "sha256:031365bae96814da19c10706218c44dff3b654cc4de20a98bd2d29b9bde469f0"}, ] [package.dependencies] @@ -755,8 +755,8 @@ api = ["django-oauth-toolkit", "djangorestframework"] [package.source] type = "git" url = "https://github.com/cedadev/jasmin-django-utils.git" -reference = "v1.0.6" -resolved_reference = "a227038707bdb21d3d5683ea2283dc3a82ba5210" +reference = "v1.0.7" +resolved_reference = "19a8d18a1bd4eb1fa7ea59e3f1faabd931c51d98" [[package]] name = "jasmin-ldap" @@ -833,13 +833,13 @@ develop = false Django = "*" django-picklefield = "*" django-polymorphic = "*" -jasmin-django-utils = {git = "https://github.com/cedadev/jasmin-django-utils.git", tag = "v1.0.6"} +jasmin-django-utils = {git = "https://github.com/cedadev/jasmin-django-utils.git", tag = "v1.0.7"} [package.source] type = "git" url = "https://github.com/cedadev/jasmin-notifications.git" -reference = "v1.2.2" -resolved_reference = "c78ef95bb888227f1c228f48742c7e14852c710e" +reference = "v1.2.4" +resolved_reference = "b9aeb709def7696ba3fd3a4b8db743edd20d8e4c" [[package]] name = "jsonschema" @@ -1266,21 +1266,21 @@ files = [ [[package]] name = "requests" -version = "2.29.0" +version = "2.30.0" description = "Python HTTP for Humans." category = "main" optional = false python-versions = ">=3.7" files = [ - {file = "requests-2.29.0-py3-none-any.whl", hash = "sha256:e8f3c9be120d3333921d213eef078af392fba3933ab7ed2d1cba3b56f2568c3b"}, - {file = "requests-2.29.0.tar.gz", hash = "sha256:f2e34a75f4749019bb0e3effb66683630e4ffeaf75819fb51bebef1bf5aef059"}, + {file = "requests-2.30.0-py3-none-any.whl", hash = "sha256:10e94cc4f3121ee6da529d358cdaeaff2f1c409cd377dbc72b825852f2f7e294"}, + {file = "requests-2.30.0.tar.gz", hash = "sha256:239d7d4458afcb28a692cdd298d87542235f4ca8d36d03a15bfc128a6559a2f4"}, ] [package.dependencies] certifi = ">=2017.4.17" charset-normalizer = ">=2,<4" idna = ">=2.5,<4" -urllib3 = ">=1.21.1,<1.27" +urllib3 = ">=1.21.1,<3" [package.extras] socks = ["PySocks (>=1.5.6,!=1.5.7)"] @@ -1447,20 +1447,21 @@ files = [ [[package]] name = "urllib3" -version = "1.26.15" +version = "2.0.2" description = "HTTP library with thread-safe connection pooling, file post, and more." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">=3.7" files = [ - {file = "urllib3-1.26.15-py2.py3-none-any.whl", hash = "sha256:aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42"}, - {file = "urllib3-1.26.15.tar.gz", hash = "sha256:8a388717b9476f934a21484e8c8e61875ab60644d29b9b39e11e4b9dc1c6b305"}, + {file = "urllib3-2.0.2-py3-none-any.whl", hash = "sha256:d055c2f9d38dc53c808f6fdc8eab7360b6fdbbde02340ed25cfbcd817c62469e"}, + {file = "urllib3-2.0.2.tar.gz", hash = "sha256:61717a1095d7e155cdb737ac7bb2f4324a858a1e2e6466f6d03ff630ca68d3cc"}, ] [package.extras] -brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"] -secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"] -socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] +brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)"] +secure = ["certifi", "cryptography (>=1.9)", "idna (>=2.0.0)", "pyopenssl (>=17.1.0)", "urllib3-secure-extra"] +socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"] +zstd = ["zstandard (>=0.18.0)"] [[package]] name = "virtualenv" @@ -1575,4 +1576,4 @@ keycloak = ["python-keycloak"] [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "0663d10d3e2b837d16247e537ffa541d3783e55e231179b610141c62fbf91a12" +content-hash = "d3175c4f7543e3cb9e84074f9e92a12be2ebc83c3c6836f2b2a5d9bef7022ea9" diff --git a/pyproject.toml b/pyproject.toml index 9b08925..b138924 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ python = "^3.9" # Dependencies of dependencies. Need to specify here so poetry knows where to get them from. jasmin-ldap = {git = "https://github.com/cedadev/jasmin-ldap.git", tag = "v1.0.0"} -jasmin-django-utils = {git = "https://github.com/cedadev/jasmin-django-utils.git", tag = "v1.0.6" }# Also required for API. +jasmin-django-utils = {git = "https://github.com/cedadev/jasmin-django-utils.git", tag = "v1.0.7" }# Also required for API. Django = "~3.2" django-bootstrap5 = "^23.1" @@ -20,7 +20,7 @@ django-polymorphic = "^3.1.0" requests = "^2.27.1" jasmin-ldap-django = {git = "https://github.com/cedadev/jasmin-ldap-django.git", tag = "v1.0.1"} jasmin-metadata = {git = "https://github.com/cedadev/jasmin-metadata.git", tag = "v1.0.0"} -jasmin-notifications = {git = "https://github.com/cedadev/jasmin-notifications.git", tag = "v1.2.2"} +jasmin-notifications = {git = "https://github.com/cedadev/jasmin-notifications.git", tag = "v1.2.4"} django-countries = "^7.2.1, !=7.3.0" djangorestframework = {version = "^3.13.1", optional = true} django-filter = {version = "^23.2", optional = true}