Skip to content

Commit d59c099

Browse files
authored
fix: remove tox-battery from requirements and update tox (#287)
1 parent 0697cb2 commit d59c099

8 files changed

Lines changed: 21 additions & 37 deletions

File tree

requirements/base.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cffi==1.16.0
1212
# via cryptography
1313
charset-normalizer==3.3.2
1414
# via requests
15-
cryptography==41.0.5
15+
cryptography==41.0.7
1616
# via
1717
# pyjwt
1818
# social-auth-core
@@ -25,7 +25,7 @@ django==3.2.23
2525
# -c requirements/common_constraints.txt
2626
# -r requirements/base.in
2727
# social-auth-app-django
28-
idna==3.4
28+
idna==3.6
2929
# via requests
3030
oauthlib==3.2.2
3131
# via
@@ -52,7 +52,7 @@ six==1.16.0
5252
# via -r requirements/base.in
5353
social-auth-app-django==5.4.0
5454
# via -r requirements/base.in
55-
social-auth-core==4.5.0
55+
social-auth-core==4.5.1
5656
# via
5757
# -r requirements/base.in
5858
# social-auth-app-django

requirements/ci.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@
22
-c constraints.txt
33

44
tox # Virtualenv management for tests
5-
tox-battery # Makes tox aware of requirements file changes

requirements/ci.txt

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ filelock==3.13.1
1212
# virtualenv
1313
packaging==23.2
1414
# via tox
15-
platformdirs==3.11.0
16-
# via
17-
# -c requirements/common_constraints.txt
18-
# virtualenv
15+
platformdirs==4.1.0
16+
# via virtualenv
1917
pluggy==1.3.0
2018
# via tox
2119
py==1.11.0
@@ -28,8 +26,5 @@ tox==3.28.0
2826
# via
2927
# -c requirements/constraints.txt
3028
# -r requirements/ci.in
31-
# tox-battery
32-
tox-battery==0.6.2
33-
# via -r requirements/ci.in
34-
virtualenv==20.24.7
29+
virtualenv==20.25.0
3530
# via tox

requirements/common_constraints.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,3 @@ elasticsearch<7.14.0
2121

2222
# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
2323
django-simple-history==3.0.0
24-
25-
# virtualenv latest version requires platformdirs<4.0 which conflicts with tox>4.0 version
26-
# This constraint can be removed once the issue
27-
# https://github.com/pypa/virtualenv/issues/2666 gets resolved
28-
platformdirs<4.0

requirements/dev.txt

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ coverage[toml]==7.3.2
5454
# -r requirements/test.txt
5555
# coverage
5656
# pytest-cov
57-
cryptography==41.0.5
57+
cryptography==41.0.7
5858
# via
5959
# -r requirements/test.txt
6060
# pyjwt
@@ -92,11 +92,11 @@ filelock==3.13.1
9292
# virtualenv
9393
httpretty==1.1.4
9494
# via -r requirements/test.txt
95-
idna==3.4
95+
idna==3.6
9696
# via
9797
# -r requirements/test.txt
9898
# requests
99-
importlib-metadata==6.8.0
99+
importlib-metadata==7.0.0
100100
# via
101101
# -r requirements/pip-tools.txt
102102
# build
@@ -143,9 +143,8 @@ pbr==6.0.0
143143
# stevedore
144144
pip-tools==7.3.0
145145
# via -r requirements/pip-tools.txt
146-
platformdirs==3.11.0
146+
platformdirs==4.1.0
147147
# via
148-
# -c requirements/common_constraints.txt
149148
# -r requirements/ci.txt
150149
# -r requirements/test.txt
151150
# pylint
@@ -241,7 +240,7 @@ six==1.16.0
241240
# unittest2
242241
social-auth-app-django==5.4.0
243242
# via -r requirements/test.txt
244-
social-auth-core==4.5.0
243+
social-auth-core==4.5.1
245244
# via
246245
# -r requirements/test.txt
247246
# social-auth-app-django
@@ -278,9 +277,6 @@ tox==3.28.0
278277
# -c requirements/constraints.txt
279278
# -r requirements/ci.txt
280279
# -r requirements/test.txt
281-
# tox-battery
282-
tox-battery==0.6.2
283-
# via -r requirements/ci.txt
284280
traceback2==1.4.0
285281
# via
286282
# -r requirements/test.txt
@@ -297,12 +293,12 @@ urllib3==2.1.0
297293
# via
298294
# -r requirements/test.txt
299295
# requests
300-
virtualenv==20.24.7
296+
virtualenv==20.25.0
301297
# via
302298
# -r requirements/ci.txt
303299
# -r requirements/test.txt
304300
# tox
305-
wheel==0.41.3
301+
wheel==0.42.0
306302
# via
307303
# -r requirements/pip-tools.txt
308304
# pip-tools

requirements/pip-tools.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ build==1.0.3
88
# via pip-tools
99
click==8.1.7
1010
# via pip-tools
11-
importlib-metadata==6.8.0
11+
importlib-metadata==7.0.0
1212
# via build
1313
packaging==23.2
1414
# via build
@@ -21,7 +21,7 @@ tomli==2.0.1
2121
# build
2222
# pip-tools
2323
# pyproject-hooks
24-
wheel==0.41.3
24+
wheel==0.42.0
2525
# via pip-tools
2626
zipp==3.17.0
2727
# via importlib-metadata

requirements/pip.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# make upgrade
66
#
7-
wheel==0.41.3
7+
wheel==0.42.0
88
# via -r requirements/pip.in
99

1010
# The following packages are considered to be unsafe in a requirements file:

requirements/test.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ coverage[toml]==7.3.2
3939
# via
4040
# -r requirements/test.in
4141
# pytest-cov
42-
cryptography==41.0.5
42+
cryptography==41.0.7
4343
# via
4444
# -r requirements/base.txt
4545
# pyjwt
@@ -67,7 +67,7 @@ filelock==3.13.1
6767
# virtualenv
6868
httpretty==1.1.4
6969
# via -r requirements/test.in
70-
idna==3.4
70+
idna==3.6
7171
# via
7272
# -r requirements/base.txt
7373
# requests
@@ -94,9 +94,8 @@ packaging==23.2
9494
# tox
9595
pbr==6.0.0
9696
# via stevedore
97-
platformdirs==3.11.0
97+
platformdirs==4.1.0
9898
# via
99-
# -c requirements/common_constraints.txt
10099
# pylint
101100
# virtualenv
102101
pluggy==1.3.0
@@ -169,7 +168,7 @@ six==1.16.0
169168
# unittest2
170169
social-auth-app-django==5.4.0
171170
# via -r requirements/base.txt
172-
social-auth-core==4.5.0
171+
social-auth-core==4.5.1
173172
# via
174173
# -r requirements/base.txt
175174
# social-auth-app-django
@@ -207,5 +206,5 @@ urllib3==2.1.0
207206
# via
208207
# -r requirements/base.txt
209208
# requests
210-
virtualenv==20.24.7
209+
virtualenv==20.25.0
211210
# via tox

0 commit comments

Comments
 (0)