Skip to content

Commit 497a428

Browse files
committed
requirements: Update requirements including Django to next LTS
1 parent ce0bbab commit 497a428

File tree

7 files changed

+138
-84
lines changed

7 files changed

+138
-84
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
restore-keys: |
2222
${{ runner.os }}-pip-
2323
- run: pip install -r requirements_dev.txt
24-
- run: BROWSER=PhantomJS py.test
24+
- run: py.test

prefix_finder/frontend/apps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33

44
class FrontendConfig(AppConfig):
5-
name = 'frontend'
5+
name = 'prefix_finder.frontend'

prefix_finder/frontend/templates/base.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% load staticfiles %}
1+
{% load static %}
22
{% load favicon %}
33
{% load i18n %}
44

prefix_finder/frontend/tests_functional.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
import time
33
import pytest
44
from selenium import webdriver
5+
from selenium.webdriver.common.by import By
6+
from selenium.webdriver.chrome.options import Options
57

6-
BROWSER = os.environ.get('BROWSER', 'Firefox')
8+
BROWSER = os.environ.get('BROWSER', 'ChromeHeadless')
79

810

911
@pytest.fixture(scope="module")
@@ -16,14 +18,15 @@ def browser(request):
1618
profile.set_preference("browser.download.dir", os.getcwd())
1719
profile.set_preference("browser.helperApps.neverAsk.saveToDisk", "application/json")
1820
browser = getattr(webdriver, BROWSER)(firefox_profile=profile)
19-
browser.implicitly_wait(3)
20-
request.addfinalizer(lambda: browser.quit())
21-
return browser
21+
elif BROWSER == 'ChromeHeadless':
22+
chrome_options = Options()
23+
chrome_options.add_argument("--headless")
24+
browser = webdriver.Chrome(chrome_options=chrome_options)
2225
else:
2326
browser = getattr(webdriver, BROWSER)()
24-
browser.implicitly_wait(3)
25-
request.addfinalizer(lambda: browser.quit())
26-
return browser
27+
browser.implicitly_wait(3)
28+
request.addfinalizer(lambda: browser.quit())
29+
return browser
2730

2831

2932
@pytest.fixture(scope="module")
@@ -37,8 +40,8 @@ def server_url(request, live_server):
3740

3841
def test_home(server_url, browser):
3942
browser.get(server_url)
40-
assert "AGPLv3" in browser.find_element_by_tag_name("footer").text
41-
browser.find_element_by_link_text('Terms & Conditions')
43+
assert "AGPLv3" in browser.find_element(By.TAG_NAME, "footer").text
44+
browser.find_element(By.LINK_TEXT, 'Terms & Conditions')
4245

4346

4447
def test_terms(server_url, browser):

requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Django>2.2,<2.3
1+
Django>3.2,<3.3
22
django-bootstrap3
33
requests
44
django-environ

