Skip to content

Commit

Permalink
Merge pull request #21 from edx/jenkins/zshkoor/tox40-updates-c577f54
Browse files Browse the repository at this point in the history
fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
  • Loading branch information
UsamaSadiq authored Nov 10, 2023
2 parents c577f54 + aa24188 commit da205e4
Show file tree
Hide file tree
Showing 10 changed files with 276 additions and 240 deletions.
31 changes: 17 additions & 14 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,54 +4,57 @@
#
# make upgrade
#
asgiref==3.6.0
asgiref==3.7.2
# via django
certifi==2022.12.7
certifi==2023.7.22
# via requests
cffi==1.15.1
cffi==1.16.0
# via pynacl
charset-normalizer==3.1.0
charset-normalizer==3.3.1
# via requests
click==8.1.3
click==8.1.7
# via edx-django-utils
django==3.2.19
django==3.2.22
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# django-crum
# django-waffle
# edx-django-utils
django-crum==0.7.9
# via edx-django-utils
django-waffle==3.0.0
django-waffle==4.0.0
# via edx-django-utils
edx-django-utils==5.4.0
edx-django-utils==5.7.0
# via -r requirements/base.in
idna==3.4
# via requests
newrelic==8.8.0
newrelic==9.1.1
# via edx-django-utils
oauthlib==3.2.2
# via
# -r requirements/base.in
# requests-oauthlib
pbr==5.11.1
# via stevedore
psutil==5.9.5
psutil==5.9.6
# via edx-django-utils
pycparser==2.21
# via cffi
pynacl==1.5.0
# via edx-django-utils
pytz==2023.3
pytz==2023.3.post1
# via
# -r requirements/base.in
# django
requests==2.30.0
requests==2.31.0
# via requests-oauthlib
requests-oauthlib==1.3.1
# via -r requirements/base.in
sqlparse==0.4.4
# via django
stevedore==5.0.0
stevedore==5.1.0
# via edx-django-utils
urllib3==2.0.2
typing-extensions==4.8.0
# via asgiref
urllib3==2.0.7
# via requests
22 changes: 11 additions & 11 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,31 @@
#
# make upgrade
#
certifi==2022.12.7
certifi==2023.7.22
# via requests
charset-normalizer==3.1.0
charset-normalizer==3.3.1
# via requests
codecov==2.1.13
# via -r requirements/ci.in
coverage==7.2.5
coverage==7.3.2
# via codecov
distlib==0.3.6
distlib==0.3.7
# via virtualenv
filelock==3.12.0
filelock==3.12.4
# via
# tox
# virtualenv
idna==3.4
# via requests
packaging==23.1
packaging==23.2
# via tox
platformdirs==3.5.0
platformdirs==3.11.0
# via virtualenv
pluggy==1.0.0
pluggy==1.3.0
# via tox
py==1.11.0
# via tox
requests==2.30.0
requests==2.31.0
# via codecov
six==1.16.0
# via tox
Expand All @@ -38,7 +38,7 @@ tox==3.28.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/ci.in
urllib3==2.0.2
urllib3==2.0.7
# via requests
virtualenv==20.23.0
virtualenv==20.24.5
# via tox
1 change: 0 additions & 1 deletion requirements/dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@
-r ci.txt # dependencies needed to setup testing environment on CI

diff-cover # Changeset diff test coverage
tox-battery # Makes tox aware of requirements file changes
Loading

0 comments on commit da205e4

Please sign in to comment.