Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/github_actions/actions/setup-py…
Browse files Browse the repository at this point in the history
…thon-5
  • Loading branch information
UsamaSadiq authored Dec 19, 2023
2 parents aabcb28 + 0dbc45d commit f1bf91e
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 42 deletions.
11 changes: 5 additions & 6 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,20 @@ colorama==0.4.6
# via tox
coverage==7.3.2
# via codecov
distlib==0.3.7
distlib==0.3.8
# via virtualenv
filelock==3.13.1
# via
# tox
# virtualenv
idna==3.4
idna==3.6
# via requests
packaging==23.2
# via
# pyproject-api
# tox
platformdirs==3.11.0
platformdirs==4.1.0
# via
# -c requirements/common_constraints.txt
# tox
# virtualenv
pluggy==1.3.0
Expand All @@ -45,9 +44,9 @@ tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.11.3
tox==4.11.4
# via -r requirements/ci.in
urllib3==2.1.0
# via requests
virtualenv==20.24.7
virtualenv==20.25.0
# via tox
5 changes: 0 additions & 5 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,3 @@ elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
django-simple-history==3.0.0

# virtualenv latest version requires platformdirs<4.0 which conflicts with tox>4.0 version
# This constraint can be removed once the issue
# https://github.com/pypa/virtualenv/issues/2666 gets resolved
platformdirs<4.0
29 changes: 14 additions & 15 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
asgiref==3.7.2
# via django
astroid==3.0.1
astroid==3.0.2
# via
# pylint
# pylint-celery
Expand Down Expand Up @@ -35,13 +35,13 @@ code-annotations==1.5.0
# via edx-lint
colorama==0.4.6
# via tox
cryptography==41.0.5
cryptography==41.0.7
# via secretstorage
diff-cover==8.0.1
# via -r requirements/dev.in
dill==0.3.7
# via pylint
distlib==0.3.7
distlib==0.3.8
# via virtualenv
django==3.2.23
# via
Expand All @@ -60,16 +60,16 @@ filelock==3.13.1
# via
# tox
# virtualenv
idna==3.4
idna==3.6
# via requests
importlib-metadata==6.8.0
importlib-metadata==7.0.0
# via
# build
# keyring
# twine
importlib-resources==6.1.1
# via keyring
isort==5.12.0
isort==5.13.1
# via
# -r requirements/quality.in
# pylint
Expand Down Expand Up @@ -97,22 +97,21 @@ mdurl==0.1.2
# via markdown-it-py
more-itertools==10.1.0
# via jaraco-classes
nh3==0.2.14
nh3==0.2.15
# via readme-renderer
packaging==23.2
# via
# build
# pyproject-api
# tox
path==16.7.1
path==16.9.0
# via edx-i18n-tools
pbr==6.0.0
# via stevedore
pkginfo==1.9.6
# via twine
platformdirs==3.11.0
platformdirs==4.1.0
# via
# -c requirements/common_constraints.txt
# pylint
# tox
# virtualenv
Expand All @@ -133,7 +132,7 @@ pygments==2.17.2
# diff-cover
# readme-renderer
# rich
pylint==3.0.2
pylint==3.0.3
# via
# edx-lint
# pylint-celery
Expand Down Expand Up @@ -190,13 +189,13 @@ tomli==2.0.1
# tox
tomlkit==0.12.3
# via pylint
tox==4.11.3
tox==4.11.4
# via -r requirements/dev.in
twine==4.0.2
# via
# -r requirements/dev.in
# -r requirements/quality.in
typing-extensions==4.8.0
typing-extensions==4.9.0
# via
# asgiref
# astroid
Expand All @@ -206,9 +205,9 @@ urllib3==2.1.0
# via
# requests
# twine
virtualenv==20.24.7
virtualenv==20.25.0
# via tox
wheel==0.41.3
wheel==0.42.0
# via -r requirements/dev.in
zipp==3.17.0
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ build==1.0.3
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==6.8.0
importlib-metadata==7.0.0
# via build
packaging==23.2
# via build
Expand All @@ -21,7 +21,7 @@ tomli==2.0.1
# build
# pip-tools
# pyproject-hooks
wheel==0.41.3
wheel==0.42.0
# via pip-tools
zipp==3.17.0
# via importlib-metadata
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
wheel==0.41.3
wheel==0.42.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
Expand Down
22 changes: 10 additions & 12 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
astroid==3.0.1
astroid==3.0.2
# via
# pylint
# pylint-celery
Expand All @@ -25,24 +25,24 @@ click-log==0.4.0
# via edx-lint
code-annotations==1.5.0
# via edx-lint
cryptography==41.0.5
cryptography==41.0.7
# via secretstorage
dill==0.3.7
# via pylint
docutils==0.20.1
# via readme-renderer
edx-lint==5.3.6
# via -r requirements/quality.in
idna==3.4
idna==3.6
# via requests
importlib-metadata==6.8.0
importlib-metadata==7.0.0
# via
# build
# keyring
# twine
importlib-resources==6.1.1
# via keyring
isort==5.12.0
isort==5.13.1
# via
# -r requirements/quality.in
# pylint
Expand All @@ -66,18 +66,16 @@ mdurl==0.1.2
# via markdown-it-py
more-itertools==10.1.0
# via jaraco-classes
nh3==0.2.14
nh3==0.2.15
# via readme-renderer
packaging==23.2
# via build
pbr==6.0.0
# via stevedore
pkginfo==1.9.6
# via twine
platformdirs==3.11.0
# via
# -c requirements/common_constraints.txt
# pylint
platformdirs==4.1.0
# via pylint
pycodestyle==2.11.1
# via -r requirements/quality.in
pycparser==2.21
Expand All @@ -88,7 +86,7 @@ pygments==2.17.2
# via
# readme-renderer
# rich
pylint==3.0.2
pylint==3.0.3
# via
# edx-lint
# pylint-celery
Expand Down Expand Up @@ -137,7 +135,7 @@ tomlkit==0.12.3
# via pylint
twine==4.0.2
# via -r requirements/quality.in
typing-extensions==4.8.0
typing-extensions==4.9.0
# via
# astroid
# pylint
Expand Down
2 changes: 1 addition & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ tomli==2.0.1
# via
# coverage
# pytest
typing-extensions==4.8.0
typing-extensions==4.9.0
# via asgiref

0 comments on commit f1bf91e

Please sign in to comment.