requirements.txt

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,58 +4,57 @@
44
#
55
# pip-compile requirements.in
66
#
7-
attrs==20.3.0
7+
asgiref==3.5.2
8+
# via django
9+
attrs==21.4.0
810
# via jsonschema
9-
certifi==2020.12.5
11+
certifi==2022.6.15
1012
# via requests
11-
chardet==4.0.0
13+
charset-normalizer==2.1.0
1214
# via requests
1315
dealer==2.1.0
1416
# via -r requirements.in
15-
django==2.2.27
17+
django==3.2.14
1618
# via
1719
# -r requirements.in
1820
# django-bootstrap3
19-
django-bootstrap3==14.2.0
21+
django-bootstrap3==21.2
2022
# via -r requirements.in
21-
django-environ==0.4.5
23+
django-environ==0.9.0
2224
# via -r requirements.in
2325
django-super-favicon==0.6.1
2426
# via -r requirements.in
25-
idna==2.10
27+
idna==3.3
2628
# via requests
27-
jsonschema==3.2.0
29+
importlib-resources==5.8.0
30+
# via jsonschema
31+
jsonschema==4.7.2
2832
# via -r requirements.in
29-
lxml==4.8.0
33+
lxml==4.9.1
3034
# via -r requirements.in
31-
pillow==9.0.1
35+
pillow==9.2.0
3236
# via django-super-favicon
33-
pyrsistent==0.17.3
37+
pyrsistent==0.18.1
3438
# via jsonschema
35-
python-dateutil==2.8.1
39+
python-dateutil==2.8.2
3640
# via -r requirements.in
37-
pytz==2021.1
41+
pytz==2022.1
3842
# via django
3943
ratelimit==2.2.1
4044
# via -r requirements.in
4145
raven==6.10.0
4246
# via -r requirements.in
43-
regex==2021.3.17
44-
# via titlecase
45-
requests==2.25.1
47+
requests==2.28.1
4648
# via -r requirements.in
47-
six==1.15.0
48-
# via
49-
# jsonschema
50-
# python-dateutil
49+
six==1.16.0
50+
# via python-dateutil
5151
sqlparse==0.4.2
5252
# via django
53-
titlecase==2.0.0
53+
titlecase==2.3
5454
# via -r requirements.in
55-
urllib3==1.26.5
55+
urllib3==1.26.10
5656
# via
5757
# -r requirements.in
5858
# requests
59-
60-
# The following packages are considered to be unsafe in a requirements file:
61-
# setuptools
59+
zipp==3.8.1
60+
# via importlib-resources

requirements_dev.txt

