Skip to content

Commit

Permalink
Merge pull request #11 from edx/repo-tools/upgrade-python-requirement…
Browse files Browse the repository at this point in the history
…s-f11455e

chore: Upgrade Python requirements
  • Loading branch information
ilee2u authored Aug 21, 2024
2 parents f11455e + 9ecac8f commit 52cf403
Show file tree
Hide file tree
Showing 13 changed files with 76 additions and 114 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
with:
fetch-depth: 0
- name: start container
run: docker-compose -f .github/docker-compose-github.yml up -d
run: docker compose -f .github/docker-compose-github.yml up -d
- name: setup analytics-api
run: |
docker exec analytics_api bash -c "
Expand Down
24 changes: 10 additions & 14 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ backports-zoneinfo==0.2.1
# djangorestframework
certifi==2024.7.4
# via requests
cffi==1.16.0
cffi==1.17.0
# via
# cryptography
# pynacl
Expand All @@ -36,7 +36,7 @@ defusedxml==0.8.0rc2
# via
# python3-openid
# social-auth-core
django==4.2.14
django==4.2.15
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
Expand Down Expand Up @@ -107,15 +107,15 @@ edx-ccx-keys==1.3.0
# via -r requirements/base.in
edx-django-release-util==1.4.0
# via -r requirements/base.in
edx-django-utils==5.14.2
edx-django-utils==5.15.0
# via
# -r requirements/base.in
# edx-drf-extensions
# edx-rest-api-client
# edx-toggles
edx-drf-extensions==10.3.0
# via -r requirements/base.in
edx-i18n-tools==1.6.1
edx-i18n-tools==1.6.2
# via -r requirements/base.in
edx-opaque-keys==2.10.0
# via
Expand All @@ -134,21 +134,17 @@ libsass==0.23.0
# via -r requirements/base.in
logutils==0.3.5
# via -r requirements/base.in
lxml[html-clean,html_clean]==5.2.2
# via
# edx-i18n-tools
# lxml-html-clean
lxml-html-clean==0.2.0
# via lxml
lxml==5.3.0
# via edx-i18n-tools
markupsafe==2.1.5
# via jinja2
newrelic==9.12.0
newrelic==9.13.0
# via edx-django-utils
oauthlib==3.2.2
# via
# requests-oauthlib
# social-auth-core
path==17.0.0
path==16.16.0
# via
# edx-i18n-tools
# path-py
Expand All @@ -162,7 +158,7 @@ psutil==6.0.0
# via edx-django-utils
pycparser==2.22
# via cffi
pyjwt[crypto]==2.8.0
pyjwt[crypto]==2.9.0
# via
# drf-jwt
# edx-auth-backends
Expand All @@ -181,7 +177,7 @@ python3-openid==3.2.0
# via social-auth-core
pytz==2024.1
# via -r requirements/base.in
pyyaml==6.0.1
pyyaml==6.0.2
# via
# code-annotations
# edx-django-release-util
Expand Down
9 changes: 0 additions & 9 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,6 @@ 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

# opentelemetry requires version 6.x at the moment:
# https://github.com/open-telemetry/opentelemetry-python/issues/3570
# Normally this could be added as a constraint in edx-django-utils, where we're
# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
# that uses version 7.x, and then there's no undoing that when compiling base.txt.
# So we need to pin it globally, for now.
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
importlib-metadata<7

