Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into salman/update-pytho…
Browse files Browse the repository at this point in the history
…n-version
  • Loading branch information
salman2013 committed Feb 20, 2024
2 parents f89137f + 293e258 commit 44051f9
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 31 deletions.
4 changes: 2 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ edx-opaque-keys[django]==2.5.1
# via openedx-events
edx-toggles==5.1.1
# via -r requirements/base.in
fastavro==1.9.3
fastavro==1.9.4
# via openedx-events
jinja2==3.1.3
# via code-annotations
markupsafe==2.1.5
# via jinja2
newrelic==9.6.0
# via edx-django-utils
openedx-events==9.5.0
openedx-events==9.5.1
# via -r requirements/base.in
pbr==6.0.0
# via stevedore
Expand Down
2 changes: 1 addition & 1 deletion requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.12.1
tox==4.13.0
# via -r requirements/ci.in
virtualenv==20.25.0
# via tox
13 changes: 6 additions & 7 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ colorama==0.4.6
coverage[toml]==7.4.1
# via
# -r requirements/quality.txt
# coverage
# pytest-cov
ddt==1.7.1
# via -r requirements/quality.txt
Expand Down Expand Up @@ -109,15 +108,14 @@ edx-lint==5.3.6
edx-opaque-keys[django]==2.5.1
# via
# -r requirements/quality.txt
# edx-opaque-keys
# openedx-events
edx-toggles==5.1.1
# via -r requirements/quality.txt
exceptiongroup==1.2.0
# via
# -r requirements/quality.txt
# pytest
fastavro==1.9.3
fastavro==1.9.4
# via
# -r requirements/quality.txt
# openedx-events
Expand Down Expand Up @@ -157,7 +155,7 @@ newrelic==9.6.0
# via
# -r requirements/quality.txt
# edx-django-utils
openedx-events==9.5.0
openedx-events==9.5.1
# via -r requirements/quality.txt
packaging==23.2
# via
Expand All @@ -174,7 +172,7 @@ pbr==6.0.0
# via
# -r requirements/quality.txt
# stevedore
pip-tools==7.3.0
pip-tools==7.4.0
# via -r requirements/pip-tools.txt
platformdirs==4.2.0
# via
Expand Down Expand Up @@ -242,7 +240,8 @@ pyproject-hooks==1.0.0
# via
# -r requirements/pip-tools.txt
# build
pytest==8.0.0
# pip-tools
pytest==8.0.1
# via
# -r requirements/quality.txt
# pytest-cov
Expand Down Expand Up @@ -307,7 +306,7 @@ tomlkit==0.12.3
# via
# -r requirements/quality.txt
# pylint
tox==4.12.1
tox==4.13.0
# via -r requirements/ci.txt
typing-extensions==4.9.0
# via
Expand Down
12 changes: 5 additions & 7 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@ code-annotations==1.6.0
coverage[toml]==7.4.1
# via
# -r requirements/test.txt
# coverage
# pytest-cov
cryptography==42.0.2
cryptography==42.0.3
# via secretstorage
ddt==1.7.1
# via -r requirements/test.txt
Expand Down Expand Up @@ -87,15 +86,14 @@ edx-django-utils==5.10.1
edx-opaque-keys[django]==2.5.1
# via
# -r requirements/test.txt
# edx-opaque-keys
# openedx-events
edx-toggles==5.1.1
# via -r requirements/test.txt
exceptiongroup==1.2.0
# via
# -r requirements/test.txt
# pytest
fastavro==1.9.3
fastavro==1.9.4
# via
# -r requirements/test.txt
# openedx-events
Expand Down Expand Up @@ -144,7 +142,7 @@ newrelic==9.6.0
# edx-django-utils
nh3==0.2.15
# via readme-renderer
openedx-events==9.5.0
openedx-events==9.5.1
# via -r requirements/test.txt
packaging==23.2
# via
Expand Down Expand Up @@ -190,7 +188,7 @@ pynacl==1.5.0
# edx-django-utils
pyproject-hooks==1.0.0
# via build
pytest==8.0.0
pytest==8.0.1
# via
# -r requirements/test.txt
# pytest-cov
Expand Down Expand Up @@ -284,7 +282,7 @@ typing-extensions==4.9.0
# edx-opaque-keys
# pydata-sphinx-theme
# rich
urllib3==2.2.0
urllib3==2.2.1
# via
# requests
# twine
Expand Down
6 changes: 4 additions & 2 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ importlib-metadata==7.0.1
# via build
packaging==23.2
# via build
pip-tools==7.3.0
pip-tools==7.4.0
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
# via build
# via
# build
# pip-tools
tomli==2.0.1
# via
# build
Expand Down
8 changes: 3 additions & 5 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ code-annotations==1.6.0
coverage[toml]==7.4.1
# via
# -r requirements/test.txt
# coverage
# pytest-cov
ddt==1.7.1
# via -r requirements/test.txt
Expand Down Expand Up @@ -76,15 +75,14 @@ edx-lint==5.3.6
edx-opaque-keys[django]==2.5.1
# via
# -r requirements/test.txt
# edx-opaque-keys
# openedx-events
edx-toggles==5.1.1
# via -r requirements/test.txt
exceptiongroup==1.2.0
# via
# -r requirements/test.txt
# pytest
fastavro==1.9.3
fastavro==1.9.4
# via
# -r requirements/test.txt
# openedx-events
Expand All @@ -110,7 +108,7 @@ newrelic==9.6.0
# via
# -r requirements/test.txt
# edx-django-utils
openedx-events==9.5.0
openedx-events==9.5.1
# via -r requirements/test.txt
packaging==23.2
# via
Expand Down Expand Up @@ -160,7 +158,7 @@ pynacl==1.5.0
# via
# -r requirements/test.txt
# edx-django-utils
pytest==8.0.0
pytest==8.0.1
# via
# -r requirements/test.txt
# pytest-cov
Expand Down
11 changes: 4 additions & 7 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ code-annotations==1.6.0
# -r requirements/test.in
# edx-toggles
coverage[toml]==7.4.1
# via
# coverage
# pytest-cov
# via pytest-cov
ddt==1.7.1
# via -r requirements/test.in
# via
Expand Down Expand Up @@ -62,13 +60,12 @@ edx-django-utils==5.10.1
edx-opaque-keys[django]==2.5.1
# via
# -r requirements/base.txt
# edx-opaque-keys
# openedx-events
edx-toggles==5.1.1
# via -r requirements/base.txt
exceptiongroup==1.2.0
# via pytest
fastavro==1.9.3
fastavro==1.9.4
# via
# -r requirements/base.txt
# openedx-events
Expand All @@ -86,7 +83,7 @@ newrelic==9.6.0
# via
# -r requirements/base.txt
# edx-django-utils
openedx-events==9.5.0
openedx-events==9.5.1
# via -r requirements/base.txt
packaging==23.2
# via pytest
Expand All @@ -112,7 +109,7 @@ pynacl==1.5.0
# via
# -r requirements/base.txt
# edx-django-utils
pytest==8.0.0
pytest==8.0.1
# via
# pytest-cov
# pytest-django
Expand Down

0 comments on commit 44051f9

Please sign in to comment.