Skip to content

Commit

Permalink
Merge branch 'main' into jenkins/zshkoor/setup-py-updated-241d282
Browse files Browse the repository at this point in the history
  • Loading branch information
mariajgrimaldi authored Sep 28, 2023
2 parents 35bbaca + 74dbb16 commit 3c878f8
Show file tree
Hide file tree
Showing 8 changed files with 75 additions and 80 deletions.
4 changes: 2 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
#
asgiref==3.7.2
# via django
django==3.2.20
django==3.2.21
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
pytz==2023.3
pytz==2023.3.post1
# via django
sqlparse==0.4.4
# via django
Expand Down
6 changes: 3 additions & 3 deletions requirements/ci.txt
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
# via tox
platformdirs==3.10.0
# via virtualenv
pluggy==1.2.0
pluggy==1.3.0
# via tox
py==1.11.0
# via tox
Expand All @@ -26,5 +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
virtualenv==20.24.2
virtualenv==20.24.5
# via tox
48 changes: 23 additions & 25 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@ astroid==2.15.6
# -r requirements/quality.txt
# pylint
# pylint-celery
bleach==6.0.0
# via
# -r requirements/quality.txt
# readme-renderer
build==0.10.0
build==1.0.3
# via
# -r requirements/pip-tools.txt
# pip-tools
Expand All @@ -35,7 +31,7 @@ charset-normalizer==3.2.0
# via
# -r requirements/quality.txt
# requests
click==8.1.6
click==8.1.7
# via
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
Expand All @@ -51,7 +47,7 @@ code-annotations==1.5.0
# via
# -r requirements/quality.txt
# edx-lint
coverage[toml]==7.2.7
coverage[toml]==7.3.1
# via
# -r requirements/quality.txt
# pytest-cov
Expand All @@ -71,7 +67,7 @@ distlib==0.3.7
# via
# -r requirements/ci.txt
# virtualenv
django==3.2.20
django==3.2.21
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/quality.txt
Expand All @@ -81,11 +77,11 @@ docutils==0.20.1
# readme-renderer
edx-lint==5.3.4
# via -r requirements/quality.txt
exceptiongroup==1.1.2
exceptiongroup==1.1.3
# via
# -r requirements/quality.txt
# pytest
filelock==3.12.2
filelock==3.12.4
# via
# -r requirements/ci.txt
# tox
Expand All @@ -96,10 +92,12 @@ idna==3.4
# requests
importlib-metadata==6.8.0
# via
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
# build
# keyring
# twine
importlib-resources==6.0.0
importlib-resources==6.0.1
# via
# -r requirements/quality.txt
# keyring
Expand Down Expand Up @@ -153,6 +151,10 @@ more-itertools==10.1.0
# via
# -r requirements/quality.txt
# jaraco-classes
nh3==0.2.14
# via
# -r requirements/quality.txt
# readme-renderer
packaging==23.1
# via
# -r requirements/ci.txt
Expand All @@ -165,7 +167,7 @@ pbr==5.11.1
# via
# -r requirements/quality.txt
# stevedore
pip-tools==7.2.0
pip-tools==7.3.0
# via -r requirements/pip-tools.txt
pkginfo==1.9.6
# via
Expand All @@ -177,7 +179,7 @@ platformdirs==3.10.0
# -r requirements/quality.txt
# pylint
# virtualenv
pluggy==1.2.0
pluggy==1.3.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand Down Expand Up @@ -226,7 +228,7 @@ pyproject-hooks==1.0.0
# via
# -r requirements/pip-tools.txt
# build
pytest==7.4.0
pytest==7.4.2
# via
# -r requirements/quality.txt
# pytest-cov
Expand All @@ -239,15 +241,15 @@ python-slugify==8.0.1
# via
# -r requirements/quality.txt
# code-annotations
pytz==2023.3
pytz==2023.3.post1
# via
# -r requirements/quality.txt
# django
pyyaml==6.0.1
# via
# -r requirements/quality.txt
# code-annotations
readme-renderer==40.0
readme-renderer==42.0
# via
# -r requirements/quality.txt
# twine
Expand All @@ -264,7 +266,7 @@ rfc3986==2.0.0
# via
# -r requirements/quality.txt
# twine
rich==13.5.2
rich==13.5.3
# via
# -r requirements/quality.txt
# twine
Expand All @@ -276,7 +278,6 @@ six==1.16.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# bleach
# edx-lint
# tox
snowballstemmer==2.2.0
Expand Down Expand Up @@ -316,7 +317,7 @@ tox==3.28.0
# -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
tox-battery==0.6.2
# via -r requirements/dev.in
twine==4.0.2
# via -r requirements/quality.txt
Expand All @@ -332,15 +333,11 @@ urllib3==2.0.4
# -r requirements/quality.txt
# requests
# twine
virtualenv==20.24.2
virtualenv==20.24.5
# via
# -r requirements/ci.txt
# tox
webencodings==0.5.1
# via
# -r requirements/quality.txt
# bleach
wheel==0.41.1
wheel==0.41.2
# via
# -r requirements/pip-tools.txt
# pip-tools
Expand All @@ -350,6 +347,7 @@ wrapt==1.15.0
# astroid
zipp==3.16.2
# via
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
# importlib-metadata
# importlib-resources
Expand Down
37 changes: 17 additions & 20 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,31 @@ babel==2.12.1
# via sphinx
beautifulsoup4==4.12.2
# via pydata-sphinx-theme
bleach==6.0.0
# via readme-renderer
build==0.10.0
build==1.0.3
# via -r requirements/doc.in
certifi==2023.7.22
# via requests
cffi==1.15.1
# via cryptography
charset-normalizer==3.2.0
# via requests
click==8.1.6
click==8.1.7
# via
# -r requirements/test.txt
# code-annotations
code-annotations==1.5.0
# via -r requirements/test.txt
colorama==0.4.6
# via sphinx-autobuild
coverage[toml]==7.2.7
coverage[toml]==7.3.1
# via
# -r requirements/test.txt
# pytest-cov
cryptography==41.0.3
# via secretstorage
ddt==1.6.0
# via -r requirements/test.txt
django==3.2.20
django==3.2.21
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/test.txt
Expand All @@ -53,7 +51,7 @@ docutils==0.19
# readme-renderer
# restructuredtext-lint
# sphinx
exceptiongroup==1.1.2
exceptiongroup==1.1.3
# via
# -r requirements/test.txt
# pytest
Expand All @@ -63,10 +61,11 @@ imagesize==1.4.1
# via sphinx
importlib-metadata==6.8.0
# via
# build
# keyring
# sphinx
# twine
importlib-resources==6.0.0
importlib-resources==6.0.1
# via keyring
iniconfig==2.0.0
# via
Expand Down Expand Up @@ -97,6 +96,8 @@ mdurl==0.1.2
# via markdown-it-py
more-itertools==10.1.0
# via jaraco-classes
nh3==0.2.14
# via readme-renderer
packaging==23.1
# via
# -r requirements/test.txt
Expand All @@ -110,7 +111,7 @@ pbr==5.11.1
# stevedore
pkginfo==1.9.6
# via twine
pluggy==1.2.0
pluggy==1.3.0
# via
# -r requirements/test.txt
# pytest
Expand All @@ -127,7 +128,7 @@ pygments==2.16.1
# sphinx
pyproject-hooks==1.0.0
# via build
pytest==7.4.0
pytest==7.4.2
# via
# -r requirements/test.txt
# pytest-cov
Expand All @@ -140,7 +141,7 @@ python-slugify==8.0.1
# via
# -r requirements/test.txt
# code-annotations
pytz==2023.3
pytz==2023.3.post1
# via
# -r requirements/test.txt
# babel
Expand All @@ -150,7 +151,7 @@ pyyaml==6.0.1
# -r requirements/test.txt
# code-annotations
# sphinx-book-theme
readme-renderer==40.0
readme-renderer==42.0
# via twine
requests==2.31.0
# via
Expand All @@ -163,17 +164,15 @@ restructuredtext-lint==1.4.0
# via doc8
rfc3986==2.0.0
# via twine
rich==13.5.2
rich==13.5.3
# via twine
secretstorage==3.3.3
# via keyring
six==1.16.0
# via
# bleach
# livereload
# via livereload
snowballstemmer==2.2.0
# via sphinx
soupsieve==2.4.1
soupsieve==2.5
# via beautifulsoup4
sphinx==5.3.0
# via
Expand Down Expand Up @@ -228,7 +227,7 @@ tomli==2.0.1
# doc8
# pyproject-hooks
# pytest
tornado==6.3.2
tornado==6.3.3
# via livereload
twine==4.0.2
# via -r requirements/doc.in
Expand All @@ -241,8 +240,6 @@ urllib3==2.0.4
# via
# requests
# twine
webencodings==0.5.1
# via bleach
zipp==3.16.2
# via
# importlib-metadata
Expand Down
12 changes: 8 additions & 4 deletions requirements/pip-tools.txt
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
importlib-metadata==6.8.0
# via build
packaging==23.1
# via build
pip-tools==7.2.0
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.1
wheel==0.41.2
# via pip-tools
zipp==3.16.2
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
Loading

0 comments on commit 3c878f8

Please sign in to comment.