Skip to content
This repository has been archived by the owner on Jun 7, 2024. It is now read-only.

Commit

Permalink
Merge pull request #388 from openedx/jenkins/zshkoor/tox40-updates-89…
Browse files Browse the repository at this point in the history 
…0a9c4

fix: Replaced whitelist_externals with allowlist_externals in tox and removed tox-battery
  • Loading branch information
@UsamaSadiq
UsamaSadiq committed Oct 26, 2023
2 parents 890a9c4 + e959413 commit ed9083c
Show file tree
Hide file tree
Showing 8 changed files with 116 additions and 89 deletions.
34 changes: 22 additions & 12 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,51 @@
#
certifi==2023.7.22
# via requests
cffi==1.15.1
cffi==1.16.0
# via
# cryptography
# pynacl
charset-normalizer==3.2.0
charset-normalizer==3.3.1
# via requests
click==8.1.6
click==8.1.7
# via -r requirements/base.in
cryptography==41.0.3
cryptography==41.0.4
# via pyjwt
deprecated==1.2.14
# via pygithub
gitdb==4.0.10
gitdb==4.0.11
# via gitpython
gitpython==3.1.32
gitpython==3.1.40
# via -r requirements/base.in
idna==3.4
# via requests
packaging==23.1
packaging==23.2
# via -r requirements/base.in
pycparser==2.21
# via cffi
pygithub==1.59.0
pygithub==2.1.1
# via -r requirements/base.in
pyjwt[crypto]==2.8.0
# via pygithub
# via
# pygithub
# pyjwt
pynacl==1.5.0
# via pygithub
python-dateutil==2.8.2
# via pygithub
requests==2.31.0
# via
# -r requirements/base.in
# pygithub
smmap==5.0.0
six==1.16.0
# via python-dateutil
smmap==5.0.1
# via gitdb
urllib3==2.0.4
# via requests
typing-extensions==4.8.0
# via pygithub
urllib3==2.0.7
# via
# pygithub
# requests
wrapt==1.15.0
# via deprecated
1 change: 0 additions & 1 deletion requirements/ci.in
View file
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
13 changes: 5 additions & 8 deletions requirements/ci.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
#
distlib==0.3.7
# via virtualenv
filelock==3.12.2
filelock==3.12.4
# via
# tox
# virtualenv
packaging==23.1
packaging==23.2
# via tox
platformdirs==3.10.0
platformdirs==3.11.0
# via virtualenv
pluggy==1.2.0
pluggy==1.3.0
# via tox
py==1.11.0
# via tox
Expand All @@ -26,8 +26,5 @@ tox==3.28.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/ci.in
# tox-battery
tox-battery==0.6.1
# via -r requirements/ci.in
virtualenv==20.24.2
virtualenv==20.24.5
# via tox
77 changes: 43 additions & 34 deletions requirements/dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,29 @@
#
# make upgrade
#
astroid==2.15.6
astroid==3.0.1
# via
# -r requirements/testing.txt
# pylint
# pylint-celery
build==0.10.0
build==1.0.3
# via
# -r requirements/pip-tools.txt
# pip-tools
certifi==2023.7.22
# via
# -r requirements/testing.txt
# requests
cffi==1.15.1
cffi==1.16.0
# via
# -r requirements/testing.txt
# cryptography
# pynacl
charset-normalizer==3.2.0
charset-normalizer==3.3.1
# via
# -r requirements/testing.txt
# requests
click==8.1.6
click==8.1.7
# via
# -r requirements/pip-tools.txt
# -r requirements/testing.txt
Expand All @@ -42,11 +42,12 @@ code-annotations==1.5.0
# via
# -r requirements/testing.txt
# edx-lint
coverage[toml]==7.2.7
coverage[toml]==7.3.2
# via
# -r requirements/testing.txt
# coverage
# pytest-cov
cryptography==41.0.3
cryptography==41.0.4
# via
# -r requirements/testing.txt
# pyjwt
Expand All @@ -64,25 +65,29 @@ distlib==0.3.7
# virtualenv
edx-lint==5.3.4
# via -r requirements/testing.txt
exceptiongroup==1.1.2
exceptiongroup==1.1.3
# via
# -r requirements/testing.txt
# pytest
filelock==3.12.2
filelock==3.12.4
# via
# -r requirements/ci.txt
# tox
# virtualenv
gitdb==4.0.10
gitdb==4.0.11
# via
# -r requirements/testing.txt
# gitpython
gitpython==3.1.32
gitpython==3.1.40
# via -r requirements/testing.txt
idna==3.4
# via
# -r requirements/testing.txt
# requests
importlib-metadata==6.8.0
# via
# -r requirements/pip-tools.txt
# build
iniconfig==2.0.0
# via
# -r requirements/testing.txt
Expand All @@ -95,10 +100,6 @@ jinja2==3.1.2
# via
# -r requirements/testing.txt
# code-annotations
lazy-object-proxy==1.9.0
# via
# -r requirements/testing.txt
# astroid
markupsafe==2.1.3
# via
# -r requirements/testing.txt
Expand All @@ -109,7 +110,7 @@ mccabe==0.7.0
# pylint
mock==5.1.0
# via -r requirements/testing.txt
packaging==23.1
packaging==23.2
# via
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
Expand All @@ -121,15 +122,15 @@ pbr==5.11.1
# via
# -r requirements/testing.txt
# stevedore
pip-tools==7.1.0
pip-tools==7.3.0
# via -r requirements/pip-tools.txt
platformdirs==3.10.0
platformdirs==3.11.0
# via
# -r requirements/ci.txt
# -r requirements/testing.txt
# pylint
# virtualenv
pluggy==1.2.0
pluggy==1.3.0
# via
# -r requirements/ci.txt
# -r requirements/testing.txt
Expand All @@ -139,19 +140,20 @@ py==1.11.0
# via
# -r requirements/ci.txt
# tox
pycodestyle==2.11.0
pycodestyle==2.11.1
# via -r requirements/testing.txt
pycparser==2.21
# via
# -r requirements/testing.txt
# cffi
pygithub==1.59.0
pygithub==2.1.1
# via -r requirements/testing.txt
pyjwt[crypto]==2.8.0
# via
# -r requirements/testing.txt
# pygithub
pylint==2.17.5
# pyjwt
pylint==3.0.2
# via
# -r requirements/testing.txt
# edx-lint
Expand All @@ -162,7 +164,7 @@ pylint-celery==0.3
# via
# -r requirements/testing.txt
# edx-lint
pylint-django==2.5.3
pylint-django==2.5.4
# via
# -r requirements/testing.txt
# edx-lint
Expand All @@ -179,12 +181,16 @@ pyproject-hooks==1.0.0
# via
# -r requirements/pip-tools.txt
# build
pytest==7.4.0
pytest==7.4.2
# via
# -r requirements/testing.txt
# pytest-cov
pytest-cov==4.1.0
# via -r requirements/testing.txt
python-dateutil==2.8.2
# via
# -r requirements/testing.txt
# pygithub
python-slugify==8.0.1
# via
# -r requirements/testing.txt
Expand All @@ -202,16 +208,17 @@ six==1.16.0
# -r requirements/ci.txt
# -r requirements/testing.txt
# edx-lint
# python-dateutil
# tox
smmap==5.0.0
smmap==5.0.1
# via
# -r requirements/testing.txt
# gitdb
stevedore==5.1.0
# via
# -r requirements/testing.txt
# code-annotations
testfixtures==7.1.0
testfixtures==7.2.2
# via -r requirements/testing.txt
text-unidecode==1.3
# via
Expand All @@ -237,31 +244,33 @@ tox==3.28.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/ci.txt
# tox-battery
tox-battery==0.6.1
# via -r requirements/ci.txt
typing-extensions==4.7.1
typing-extensions==4.8.0
# via
# -r requirements/testing.txt
# astroid
# pygithub
# pylint
urllib3==2.0.4
urllib3==2.0.7
# via
# -r requirements/testing.txt
# pygithub
# requests
virtualenv==20.24.2
virtualenv==20.24.5
# via
# -r requirements/ci.txt
# tox
wheel==0.41.0
wheel==0.41.2
# via
# -r requirements/pip-tools.txt
# pip-tools
wrapt==1.15.0
# via
# -r requirements/testing.txt
# astroid
# deprecated
zipp==3.17.0
# via
# -r requirements/pip-tools.txt
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
14 changes: 9 additions & 5 deletions requirements/pip-tools.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@
#
# make upgrade
#
build==0.10.0
build==1.0.3
# via pip-tools
click==8.1.6
click==8.1.7
# via pip-tools
packaging==23.1
importlib-metadata==6.8.0
# via build
pip-tools==7.1.0
packaging==23.2
# via build
pip-tools==7.3.0
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
# via build
Expand All @@ -19,8 +21,10 @@ tomli==2.0.1
# build
# pip-tools
# pyproject-hooks
wheel==0.41.0
wheel==0.41.2
# via pip-tools
zipp==3.17.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
6 changes: 3 additions & 3 deletions requirements/pip.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#
# make upgrade
#
wheel==0.41.0
wheel==0.41.2
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==23.2.1
pip==23.3.1
# via -r requirements/pip.in
setuptools==68.0.0
setuptools==68.2.2
# via -r requirements/pip.in
Loading

0 comments on commit ed9083c

Please sign in to comment.