Skip to content

Upgrade python dependencies, which includes upgrading from Django 3 to 5 #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jarofgreen merged 1 commit into from
Dec 17, 2025
Merged

Upgrade python dependencies, which includes upgrading from Django 3 to 5 #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions prefix_finder/frontend/codelist.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute ref="xml:lang" use="optional">
<xs:attribute name="lang" type="xs:language" use="optional">
<xs:annotation>
<xs:documentation xml:lang="en">
ISO 639-1 code specifying the language of text in this element. If a default language is specified in the iati-activity element it does not have to be repeated here.
Expand Down Expand Up @@ -82,7 +82,7 @@
<xs:attribute name="ref" use="optional"/>
<xs:attribute name="name" use="optional"/>
<xs:attribute name="category-codelist" use="optional"/>
<xs:attribute ref="xml:lang" use="optional" />
<xs:attribute name="lang" type="xs:language" use="optional" />
<xs:attribute name="complete" use="optional" type="xs:boolean" />
</xs:complexType>
</xs:element>
Expand Down
2 changes: 0 additions & 2 deletions prefix_finder/frontend/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{% load static %}
{% load favicon %}
{% load i18n %}

<!DOCTYPE html>
Expand All @@ -19,7 +18,6 @@
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="{% static 'css/chosen.min.css'%}?version=2">
<link rel="stylesheet" href="{% static 'css/main.css'%}?version=5">
{% get_favicons prefix="favicons/" %}
</head>

<body>
Expand Down
2 changes: 1 addition & 1 deletion prefix_finder/frontend/tests_functional.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def browser(request):
elif BROWSER == 'ChromeHeadless':
chrome_options = Options()
chrome_options.add_argument("--headless")
browser = webdriver.Chrome(chrome_options=chrome_options)
browser = webdriver.Chrome(options=chrome_options)
else:
browser = getattr(webdriver, BROWSER)()
browser.implicitly_wait(3)
Expand Down
24 changes: 12 additions & 12 deletions prefix_finder/frontend/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
from django.conf.urls import url
from django.urls import include, path
from django.views.generic import TemplateView
from django.views.generic.base import RedirectView

from . import views

urlpatterns = [
url(r'^$', views.home, name='home'),
url(r'^results$', views.results, name='results'),
url(r'^_update_lists$', views.update_lists, name='update_lists'),
url(r'^_preview_branch/([A-Za-z0-9-]+)$', views.preview_branch, name='preview_branch'),
url(r'^terms', TemplateView.as_view(template_name='terms.html'), name='terms'),
url(r'^about', TemplateView.as_view(template_name='about.html'), name='about'),
url(r'^list/(.+)$', views.list_details, name='list'),
url(r'^download$', RedirectView.as_view(url='/results', permanent=False), name='download'),
url(r'^download.json$', views.json_download, name='json_download'),
url(r'^download.csv$', views.csv_download, name='csv_download'),
url(r'^download.xml$', views.xml_download, name='xml_download'),
path('', views.home, name='home'),
path('results', views.results, name='results'),
path('_update_lists', views.update_lists, name='update_lists'),
path('_preview_branch/([A-Za-z0-9-]+)', views.preview_branch, name='preview_branch'),
path('terms', TemplateView.as_view(template_name='terms.html'), name='terms'),
path('about', TemplateView.as_view(template_name='about.html'), name='about'),
path('list/<prefix>', views.list_details, name='list'),
path('download', RedirectView.as_view(url='/results', permanent=False), name='download'),
path('download.json', views.json_download, name='json_download'),
path('download.csv', views.csv_download, name='csv_download'),
path('download.xml', views.xml_download, name='xml_download'),
]
1 change: 0 additions & 1 deletion prefix_finder/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
'bootstrap3',
'prefix_finder.frontend',
'raven.contrib.django.raven_compat',
'favicon',
)

MIDDLEWARE = (
Expand Down
5 changes: 3 additions & 2 deletions prefix_finder/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
1. Import the include() function: from django.conf.urls import url, include
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
"""
from django.conf.urls import include, url

from django.urls import include, path

urlpatterns = [
url(r'^', include('prefix_finder.frontend.urls')),
path('', include('prefix_finder.frontend.urls')),
]
3 changes: 1 addition & 2 deletions requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django>3.2,<3.3
Django>5.2,<5.3
django-bootstrap3
requests
django-environ
Expand All @@ -7,7 +7,6 @@ python-dateutil
titlecase
dealer
ratelimit
django-super-favicon
jsonschema
lxml
urllib3>=1.24.2
58 changes: 33 additions & 25 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,61 @@
#
# pip-compile requirements.in
#
asgiref==3.6.0
asgiref==3.11.0
# via django
attrs==22.2.0
# via jsonschema
certifi==2022.12.7
attrs==25.4.0
# via
# jsonschema
# referencing
certifi==2025.11.12
# via requests
charset-normalizer==3.0.1
charset-normalizer==3.4.4
# via requests
dealer==2.1.0
# via -r requirements.in
django==3.2.18
django==5.2.9
# via
# -r requirements.in
# django-bootstrap3
django-bootstrap3==22.2
# via -r requirements.in
django-environ==0.9.0
django-bootstrap3==25.3
# via -r requirements.in
django-super-favicon==0.6.1
django-environ==0.12.0
# via -r requirements.in
idna==3.4
idna==3.11
# via requests
jsonschema==4.17.3
jsonschema==4.25.1
# via -r requirements.in
lxml==4.9.2
# via -r requirements.in
pillow==9.4.0
# via django-super-favicon
pyrsistent==0.19.3
jsonschema-specifications==2025.9.1
# via jsonschema
python-dateutil==2.8.2
lxml==6.0.2
# via -r requirements.in
python-dateutil==2.9.0.post0
# via -r requirements.in
pytz==2022.7.1
# via django
ratelimit==2.2.1
# via -r requirements.in
raven==6.10.0
# via -r requirements.in
requests==2.28.2
referencing==0.37.0
# via
# jsonschema
# jsonschema-specifications
requests==2.32.5
# via -r requirements.in
six==1.16.0
rpds-py==0.30.0
# via
# jsonschema
# referencing
six==1.17.0
# via python-dateutil
sqlparse==0.4.3
sqlparse==0.5.4
# via django
titlecase==2.4
titlecase==2.4.1
# via -r requirements.in
urllib3==1.26.14
typing-extensions==4.15.0
# via
# asgiref
# referencing
urllib3==2.6.1
# via
# -r requirements.in
# requests
Loading