Skip to content

Commit

Permalink
Merge pull request #177 from edx/jenkins/upgrade-python-requirements-…
Browse files Browse the repository at this point in the history
…b2e1d5c

Python Requirements Update
  • Loading branch information
UsamaSadiq authored Oct 18, 2021
2 parents b2e1d5c + ed0618d commit 351c57b
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 41 deletions.
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ django==2.2.24
# -r requirements/base.in
# django-model-utils
# djangorestframework
django-model-utils==4.1.1
django-model-utils==4.2.0
# via -r requirements/base.in
djangorestframework==3.12.4
# via -r requirements/base.in
Expand Down
8 changes: 4 additions & 4 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ backports.entry-points-selectable==1.1.0
# via virtualenv
certifi==2021.10.8
# via requests
charset-normalizer==2.0.6
charset-normalizer==2.0.7
# via requests
codecov==2.1.12
# via -r requirements/ci.in
coverage==6.0.1
coverage==6.0.2
# via codecov
distlib==0.3.3
# via virtualenv
filelock==3.3.0
filelock==3.3.1
# via
# tox
# virtualenv
idna==3.2
idna==3.3
# via requests
packaging==21.0
# via tox
Expand Down
4 changes: 4 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@
# v 5.0 drops support of python3.5
celery<5.0

