Skip to content
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

fix: remove tox-battery from requirements and update tox #287

Merged
merged 1 commit into from
Dec 11, 2023
Merged

fix: remove tox-battery from requirements and update tox #287

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
6 changes: 3 additions & 3 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cffi==1.16.0
# via cryptography
charset-normalizer==3.3.2
# via requests
cryptography==41.0.5
cryptography==41.0.7
# via
# pyjwt
# social-auth-core
Expand All @@ -25,7 +25,7 @@ django==3.2.23
# -c requirements/common_constraints.txt
# -r requirements/base.in
# social-auth-app-django
idna==3.4
idna==3.6
# via requests
oauthlib==3.2.2
# via
Expand All @@ -52,7 +52,7 @@ six==1.16.0
# via -r requirements/base.in
social-auth-app-django==5.4.0
# via -r requirements/base.in
social-auth-core==4.5.0
social-auth-core==4.5.1
# via
# -r requirements/base.in
# social-auth-app-django
Expand Down
1 change: 0 additions & 1 deletion requirements/ci.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
-c constraints.txt

tox # Virtualenv management for tests
tox-battery # Makes tox aware of requirements file changes
11 changes: 3 additions & 8 deletions requirements/ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@ filelock==3.13.1
# virtualenv
packaging==23.2
# via tox
platformdirs==3.11.0
# via
# -c requirements/common_constraints.txt
# virtualenv
platformdirs==4.1.0
# via virtualenv
pluggy==1.3.0
# via tox
py==1.11.0
Expand All @@ -28,8 +26,5 @@ tox==3.28.0
# via
# -c requirements/constraints.txt
# -r requirements/ci.in
# tox-battery
tox-battery==0.6.2
# via -r requirements/ci.in
virtualenv==20.24.7
virtualenv==20.25.0
# via tox
5 changes: 0 additions & 5 deletions requirements/common_constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,3 @@ elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
django-simple-history==3.0.0

# virtualenv latest version requires platformdirs<4.0 which conflicts with tox>4.0 version
# This constraint can be removed once the issue
# https://github.com/pypa/virtualenv/issues/2666 gets resolved
platformdirs<4.0
18 changes: 7 additions & 11 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ coverage[toml]==7.3.2
# -r requirements/test.txt
# coverage
# pytest-cov
cryptography==41.0.5
cryptography==41.0.7
# via
# -r requirements/test.txt
# pyjwt
Expand Down Expand Up @@ -92,11 +92,11 @@ filelock==3.13.1
# virtualenv
httpretty==1.1.4
# via -r requirements/test.txt
idna==3.4
idna==3.6
# via
# -r requirements/test.txt
# requests
importlib-metadata==6.8.0
importlib-metadata==7.0.0
# via
# -r requirements/pip-tools.txt
# build
Expand Down Expand Up @@ -143,9 +143,8 @@ pbr==6.0.0
# stevedore
pip-tools==7.3.0
# via -r requirements/pip-tools.txt
platformdirs==3.11.0
platformdirs==4.1.0
# via
# -c requirements/common_constraints.txt
# -r requirements/ci.txt
# -r requirements/test.txt
# pylint
Expand Down Expand Up @@ -241,7 +240,7 @@ six==1.16.0
# unittest2
social-auth-app-django==5.4.0
# via -r requirements/test.txt
social-auth-core==4.5.0
social-auth-core==4.5.1
# via
# -r requirements/test.txt
# social-auth-app-django
Expand Down Expand Up @@ -278,9 +277,6 @@ tox==3.28.0
# -c requirements/constraints.txt
# -r requirements/ci.txt
# -r requirements/test.txt
# tox-battery
tox-battery==0.6.2
# via -r requirements/ci.txt
traceback2==1.4.0
# via
# -r requirements/test.txt
Expand All @@ -297,12 +293,12 @@ urllib3==2.1.0
# via
# -r requirements/test.txt
# requests
virtualenv==20.24.7
virtualenv==20.25.0
# via
# -r requirements/ci.txt
# -r requirements/test.txt
# tox
wheel==0.41.3
wheel==0.42.0
# via
# -r requirements/pip-tools.txt
# pip-tools
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip-tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ build==1.0.3
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==6.8.0
importlib-metadata==7.0.0
# via build
packaging==23.2
# via build
Expand All @@ -21,7 +21,7 @@ tomli==2.0.1
# build
# pip-tools
# pyproject-hooks
wheel==0.41.3
wheel==0.42.0
# via pip-tools
zipp==3.17.0
# via importlib-metadata
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
wheel==0.41.3
wheel==0.42.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
Expand Down
11 changes: 5 additions & 6 deletions requirements/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ coverage[toml]==7.3.2
# via
# -r requirements/test.in
# pytest-cov
cryptography==41.0.5
cryptography==41.0.7
# via
# -r requirements/base.txt
# pyjwt
Expand Down Expand Up @@ -67,7 +67,7 @@ filelock==3.13.1
# virtualenv
httpretty==1.1.4
# via -r requirements/test.in
idna==3.4
idna==3.6
# via
# -r requirements/base.txt
# requests
Expand All @@ -94,9 +94,8 @@ packaging==23.2
# tox
pbr==6.0.0
# via stevedore
platformdirs==3.11.0
platformdirs==4.1.0
# via
# -c requirements/common_constraints.txt
# pylint
# virtualenv
pluggy==1.3.0
Expand Down Expand Up @@ -169,7 +168,7 @@ six==1.16.0
# unittest2
social-auth-app-django==5.4.0
# via -r requirements/base.txt
social-auth-core==4.5.0
social-auth-core==4.5.1
# via
# -r requirements/base.txt
# social-auth-app-django
Expand Down Expand Up @@ -207,5 +206,5 @@ urllib3==2.1.0
# via
# -r requirements/base.txt
# requests
virtualenv==20.24.7
virtualenv==20.25.0
# via tox