Skip to content

Commit

Permalink
Merge branch 'master' into salman/django-4.2-upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
salman2013 committed Jul 3, 2023
2 parents 7370b08 + 889c5d3 commit ba2db95
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 27 deletions.
11 changes: 5 additions & 6 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ backports-zoneinfo[tzdata]==0.2.1
# kombu
billiard==4.1.0
# via celery
celery==5.3.0
celery==5.3.1
# via
# -c requirements/constraints.txt
# event-tracking
Expand All @@ -40,7 +40,7 @@ click-didyoumean==0.3.0
# via celery
click-plugins==1.1.1
# via celery
click-repl==0.2.0
click-repl==0.3.0
# via celery
cryptography==41.0.1
# via pyjwt
Expand Down Expand Up @@ -104,7 +104,7 @@ edx-opaque-keys==2.3.0
# edx-when
edx-rest-api-client==5.5.2
# via -r requirements/base.in
edx-when==2.3.0
edx-when==2.4.0
# via -r requirements/base.in
event-tracking==2.1.0
# via -r requirements/base.in
Expand All @@ -114,13 +114,13 @@ idna==3.4
# via requests
jsonfield==3.1.0
# via -r requirements/base.in
kombu==5.3.0
kombu==5.3.1
# via celery
lxml==4.9.2
# via xblock
markupsafe==2.1.3
# via xblock
newrelic==8.8.0
newrelic==8.8.1
# via edx-django-utils
pbr==5.11.1
# via stevedore
Expand Down Expand Up @@ -170,7 +170,6 @@ semantic-version==2.10.0
# via edx-drf-extensions
six==1.16.0
# via
# click-repl
# edx-drf-extensions
# event-tracking
# fs
Expand Down
6 changes: 3 additions & 3 deletions requirements/celery50.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
amqp==5.1.1
billiard==4.1.0
celery==5.3.0
celery==5.3.1
click==8.1.3
click-didyoumean==0.3.0
click-repl==0.2.0
kombu==5.3.0
click-repl==0.3.0
kombu==5.3.1
prompt-toolkit==3.0.38
vine==5.0.0
6 changes: 3 additions & 3 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ filelock==3.12.2
# virtualenv
packaging==23.1
# via tox
platformdirs==3.5.3
platformdirs==3.8.0
# via virtualenv
pluggy==1.0.0
pluggy==1.2.0
# via tox
py==1.11.0
# via tox
Expand All @@ -31,5 +31,5 @@ tox==3.28.0
# tox-battery
tox-battery==0.6.1
# via -r requirements/ci.in
virtualenv==20.23.0
virtualenv==20.23.1
# via tox
5 changes: 0 additions & 5 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,3 @@ django-simple-history==3.0.0
# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
tox<4.0.0

# edx-sphinx-theme is not compatible with latest Sphinx==6.0.0 version
# Pinning Sphinx version unless the compatibility issue gets resolved
# For details, see issue https://github.com/openedx/edx-sphinx-theme/issues/197
sphinx<6.0.0
6 changes: 3 additions & 3 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ path-py==12.5.0
# via -r requirements/dev.in
pbr==5.11.1
# via stevedore
platformdirs==3.5.3
platformdirs==3.8.0
# via
# pylint
# virtualenv
pluggy==1.0.0
pluggy==1.2.0
# via
# diff-cover
# tox
Expand Down Expand Up @@ -163,7 +163,7 @@ typing-extensions==4.6.3
# pydantic
# pylint
# rich
virtualenv==20.23.0
virtualenv==20.23.1
# via tox
wheel==0.40.0
# via -r requirements/dev.in
Expand Down
2 changes: 1 addition & 1 deletion requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ mccabe==0.7.0
# via pylint
pbr==5.11.1
# via stevedore
platformdirs==3.5.3
platformdirs==3.8.0
# via pylint
pycodestyle==2.10.0
# via -r requirements/quality.in
Expand Down
11 changes: 5 additions & 6 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ edx-opaque-keys==2.3.0
# edx-when
edx-rest-api-client==5.5.2
# via -r requirements/base.in
edx-when==2.3.0
edx-when==2.4.0
# via -r requirements/base.in
event-tracking==2.1.0
# via -r requirements/base.in
Expand All @@ -126,7 +126,7 @@ httpretty==1.1.4
# via -r requirements/test.in
idna==3.4
# via requests
importlib-metadata==6.6.0
importlib-metadata==6.7.0
# via logilab-common
iniconfig==2.0.0
# via pytest
Expand All @@ -149,15 +149,15 @@ mock==5.0.2
# via -r requirements/test.in
mypy-extensions==1.0.0
# via logilab-common
newrelic==8.8.0
newrelic==8.8.1
# via edx-django-utils
packaging==23.1
# via pytest
path==16.6.0
# via edx-i18n-tools
pbr==5.11.1
# via stevedore
pluggy==1.0.0
pluggy==1.2.0
# via pytest
polib==1.2.0
# via edx-i18n-tools
Expand All @@ -180,7 +180,7 @@ pymongo==3.13.0
# event-tracking
pynacl==1.5.0
# via edx-django-utils
pytest==7.3.2
pytest==7.4.0
# via
# pytest-cov
# pytest-django
Expand Down Expand Up @@ -232,7 +232,6 @@ semantic-version==2.10.0
# via edx-drf-extensions
six==1.16.0
# via
# click-repl
# edx-drf-extensions
# event-tracking
# fs
Expand Down

0 comments on commit ba2db95

Please sign in to comment.