# pyyaml==6.0 made the `Loader` a necessary argument for `yaml.load()` function.
# swagger2rst uses pyyaml and fails with the new version hence failing the `make docs` command.
# This constraint can be removed once the https://github.com/Arello-Mobile/swagger2rst/issues/10 is done.
pyyaml<6.0
21 changes: 11 additions & 10 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ amqp==2.6.1
# via
# -r requirements/test.txt
# kombu
astroid==2.8.2
astroid==2.8.3
# via
# -r requirements/quality.txt
# pylint
Expand All @@ -33,7 +33,7 @@ certifi==2021.10.8
# via
# -r requirements/ci.txt
# requests
charset-normalizer==2.0.6
charset-normalizer==2.0.7
# via
# -r requirements/ci.txt
# requests
Expand All @@ -55,7 +55,7 @@ code-annotations==1.2.0
# edx-lint
codecov==2.1.12
# via -r requirements/ci.txt
coverage[toml]==6.0.1
coverage[toml]==6.0.2
# via
# -r requirements/ci.txt
# -r requirements/test.txt
Expand All @@ -72,7 +72,7 @@ django==2.2.24
# django-model-utils
# djangorestframework
# edx-i18n-tools
django-model-utils==4.1.1
django-model-utils==4.2.0
# via -r requirements/test.txt
djangorestframework==3.12.4
# via -r requirements/test.txt
Expand All @@ -82,12 +82,12 @@ edx-lint==5.2.0
# via
# -r requirements/dev.in
# -r requirements/quality.txt
filelock==3.3.0
filelock==3.3.1
# via
# -r requirements/ci.txt
# tox
# virtualenv
idna==3.2
idna==3.3
# via
# -r requirements/ci.txt
# requests
Expand Down Expand Up @@ -133,11 +133,11 @@ pbr==5.6.0
# via
# -r requirements/quality.txt
# stevedore
pep517==0.11.0
pep517==0.11.1
# via
# -r requirements/pip-tools.txt
# pip-tools
pip-tools==6.3.1
pip-tools==6.4.0
# via -r requirements/pip-tools.txt
platformdirs==2.4.0
# via
Expand All @@ -159,7 +159,7 @@ py==1.10.0
# -r requirements/test.txt
# pytest
# tox
pycodestyle==2.7.0
pycodestyle==2.8.0
# via -r requirements/quality.txt
pydocstyle==6.1.1
# via -r requirements/quality.txt
Expand Down Expand Up @@ -208,6 +208,7 @@ pytz==2021.3
# django
pyyaml==5.4.1
# via
# -c requirements/constraints.txt
# -r requirements/quality.txt
# code-annotations
# edx-i18n-tools
Expand Down Expand Up @@ -284,7 +285,7 @@ wheel==0.37.0
# via
# -r requirements/pip-tools.txt
# pip-tools
wrapt==1.12.1
wrapt==1.13.2
# via
# -r requirements/quality.txt
# astroid
Expand Down
24 changes: 7 additions & 17 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ celery==4.4.7
# -r requirements/base.txt
certifi==2021.10.8
# via requests
cffi==1.14.6
# via cryptography
charset-normalizer==2.0.6
charset-normalizer==2.0.7
# via requests
colorama==0.4.4
# via twine
Expand All @@ -40,15 +38,13 @@ coreapi==2.3.3
# openapi-codec
coreschema==0.0.4
# via coreapi
cryptography==35.0.0
# via secretstorage
django==2.2.24
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.txt
# django-model-utils
# djangorestframework
django-model-utils==4.1.1
django-model-utils==4.2.0
# via -r requirements/base.txt
django-rest-swagger==2.2.0
# via -r requirements/doc.in
Expand All @@ -66,7 +62,7 @@ docutils==0.17.1
# sphinx
edx-sphinx-theme==3.0.0
# via -r requirements/doc.in
idna==3.2
idna==3.3
# via requests
imagesize==1.2.0
# via sphinx
Expand All @@ -76,10 +72,6 @@ importlib-metadata==4.8.1
# twine
itypes==1.2.0
# via coreapi
jeepney==0.7.1
# via
# keyring
# secretstorage
jinja2==3.0.2
# via
# coreschema
Expand All @@ -105,8 +97,6 @@ pbr==5.6.0
# via stevedore
pkginfo==1.7.1
# via twine
pycparser==2.20
# via cffi
pygments==2.10.0
# via
# doc8
Expand All @@ -123,7 +113,9 @@ pytz==2021.3
# celery
# django
pyyaml==5.4.1
# via swagger2rst
# via
# -c requirements/constraints.txt
# swagger2rst
readme-renderer==30.0
# via twine
requests==2.26.0
Expand All @@ -140,8 +132,6 @@ rfc3986==1.5.0
# via twine
rules==3.0
# via -r requirements/doc.in
secretstorage==3.3.1
# via keyring
simplejson==3.17.5
# via django-rest-swagger
six==1.16.0
Expand Down Expand Up @@ -180,7 +170,7 @@ tqdm==4.62.3
# via twine
twine==3.4.2
# via -r requirements/doc.in
uritemplate==4.0.0
uritemplate==4.1.1
# via coreapi
urllib3==1.26.7
# via requests
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#
click==8.0.3
# via pip-tools
pep517==0.11.0
pep517==0.11.1
# via pip-tools
pip-tools==6.3.1
pip-tools==6.4.0
# via -r requirements/pip-tools.in
tomli==1.2.1
# via pep517
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wheel==0.37.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==21.2.4
pip==21.3
# via -r requirements/pip.in
setuptools==58.2.0
# via -r requirements/pip.in
10 changes: 6 additions & 4 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
astroid==2.8.2
astroid==2.8.3
# via
# pylint
# pylint-celery
Expand Down Expand Up @@ -35,7 +35,7 @@ pbr==5.6.0
# via stevedore
platformdirs==2.4.0
# via pylint
pycodestyle==2.7.0
pycodestyle==2.8.0
# via -r requirements/quality.in
pydocstyle==6.1.1
# via -r requirements/quality.in
Expand All @@ -56,7 +56,9 @@ pylint-plugin-utils==0.6
python-slugify==5.0.2
# via code-annotations
pyyaml==5.4.1
# via code-annotations
# via
# -c requirements/constraints.txt
# code-annotations
six==1.16.0
# via edx-lint
snowballstemmer==2.1.0
Expand All @@ -71,7 +73,7 @@ typing-extensions==3.10.0.2
# via
# astroid
# pylint
wrapt==1.12.1
wrapt==1.13.2
# via astroid

# The following packages are considered to be unsafe in a requirements file:
Expand Down
4 changes: 2 additions & 2 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ attrs==21.2.0
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
coverage[toml]==6.0.1
coverage[toml]==6.0.2
# via pytest-cov
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.txt
# django-model-utils
# djangorestframework
django-model-utils==4.1.1
django-model-utils==4.2.0
# via -r requirements/base.txt
# via -r requirements/base.txt
iniconfig==1.1.1
Expand Down

0 comments on commit 351c57b

Please sign in to comment.