Lines changed: 98 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4,118 +4,170 @@
44
#
55
# pip-compile requirements_dev.in
66
#
7-
attrs==20.3.0
7+
aiosmtpd==1.4.2
8+
# via pytest-localserver
9+
asgiref==3.5.2
10+
# via django
11+
async-generator==1.10
12+
# via
13+
# trio
14+
# trio-websocket
15+
atpublic==3.0.1
16+
# via aiosmtpd
17+
attrs==21.4.0
818
# via
19+
# aiosmtpd
920
# jsonschema
21+
# outcome
1022
# pytest
11-
certifi==2020.12.5
12-
# via requests
13-
chardet==4.0.0
23+
# trio
24+
build==0.8.0
25+
# via pip-tools
26+
certifi==2022.6.15
27+
# via
28+
# requests
29+
# urllib3
30+
cffi==1.15.1
31+
# via cryptography
32+
charset-normalizer==2.1.0
1433
# via requests
15-
click==8.0.3
34+
click==8.1.3
1635
# via pip-tools
17-
coverage==5.5
36+
coverage[toml]==6.4.2
1837
# via
1938
# coveralls
2039
# pytest-cov
21-
coveralls==3.0.1
40+
coveralls==3.3.1
2241
# via -r requirements_dev.in
42+
cryptography==37.0.4
43+
# via
44+
# pyopenssl
45+
# urllib3
2346
dealer==2.1.0
2447
# via -r requirements.in
25-
django==2.2.27
48+
django==3.2.14
2649
# via
2750
# -r requirements.in
2851
# django-bootstrap3
29-
django-bootstrap3==14.2.0
52+
django-bootstrap3==21.2
3053
# via -r requirements.in
31-
django-environ==0.4.5
54+
django-environ==0.9.0
3255
# via -r requirements.in
3356
django-super-favicon==0.6.1
3457
# via -r requirements.in
3558
docopt==0.6.2
3659
# via coveralls
37-
flake8==3.9.0
60+
flake8==4.0.1
3861
# via -r requirements_dev.in
39-
idna==2.10
40-
# via requests
62+
h11==0.13.0
63+
# via wsproto
64+
idna==3.3
65+
# via
66+
# requests
67+
# trio
68+
# urllib3
69+
importlib-resources==5.8.0
70+
# via jsonschema
4171
iniconfig==1.1.1
4272
# via pytest
43-
jsonschema==3.2.0
73+
jsonschema==4.7.2
4474
# via -r requirements.in
45-
lxml==4.8.0
75+
lxml==4.9.1
4676
# via -r requirements.in
4777
mccabe==0.6.1
4878
# via flake8
49-
packaging==20.9
50-
# via pytest
79+
outcome==1.2.0
80+
# via trio
81+
packaging==21.3
82+
# via
83+
# build
84+
# pytest
5185
pep517==0.12.0
52-
# via pip-tools
53-
pillow==9.0.1
86+
# via build
87+
pillow==9.2.0
5488
# via django-super-favicon
55-
pip-tools==6.5.1
89+
pip-tools==6.8.0
5690
# via -r requirements_dev.in
57-
pluggy==0.13.1
91+
pluggy==1.0.0
5892
# via pytest
59-
py==1.10.0
93+
py==1.11.0
6094
# via pytest
61-
pycodestyle==2.7.0
95+
pycodestyle==2.8.0
6296
# via flake8
63-
pyflakes==2.3.1
97+
pycparser==2.21
98+
# via cffi
99+
pyflakes==2.4.0
64100
# via flake8
65-
pyparsing==2.4.7
101+
pyopenssl==22.0.0
102+
# via urllib3
103+
pyparsing==3.0.9
66104
# via packaging
67-
pyrsistent==0.17.3
105+
pyrsistent==0.18.1
68106
# via jsonschema
69-
pytest==6.2.2
107+
pysocks==1.7.1
108+
# via urllib3
109+
pytest==7.1.2
70110
# via
71111
# -r requirements_dev.in
72112
# pytest-cov
73113
# pytest-django
74-
pytest-cov==2.11.1
114+
pytest-cov==3.0.0
75115
# via -r requirements_dev.in
76-
pytest-django==4.1.0
116+
pytest-django==4.5.2
77117
# via -r requirements_dev.in
78-
pytest-localserver==0.5.0
118+
pytest-localserver==0.6.0
79119
# via -r requirements_dev.in
80-
python-dateutil==2.8.1
120+
python-dateutil==2.8.2
81121
# via -r requirements.in
82-
pytz==2021.1
122+
pytz==2022.1
83123
# via django
84124
ratelimit==2.2.1
85125
# via -r requirements.in
86126
raven==6.10.0
87127
# via -r requirements.in
88-
regex==2021.3.17
89-
# via titlecase
90-
requests==2.25.1
128+
requests==2.28.1
91129
# via
92130
# -r requirements.in
93131
# coveralls
94-
selenium==3.141.0
132+
selenium==4.3.0
95133
# via -r requirements_dev.in
96-
six==1.15.0
97-
# via
98-
# jsonschema
99-
# python-dateutil
134+
six==1.16.0
135+
# via python-dateutil
136+
sniffio==1.2.0
137+
# via trio
138+
sortedcontainers==2.4.0
139+
# via trio
100140
sqlparse==0.4.2
101141
# via django
102-
titlecase==2.0.0
142+
titlecase==2.3
103143
# via -r requirements.in
104-
toml==0.10.2
105-
# via pytest
106144
tomli==2.0.1
107-
# via pep517
108-
urllib3==1.26.5
145+
# via
146+
# build
147+
# coverage
148+
# pep517
149+
# pytest
150+
trio==0.21.0
151+
# via
152+
# selenium
153+
# trio-websocket
154+
trio-websocket==0.9.2
155+
# via selenium
156+
urllib3[secure,socks]==1.26.10
109157
# via
110158
# -r requirements.in
111159
# requests
112160
# selenium
113-
werkzeug==1.0.1
161+
werkzeug==2.1.2
114162
# via
115163
# -r requirements_dev.in
116164
# pytest-localserver
117165
wheel==0.37.1
118166
# via pip-tools
167+
wsproto==1.1.0
168+
# via trio-websocket
169+
zipp==3.8.1
170+
# via importlib-resources
119171

120172
# The following packages are considered to be unsafe in a requirements file:
121173
# pip

0 commit comments

Comments
 (0)