Skip to content

Commit

Permalink
Merge pull request #378 from openedx/remove-tox-battery-requirements
Browse files Browse the repository at this point in the history
fix: remove tox-battery requirement and update tox
  • Loading branch information
UsamaSadiq authored Dec 11, 2023
2 parents b8883f9 + b96ac5a commit 6ed3ff8
Show file tree
Hide file tree
Showing 9 changed files with 226 additions and 223 deletions.
42 changes: 21 additions & 21 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
amqp==5.1.1
amqp==5.2.0
# via kombu
aniso8601==9.0.1
# via tincan
Expand All @@ -16,19 +16,19 @@ backports-zoneinfo[tzdata]==0.2.1
# via
# celery
# kombu
billiard==4.1.0
billiard==4.2.0
# via celery
celery==5.3.4
celery==5.3.6
# via
# edx-celeryutils
# event-tracking
certifi==2023.7.22
certifi==2023.11.17
# via requests
cffi==1.15.1
cffi==1.16.0
# via
# cryptography
# pynacl
charset-normalizer==3.2.0
charset-normalizer==3.3.2
# via requests
click==8.1.7
# via
Expand All @@ -46,9 +46,9 @@ click-repl==0.3.0
# via celery
code-annotations==1.5.0
# via edx-toggles
cryptography==41.0.3
cryptography==41.0.7
# via django-fernet-fields-v2
django==3.2.21
django==3.2.23
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
Expand All @@ -64,7 +64,7 @@ django==3.2.21
# event-tracking
# jsonfield
# openedx-filters
django-config-models==2.5.0
django-config-models==2.5.1
# via -r requirements/base.in
django-crum==0.7.9
# via
Expand All @@ -82,7 +82,7 @@ djangorestframework==3.14.0
# via django-config-models
edx-celeryutils==1.2.3
# via -r requirements/base.in
edx-django-utils==5.7.0
edx-django-utils==5.9.0
# via
# django-config-models
# edx-toggles
Expand All @@ -91,9 +91,9 @@ edx-toggles==5.1.0
# via -r requirements/base.in
event-tracking==2.2.0
# via -r requirements/base.in
fasteners==0.18
fasteners==0.19
# via -r requirements/base.in
idna==3.4
idna==3.6
# via requests
isodate==0.6.1
# via -r requirements/base.in
Expand All @@ -103,19 +103,19 @@ jsonfield==3.1.0
# via
# -r requirements/base.in
# edx-celeryutils
kombu==5.3.2
kombu==5.3.4
# via celery
markupsafe==2.1.3
# via jinja2
newrelic==9.0.0
newrelic==9.3.0
# via edx-django-utils
openedx-filters==1.6.0
# via -r requirements/base.in
pbr==5.11.1
pbr==6.0.0
# via stevedore
prompt-toolkit==3.0.39
prompt-toolkit==3.0.41
# via click-repl
psutil==5.9.5
psutil==5.9.6
# via edx-django-utils
pycparser==2.21
# via cffi
Expand Down Expand Up @@ -157,20 +157,20 @@ text-unidecode==1.3
# via python-slugify
tincan==1.0.0
# via -r requirements/base.in
typing-extensions==4.7.1
typing-extensions==4.8.0
# via
# asgiref
# kombu
tzdata==2023.3
# via
# backports-zoneinfo
# celery
urllib3==2.0.4
urllib3==2.1.0
# via requests
vine==5.0.0
vine==5.1.0
# via
# amqp
# celery
# kombu
wcwidth==0.2.6
wcwidth==0.2.12
# via prompt-toolkit
36 changes: 21 additions & 15 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,35 @@
#
# 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.12.3
filelock==3.13.1
# via
# tox
# virtualenv
packaging==23.2
# via
# pyproject-api
# tox
platformdirs==4.1.0
# via
# tox
# virtualenv
packaging==23.1
# via tox
platformdirs==3.10.0
# via 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 tox
tox==3.28.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/ci.in
typing-extensions==4.7.1
# via filelock
virtualenv==20.24.5
# pyproject-api
# tox
tox==4.11.4
# via -r requirements/ci.in
virtualenv==20.25.0
# via tox
1 change: 0 additions & 1 deletion requirements/dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@

diff-cover # Changeset diff test coverage
edx-i18n-tools # For i18n_tool dummy
tox-battery # Makes tox aware of requirements file changes
Loading

0 comments on commit 6ed3ff8

Please sign in to comment.