# Cause: https://github.com/openedx/event-tracking/pull/290
# event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform.
# We will pin event-tracking to do not break existing installations
Expand Down
2 changes: 1 addition & 1 deletion requirements/django.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
django==4.2.14
django==4.2.15
35 changes: 14 additions & 21 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ asgiref==3.8.1
# -r requirements/base.txt
# django
# django-countries
babel==2.15.0
babel==2.16.0
# via
# pydata-sphinx-theme
# sphinx
Expand All @@ -30,7 +30,7 @@ certifi==2024.7.4
# via
# -r requirements/base.txt
# requests
cffi==1.16.0
cffi==1.17.0
# via
# -r requirements/base.txt
# cryptography
Expand Down Expand Up @@ -58,7 +58,7 @@ defusedxml==0.8.0rc2
# -r requirements/base.txt
# python3-openid
# social-auth-core
django==4.2.14
django==4.2.15
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
Expand Down Expand Up @@ -138,15 +138,15 @@ edx-ccx-keys==1.3.0
# via -r requirements/base.txt
edx-django-release-util==1.4.0
# via -r requirements/base.txt
edx-django-utils==5.14.2
edx-django-utils==5.15.0
# via
# -r requirements/base.txt
# edx-drf-extensions
# edx-rest-api-client
# edx-toggles
edx-drf-extensions==10.3.0
# via -r requirements/base.txt
edx-i18n-tools==1.6.1
edx-i18n-tools==1.6.2
# via -r requirements/base.txt
edx-opaque-keys==2.10.0
# via
Expand All @@ -163,10 +163,8 @@ idna==3.7
# requests
imagesize==1.4.1
# via sphinx
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# sphinx
importlib-metadata==8.3.0
# via sphinx
jinja2==3.1.4
# via
# -r requirements/base.txt
Expand All @@ -176,20 +174,15 @@ libsass==0.23.0
# via -r requirements/base.txt
logutils==0.3.5
# via -r requirements/base.txt
lxml[html-clean]==5.2.2
lxml==5.3.0
# via
# -r requirements/base.txt
# edx-i18n-tools
# lxml-html-clean
lxml-html-clean==0.2.0
# via
# -r requirements/base.txt
# lxml
markupsafe==2.1.5
# via
# -r requirements/base.txt
# jinja2
newrelic==9.12.0
newrelic==9.13.0
# via
# -r requirements/base.txt
# edx-django-utils
Expand All @@ -202,7 +195,7 @@ packaging==24.1
# via
# pydata-sphinx-theme
# sphinx
path==17.0.0
path==16.16.0
# via
# -r requirements/base.txt
# edx-i18n-tools
Expand Down Expand Up @@ -232,7 +225,7 @@ pygments==2.18.0
# accessible-pygments
# pydata-sphinx-theme
# sphinx
pyjwt[crypto]==2.8.0
pyjwt[crypto]==2.9.0
# via
# -r requirements/base.txt
# drf-jwt
Expand Down Expand Up @@ -260,7 +253,7 @@ pytz==2024.1
# via
# -r requirements/base.txt
# babel
pyyaml==6.0.1
pyyaml==6.0.2
# via
# -r requirements/base.txt
# code-annotations
Expand Down Expand Up @@ -305,7 +298,7 @@ social-auth-core==4.5.4
# -r requirements/base.txt
# edx-auth-backends
# social-auth-app-django
soupsieve==2.5
soupsieve==2.6
# via beautifulsoup4
sphinx==6.2.1
# via
Expand Down Expand Up @@ -352,7 +345,7 @@ urllib3==1.26.19
# -c requirements/constraints.txt
# -r requirements/base.txt
# requests
zipp==3.19.2
zipp==3.20.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
Expand Down
6 changes: 3 additions & 3 deletions requirements/github.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
cachetools==5.4.0
cachetools==5.5.0
# via
# -r requirements/tox.txt
# tox
Expand All @@ -16,7 +16,7 @@ colorama==0.4.6
# via
# -r requirements/tox.txt
# tox
coverage==7.6.0
coverage==7.6.1
# via -r requirements/github.in
distlib==0.3.8
# via
Expand Down Expand Up @@ -50,7 +50,7 @@ tomli==2.0.1
# -r requirements/tox.txt
# pyproject-api
# tox
tox==4.16.0
tox==4.18.0
# via -r requirements/tox.txt
virtualenv==20.26.3
# via
Expand Down
Loading

0 comments on commit 52cf403

Please sign in to comment.