Skip to content

Commit 76de5d8

Browse files
jarofgreenjarofgreen
committed
Upgrade python dependencies, which includes upgrading from Django 3 to 5
This removes the favicon app and does not replace it with anything. However, this is broken on the live site anyway so no features are lost.
1 parent 85a4c63 commit 76de5d8

9 files changed

Lines changed: 128 additions & 108 deletions

File tree

‎prefix_finder/frontend/codelist.xsd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<xs:complexType>
1515
<xs:simpleContent>
1616
<xs:extension base="xs:string">
17-
<xs:attribute ref="xml:lang" use="optional">
17+
<xs:attribute name="lang" type="xs:language" use="optional">
1818
<xs:annotation>
1919
<xs:documentation xml:lang="en">
2020
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.
@@ -82,7 +82,7 @@
8282
<xs:attribute name="ref" use="optional"/>
8383
<xs:attribute name="name" use="optional"/>
8484
<xs:attribute name="category-codelist" use="optional"/>
85-
<xs:attribute ref="xml:lang" use="optional" />
85+
<xs:attribute name="lang" type="xs:language" use="optional" />
8686
<xs:attribute name="complete" use="optional" type="xs:boolean" />
8787
</xs:complexType>
8888
</xs:element>

‎prefix_finder/frontend/templates/base.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{% load static %}
2-
{% load favicon %}
32
{% load i18n %}
43

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

2523
<body>

‎prefix_finder/frontend/tests_functional.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def browser(request):
2121
elif BROWSER == 'ChromeHeadless':
2222
chrome_options = Options()
2323
chrome_options.add_argument("--headless")
24-
browser = webdriver.Chrome(chrome_options=chrome_options)
24+
browser = webdriver.Chrome(options=chrome_options)
2525
else:
2626
browser = getattr(webdriver, BROWSER)()
2727
browser.implicitly_wait(3)

‎prefix_finder/frontend/urls.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
from django.conf.urls import url
1+
from django.urls import include, path
22
from django.views.generic import TemplateView
33
from django.views.generic.base import RedirectView
44

55
from . import views
66

77
urlpatterns = [
8-
url(r'^$', views.home, name='home'),
9-
url(r'^results$', views.results, name='results'),
10-
url(r'^_update_lists$', views.update_lists, name='update_lists'),
11-
url(r'^_preview_branch/([A-Za-z0-9-]+)$', views.preview_branch, name='preview_branch'),
12-
url(r'^terms', TemplateView.as_view(template_name='terms.html'), name='terms'),
13-
url(r'^about', TemplateView.as_view(template_name='about.html'), name='about'),
14-
url(r'^list/(.+)$', views.list_details, name='list'),
15-
url(r'^download$', RedirectView.as_view(url='/results', permanent=False), name='download'),
16-
url(r'^download.json$', views.json_download, name='json_download'),
17-
url(r'^download.csv$', views.csv_download, name='csv_download'),
18-
url(r'^download.xml$', views.xml_download, name='xml_download'),
8+
path('', views.home, name='home'),
9+
path('results', views.results, name='results'),
10+
path('_update_lists', views.update_lists, name='update_lists'),
11+
path('_preview_branch/([A-Za-z0-9-]+)', views.preview_branch, name='preview_branch'),
12+
path('terms', TemplateView.as_view(template_name='terms.html'), name='terms'),
13+
path('about', TemplateView.as_view(template_name='about.html'), name='about'),
14+
path('list/<prefix>', views.list_details, name='list'),
15+
path('download', RedirectView.as_view(url='/results', permanent=False), name='download'),
16+
path('download.json', views.json_download, name='json_download'),
17+
path('download.csv', views.csv_download, name='csv_download'),
18+
path('download.xml', views.xml_download, name='xml_download'),
1919
]

‎prefix_finder/settings.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
'bootstrap3',
7474
'prefix_finder.frontend',
7575
'raven.contrib.django.raven_compat',
76-
'favicon',
7776
)
7877

7978
MIDDLEWARE = (

‎prefix_finder/urls.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
1. Import the include() function: from django.conf.urls import url, include
1414
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
1515
"""
16-
from django.conf.urls import include, url
16+
17+
from django.urls import include, path
1718

1819
urlpatterns = [
19-
url(r'^', include('prefix_finder.frontend.urls')),
20+
path('', include('prefix_finder.frontend.urls')),
2021
]

‎requirements.in‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Django>3.2,<3.3
1+
Django>5.2,<5.3
22
django-bootstrap3
33
requests
44
django-environ
@@ -7,7 +7,6 @@ python-dateutil
77
titlecase
88
dealer
99
ratelimit
10-
django-super-favicon
1110
jsonschema
1211
lxml
1312
urllib3>=1.24.2

‎requirements.txt‎

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,53 +4,61 @@
44
#
55
# pip-compile requirements.in
66
#
7-
asgiref==3.6.0
7+
asgiref==3.11.0
88
# via django
9-
attrs==22.2.0
10-
# via jsonschema
11-
certifi==2022.12.7
9+
attrs==25.4.0
10+
# via
11+
# jsonschema
12+
# referencing
13+
certifi==2025.11.12
1214
# via requests
13-
charset-normalizer==3.0.1
15+
charset-normalizer==3.4.4
1416
# via requests
1517
dealer==2.1.0
1618
# via -r requirements.in
17-
django==3.2.18
19+
django==5.2.9
1820
# via
1921
# -r requirements.in
2022
# django-bootstrap3
21-
django-bootstrap3==22.2
22-
# via -r requirements.in
23-
django-environ==0.9.0
23+
django-bootstrap3==25.3
2424
# via -r requirements.in
25-
django-super-favicon==0.6.1
25+
django-environ==0.12.0
2626
# via -r requirements.in
27-
idna==3.4
27+
idna==3.11
2828
# via requests
29-
jsonschema==4.17.3
29+
jsonschema==4.25.1
3030
# via -r requirements.in
31-
lxml==4.9.2
32-
# via -r requirements.in
33-
pillow==9.4.0
34-
# via django-super-favicon
35-
pyrsistent==0.19.3
31+
jsonschema-specifications==2025.9.1
3632
# via jsonschema
37-
python-dateutil==2.8.2
33+
lxml==6.0.2
34+
# via -r requirements.in
35+
python-dateutil==2.9.0.post0
3836
# via -r requirements.in
39-
pytz==2022.7.1
40-
# via django
4137
ratelimit==2.2.1
4238
# via -r requirements.in
4339
raven==6.10.0
4440
# via -r requirements.in
45-
requests==2.28.2
41+
referencing==0.37.0
42+
# via
43+
# jsonschema
44+
# jsonschema-specifications
45+
requests==2.32.5
4646
# via -r requirements.in
47-
six==1.16.0
47+
rpds-py==0.30.0
48+
# via
49+
# jsonschema
50+
# referencing
51+
six==1.17.0
4852
# via python-dateutil
49-
sqlparse==0.4.3
53+
sqlparse==0.5.4
5054
# via django
51-
titlecase==2.4
55+
titlecase==2.4.1
5256
# via -r requirements.in
53-
urllib3==1.26.14
57+
typing-extensions==4.15.0
58+
# via
59+
# asgiref
60+
# referencing
61+
urllib3==2.6.1
5462
# via
5563
# -r requirements.in
5664
# requests

0 commit comments

Comments
 (0)