Skip to content

Commit

Permalink
Merge branch 'main' into MJG/filers-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
mariajgrimaldi committed Jul 18, 2023
2 parents b2fb649 + ac4befd commit b0c9830
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 74 deletions.
4 changes: 2 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
#
asgiref==3.7.2
# via django
django==3.2.19
django==3.2.20
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
pytz==2023.3
# via django
sqlparse==0.4.4
# via django
typing-extensions==4.6.3
typing-extensions==4.7.1
# via asgiref
8 changes: 4 additions & 4 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
#
distlib==0.3.6
# via virtualenv
filelock==3.12.1
filelock==3.12.2
# via
# tox
# virtualenv
packaging==23.1
# via tox
platformdirs==3.5.3
platformdirs==3.9.1
# via virtualenv
pluggy==1.0.0
pluggy==1.2.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.23.0
virtualenv==20.24.0
# via tox
45 changes: 23 additions & 22 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ asgiref==3.7.2
# via
# -r requirements/quality.txt
# django
astroid==2.15.5
astroid==2.15.6
# via
# -r requirements/quality.txt
# pylint
Expand All @@ -31,11 +31,11 @@ cffi==1.15.1
# cryptography
chardet==5.1.0
# via diff-cover
charset-normalizer==3.1.0
charset-normalizer==3.2.0
# via
# -r requirements/quality.txt
# requests
click==8.1.3
click==8.1.5
# via
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
Expand All @@ -55,13 +55,13 @@ coverage[toml]==7.2.7
# via
# -r requirements/quality.txt
# pytest-cov
cryptography==41.0.1
cryptography==41.0.2
# via
# -r requirements/quality.txt
# secretstorage
ddt==1.6.0
# via -r requirements/quality.txt
diff-cover==7.6.0
diff-cover==7.7.0
# via -r requirements/dev.in
dill==0.3.6
# via
Expand All @@ -71,7 +71,7 @@ distlib==0.3.6
# via
# -r requirements/ci.txt
# virtualenv
django==3.2.19
django==3.2.20
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/quality.txt
Expand All @@ -81,11 +81,11 @@ docutils==0.20.1
# readme-renderer
edx-lint==5.3.4
# via -r requirements/quality.txt
exceptiongroup==1.1.1
exceptiongroup==1.1.2
# via
# -r requirements/quality.txt
# pytest
filelock==3.12.1
filelock==3.12.2
# via
# -r requirements/ci.txt
# tox
Expand All @@ -94,12 +94,12 @@ idna==3.4
# via
# -r requirements/quality.txt
# requests
importlib-metadata==6.6.0
importlib-metadata==6.8.0
# via
# -r requirements/quality.txt
# keyring
# twine
importlib-resources==5.12.0
importlib-resources==6.0.0
# via
# -r requirements/quality.txt
# keyring
Expand All @@ -111,7 +111,7 @@ isort==5.12.0
# via
# -r requirements/quality.txt
# pylint
jaraco-classes==3.2.3
jaraco-classes==3.3.0
# via
# -r requirements/quality.txt
# keyring
Expand All @@ -125,15 +125,15 @@ jinja2==3.1.2
# -r requirements/quality.txt
# code-annotations
# diff-cover
keyring==23.13.1
keyring==24.2.0
# via
# -r requirements/quality.txt
# twine
lazy-object-proxy==1.9.0
# via
# -r requirements/quality.txt
# astroid
markdown-it-py==2.2.0
markdown-it-py==3.0.0
# via
# -r requirements/quality.txt
# rich
Expand Down Expand Up @@ -165,19 +165,19 @@ pbr==5.11.1
# via
# -r requirements/quality.txt
# stevedore
pip-tools==6.13.0
pip-tools==7.0.0
# via -r requirements/pip-tools.txt
pkginfo==1.9.6
# via
# -r requirements/quality.txt
# twine
platformdirs==3.5.3
platformdirs==3.9.1
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# pylint
# virtualenv
pluggy==1.0.0
pluggy==1.2.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand Down Expand Up @@ -226,7 +226,7 @@ pyproject-hooks==1.0.0
# via
# -r requirements/pip-tools.txt
# build
pytest==7.3.2
pytest==7.4.0
# via
# -r requirements/quality.txt
# pytest-cov
Expand All @@ -247,7 +247,7 @@ pyyaml==6.0
# via
# -r requirements/quality.txt
# code-annotations
readme-renderer==37.3
readme-renderer==40.0
# via
# -r requirements/quality.txt
# twine
Expand All @@ -264,7 +264,7 @@ rfc3986==2.0.0
# via
# -r requirements/quality.txt
# twine
rich==13.4.1
rich==13.4.2
# via
# -r requirements/quality.txt
# twine
Expand Down Expand Up @@ -302,6 +302,7 @@ tomli==2.0.1
# -r requirements/quality.txt
# build
# coverage
# pip-tools
# pylint
# pyproject-hooks
# pytest
Expand All @@ -319,7 +320,7 @@ tox-battery==0.6.1
# via -r requirements/dev.in
twine==4.0.2
# via -r requirements/quality.txt
typing-extensions==4.6.3
typing-extensions==4.7.1
# via
# -r requirements/quality.txt
# asgiref
Expand All @@ -331,7 +332,7 @@ urllib3==2.0.3
# -r requirements/quality.txt
# requests
# twine
virtualenv==20.23.0
virtualenv==20.24.0
# via
# -r requirements/ci.txt
# tox
Expand All @@ -347,7 +348,7 @@ wrapt==1.15.0
# via
# -r requirements/quality.txt
# astroid
zipp==3.15.0
zipp==3.16.2
# via
# -r requirements/quality.txt
# importlib-metadata
Expand Down
33 changes: 16 additions & 17 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ certifi==2023.5.7
# via requests
cffi==1.15.1
# via cryptography
charset-normalizer==3.1.0
charset-normalizer==3.2.0
# via requests
click==8.1.3
click==8.1.5
# via
# -r requirements/test.txt
# code-annotations
Expand All @@ -36,11 +36,11 @@ coverage[toml]==7.2.7
# via
# -r requirements/test.txt
# pytest-cov
cryptography==41.0.1
cryptography==41.0.2
# via secretstorage
ddt==1.6.0
# via -r requirements/test.txt
django==3.2.19
django==3.2.20
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/test.txt
Expand All @@ -53,26 +53,26 @@ docutils==0.19
# readme-renderer
# restructuredtext-lint
# sphinx
exceptiongroup==1.1.1
exceptiongroup==1.1.2
# via
# -r requirements/test.txt
# pytest
idna==3.4
# via requests
imagesize==1.4.1
# via sphinx
importlib-metadata==6.6.0
importlib-metadata==6.8.0
# via
# keyring
# sphinx
# twine
importlib-resources==5.12.0
importlib-resources==6.0.0
# via keyring
iniconfig==2.0.0
# via
# -r requirements/test.txt
# pytest
jaraco-classes==3.2.3
jaraco-classes==3.3.0
# via keyring
jeepney==0.8.0
# via
Expand All @@ -83,11 +83,11 @@ jinja2==3.1.2
# -r requirements/test.txt
# code-annotations
# sphinx
keyring==23.13.1
keyring==24.2.0
# via twine
livereload==2.6.3
# via sphinx-autobuild
markdown-it-py==2.2.0
markdown-it-py==3.0.0
# via rich
markupsafe==2.1.3
# via
Expand All @@ -110,7 +110,7 @@ pbr==5.11.1
# stevedore
pkginfo==1.9.6
# via twine
pluggy==1.0.0
pluggy==1.2.0
# via
# -r requirements/test.txt
# pytest
Expand All @@ -127,7 +127,7 @@ pygments==2.15.1
# sphinx
pyproject-hooks==1.0.0
# via build
pytest==7.3.2
pytest==7.4.0
# via
# -r requirements/test.txt
# pytest-cov
Expand All @@ -150,7 +150,7 @@ pyyaml==6.0
# -r requirements/test.txt
# code-annotations
# sphinx-book-theme
readme-renderer==37.3
readme-renderer==40.0
# via twine
requests==2.31.0
# via
Expand All @@ -163,7 +163,7 @@ restructuredtext-lint==1.4.0
# via doc8
rfc3986==2.0.0
# via twine
rich==13.4.1
rich==13.4.2
# via twine
secretstorage==3.3.3
# via keyring
Expand All @@ -177,7 +177,6 @@ soupsieve==2.4.1
# via beautifulsoup4
sphinx==5.3.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/doc.in
# pydata-sphinx-theme
# sphinx-autobuild
Expand Down Expand Up @@ -233,7 +232,7 @@ tornado==6.3.2
# via livereload
twine==4.0.2
# via -r requirements/doc.in
typing-extensions==4.6.3
typing-extensions==4.7.1
# via
# -r requirements/test.txt
# asgiref
Expand All @@ -244,7 +243,7 @@ urllib3==2.0.3
# twine
webencodings==0.5.1
# via bleach
zipp==3.15.0
zipp==3.16.2
# via
# importlib-metadata
# importlib-resources
8 changes: 5 additions & 3 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@
#
build==0.10.0
# via pip-tools
click==8.1.3
click==8.1.5
# via pip-tools
packaging==23.1
# via build
pip-tools==6.13.0
pip-tools==7.0.0
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
# via build
tomli==2.0.1
# via build
# via
# build
# pip-tools
wheel==0.40.0
# via pip-tools

Expand Down
4 changes: 2 additions & 2 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wheel==0.40.0
# via -r requirements/pip.in

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

0 comments on commit b0c9830

Please sign in to comment.