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 #370

Merged
merged 1 commit into from
Dec 8, 2023
Merged

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

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 requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ asgiref==3.7.2
# via django
bleach[css]==6.1.0
# via -r requirements/base.in
boto3==1.33.6
boto3==1.33.10
# via fs-s3fs
botocore==1.33.6
botocore==1.33.10
# via
# boto3
# s3transfer
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
19 changes: 9 additions & 10 deletions requirements/ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
#
# make upgrade
#
cachetools==5.3.2
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.7
# via virtualenv
filelock==3.13.1
Expand All @@ -14,26 +20,19 @@ packaging==23.2
# via
# pyproject-api
# tox
platformdirs==3.11.0
platformdirs==4.1.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# tox
# virtualenv
pluggy==1.3.0
# via tox
py==1.11.0
# via tox
six==1.16.0
pyproject-api==1.6.1
# via tox
tomli==2.0.1
# via
# pyproject-api
# tox
tox==3.28.0
# via
# -r requirements/ci.in
# tox-battery
tox-battery==0.6.2
tox==4.11.4
# via -r requirements/ci.in
virtualenv==20.25.0
# via tox
38 changes: 22 additions & 16 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ bleach[css]==6.1.0
# via
# -r requirements/quality.txt
# bleach
boto3==1.33.6
boto3==1.33.10
# via
# -r requirements/quality.txt
# fs-s3fs
botocore==1.33.6
botocore==1.33.10
# via
# -r requirements/quality.txt
# boto3
Expand All @@ -42,14 +42,20 @@ build==1.0.3
# via
# -r requirements/pip-tools.txt
# pip-tools
cachetools==5.3.2
# via
# -r requirements/ci.txt
# tox
certifi==2023.11.17
# via
# -r requirements/quality.txt
# requests
chardet==5.2.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# binaryornot
# tox
charset-normalizer==3.3.2
# via
# -r requirements/quality.txt
Expand All @@ -71,6 +77,10 @@ code-annotations==1.5.0
# via
# -r requirements/quality.txt
# edx-lint
colorama==0.4.6
# via
# -r requirements/ci.txt
# tox
cookiecutter==2.5.0
# via
# -r requirements/quality.txt
Expand Down Expand Up @@ -199,9 +209,10 @@ packaging==23.2
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
# build
# pyproject-api
# pytest
# tox
path==16.7.1
path==16.9.0
# via
# -r requirements/quality.txt
# edx-i18n-tools
Expand All @@ -211,10 +222,10 @@ 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 https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/ci.txt
# tox
# virtualenv
pluggy==1.3.0
# via
Expand All @@ -226,10 +237,6 @@ polib==1.2.0
# via
# -r requirements/quality.txt
# edx-i18n-tools
py==1.11.0
# via
# -r requirements/ci.txt
# tox
pycodestyle==2.11.1
# via -r requirements/quality.txt
pygments==2.17.2
Expand Down Expand Up @@ -261,6 +268,10 @@ pypng==0.20220715.0
# via
# -r requirements/quality.txt
# xblock-sdk
pyproject-api==1.6.1
# via
# -r requirements/ci.txt
# tox
pyproject-hooks==1.0.0
# via
# -r requirements/pip-tools.txt
Expand Down Expand Up @@ -317,15 +328,13 @@ simplejson==3.19.2
# xblock-sdk
six==1.16.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# astroid
# bleach
# edx-lint
# fs
# fs-s3fs
# python-dateutil
# tox
sqlparse==0.4.4
# via
# -r requirements/quality.txt
Expand All @@ -350,14 +359,11 @@ tomli==2.0.1
# build
# coverage
# pip-tools
# pyproject-api
# pyproject-hooks
# pytest
# tox
tox==3.28.0
# via
# -r requirements/ci.txt
# tox-battery
tox-battery==0.6.2
tox==4.11.4
# via -r requirements/ci.txt
types-python-dateutil==2.8.19.14
# via
Expand Down
6 changes: 3 additions & 3 deletions requirements/quality.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ bleach[css]==6.1.0
# via
# -r requirements/test.txt
# bleach
boto3==1.33.6
boto3==1.33.10
# via
# -r requirements/test.txt
# fs-s3fs
botocore==1.33.6
botocore==1.33.10
# via
# -r requirements/test.txt
# boto3
Expand Down Expand Up @@ -167,7 +167,7 @@ packaging==23.2
# via
# -r requirements/test.txt
# pytest
path==16.7.1
path==16.9.0
# via
# -r requirements/test.txt
# edx-i18n-tools
Expand Down
6 changes: 3 additions & 3 deletions requirements/test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ bleach[css]==6.1.0
# via
# -r requirements/base.txt
# bleach
boto3==1.33.6
boto3==1.33.10
# via
# -r requirements/base.txt
# fs-s3fs
botocore==1.33.6
botocore==1.33.10
# via
# -r requirements/base.txt
# boto3
Expand Down Expand Up @@ -118,7 +118,7 @@ openedx-django-pyfs==3.4.0
# xblock
packaging==23.2
# via pytest
path==16.7.1
path==16.9.0
# via edx-i18n-tools
pluggy==1.3.0
# via pytest
Expand Down