Skip to content

Commit

Permalink
Merge pull request #466 from openedx/jenkins/zshkoor/tox40-updates-cc…
Browse files Browse the repository at this point in the history
…ec7ad

fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
  • Loading branch information
UsamaSadiq authored Oct 26, 2023
2 parents ccec7ad + 59f6de4 commit 66a1d33
Show file tree
Hide file tree
Showing 9 changed files with 223 additions and 223 deletions.
1 change: 0 additions & 1 deletion requirements/ci.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@

coveralls # Code coverage reporting
tox # Virtualenv management for tests
tox-battery # Makes tox aware of requirements file changes
21 changes: 9 additions & 12 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,29 @@
#
# make upgrade
#
certifi==2023.5.7
certifi==2023.7.22
# via requests
charset-normalizer==3.1.0
charset-normalizer==3.3.1
# via requests
coverage==6.5.0
# via coveralls
coveralls==3.3.1
# via -r requirements/ci.in
distlib==0.3.6
distlib==0.3.7
# via virtualenv
docopt==0.6.2
# via coveralls
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.1
platformdirs==3.11.0
# via virtualenv
pluggy==1.0.0
pluggy==1.3.0
# via tox
py==1.11.0
# via tox
Expand All @@ -40,10 +40,7 @@ tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/ci.in
# tox-battery
tox-battery==0.6.1
# via -r requirements/ci.in
urllib3==2.0.2
urllib3==2.0.7
# via requests
virtualenv==20.23.0
virtualenv==20.24.5
# via tox
5 changes: 0 additions & 5 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,3 @@ django-simple-history==3.0.0
# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
tox<4.0.0

# edx-sphinx-theme is not compatible with latest Sphinx==6.0.0 version
# Pinning Sphinx version unless the compatibility issue gets resolved
# For details, see issue https://github.com/openedx/edx-sphinx-theme/issues/197
sphinx<6.0.0
Loading

0 comments on commit 66a1d33

Please sign in to comment.