Skip to content

Commit

Permalink
Merge pull request #113 from openedx/repo-tools/upgrade-python-requir…
Browse files Browse the repository at this point in the history
…ements-c5c9fa1

chore: Upgrade Python requirements
  • Loading branch information
iamsobanjaved authored Aug 17, 2024
2 parents c5c9fa1 + d665d06 commit 09a7af1
Show file tree
Hide file tree
Showing 8 changed files with 96 additions and 145 deletions.
10 changes: 6 additions & 4 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
edx-opaque-keys==2.5.1
dnspython==2.6.1
# via pymongo
edx-opaque-keys==2.10.0
# via -r requirements/base.in
pbr==6.0.0
# via stevedore
pymongo==3.13.0
pymongo==4.8.0
# via edx-opaque-keys
six==1.16.0
# via -r requirements/base.in
stevedore==5.2.0
# via edx-opaque-keys
typing-extensions==4.10.0
typing-extensions==4.12.2
# via edx-opaque-keys
22 changes: 9 additions & 13 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,38 +1,34 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
cachetools==5.3.3
cachetools==5.4.0
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.8
# via virtualenv
filelock==3.13.1
filelock==3.15.4
# via
# tox
# virtualenv
packaging==24.0
packaging==24.1
# via
# pyproject-api
# tox
platformdirs==4.2.0
platformdirs==4.2.2
# via
# tox
# virtualenv
pluggy==1.4.0
pluggy==1.5.0
# via tox
pyproject-api==1.6.1
pyproject-api==1.7.1
# via tox
tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.14.1
tox==4.17.1
# via -r requirements/ci.in
virtualenv==20.25.1
virtualenv==20.26.3
# via tox
15 changes: 7 additions & 8 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,15 @@ Django<5.0

# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
# See https://github.com/openedx/edx-platform/issues/35126 for more info
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
# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586
# has been resolved and edx-platform is running with pymongo>=4.4.0
event-tracking<2.4.1
81 changes: 29 additions & 52 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
astroid==3.1.0
astroid==3.2.4
# via
# -r requirements/test.txt
# pylint
# pylint-celery
build==1.1.1
build==1.2.1
# via
# -r requirements/pip-tools.txt
# pip-tools
cachetools==5.3.3
cachetools==5.4.0
# via
# -r requirements/ci.txt
# -r requirements/test.txt
Expand All @@ -35,7 +35,7 @@ click-log==0.4.0
# via
# -r requirements/test.txt
# edx-lint
code-annotations==1.7.0
code-annotations==1.8.0
# via
# -r requirements/test.txt
# edx-lint
Expand All @@ -44,7 +44,7 @@ colorama==0.4.6
# -r requirements/ci.txt
# -r requirements/test.txt
# tox
coverage==7.4.4
coverage==7.6.1
# via -r requirements/test.txt
ddt==1.7.2
# via -r requirements/test.txt
Expand All @@ -57,25 +57,20 @@ distlib==0.3.8
# -r requirements/ci.txt
# -r requirements/test.txt
# virtualenv
edx-lint==5.3.6
# via -r requirements/test.txt
edx-opaque-keys==2.5.1
# via -r requirements/test.txt
exceptiongroup==1.2.0
dnspython==2.6.1
# via
# -r requirements/test.txt
# pytest
filelock==3.13.1
# pymongo
edx-lint==5.3.7
# via -r requirements/test.txt
edx-opaque-keys==2.10.0
# via -r requirements/test.txt
filelock==3.15.4
# via
# -r requirements/ci.txt
# -r requirements/test.txt
# tox
# virtualenv
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# -r requirements/pip-tools.txt
# build
iniconfig==2.0.0
# via
# -r requirements/test.txt
Expand All @@ -84,7 +79,7 @@ isort==5.13.2
# via
# -r requirements/test.txt
# pylint
jinja2==3.1.3
jinja2==3.1.4
# via
# -r requirements/test.txt
# code-annotations
Expand All @@ -100,7 +95,7 @@ mccabe==0.7.0
# pylint
mock==5.1.0
# via -r requirements/test.txt
packaging==24.0
packaging==24.1
# via
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
Expand All @@ -115,22 +110,22 @@ pbr==6.0.0
# stevedore
pip-tools==7.4.1
# via -r requirements/pip-tools.txt
platformdirs==4.2.0
platformdirs==4.2.2
# via
# -r requirements/ci.txt
# -r requirements/test.txt
# pylint
# tox
# virtualenv
pluggy==1.4.0
pluggy==1.5.0
# via
# -r requirements/ci.txt
# -r requirements/test.txt
# pytest
# tox
pycodestyle==2.11.1
pycodestyle==2.12.1
# via -r requirements/test.txt
pylint==3.1.0
pylint==3.2.6
# via
# -r requirements/test.txt
# edx-lint
Expand All @@ -150,27 +145,27 @@ pylint-plugin-utils==0.8.2
# -r requirements/test.txt
# pylint-celery
# pylint-django
pymongo==3.13.0
pymongo==4.8.0
# via
# -r requirements/test.txt
# edx-opaque-keys
pyproject-api==1.6.1
pyproject-api==1.7.1
# via
# -r requirements/ci.txt
# -r requirements/test.txt
# tox
pyproject-hooks==1.0.0
pyproject-hooks==1.1.0
# via
# -r requirements/pip-tools.txt
# build
# pip-tools
pytest==8.1.1
pytest==8.3.2
# via -r requirements/test.txt
python-slugify==8.0.4
# via
# -r requirements/test.txt
# code-annotations
pyyaml==6.0.1
pyyaml==6.0.2
# via
# -r requirements/test.txt
# code-annotations
Expand All @@ -187,45 +182,27 @@ text-unidecode==1.3
# via
# -r requirements/test.txt
# python-slugify
tomli==2.0.1
# via
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
# -r requirements/test.txt
# build
# pip-tools
# pylint
# pyproject-api
# pyproject-hooks
# pytest
# tox
tomlkit==0.12.4
tomlkit==0.13.0
# via
# -r requirements/test.txt
# pylint
tox==4.14.1
tox==4.17.1
# via
# -r requirements/ci.txt
# -r requirements/test.txt
typing-extensions==4.10.0
typing-extensions==4.12.2
# via
# -r requirements/test.txt
# astroid
# edx-opaque-keys
# pylint
virtualenv==20.25.1
virtualenv==20.26.3
# via
# -r requirements/ci.txt
# -r requirements/test.txt
# tox
wheel==0.43.0
wheel==0.44.0
# via
# -r requirements/pip-tools.txt
# pip-tools
zipp==3.18.1
# via
# -r requirements/pip-tools.txt
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
21 changes: 5 additions & 16 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
@@ -1,34 +1,23 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
build==1.1.1
build==1.2.1
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# build
packaging==24.0
packaging==24.1
# via build
pip-tools==7.4.1
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
# via
# build
# pip-tools
tomli==2.0.1
pyproject-hooks==1.1.0
# via
# build
# pip-tools
# pyproject-hooks
wheel==0.43.0
wheel==0.44.0
# via pip-tools
zipp==3.18.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
8 changes: 4 additions & 4 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
wheel==0.43.0
wheel==0.44.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==24.0
pip==24.2
# via -r requirements/pip.in
setuptools==69.2.0
setuptools==72.1.0
# via -r requirements/pip.in
Loading

0 comments on commit 09a7af1

Please sign in to comment.