From 46247068aa8f9f5ac2f383d6fd249cd20d307b4e Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sun, 11 Aug 2024 20:02:18 -0400 Subject: [PATCH 1/3] chore: Upgrade Python requirements --- requirements/base.txt | 16 ++++++++-------- requirements/common_constraints.txt | 9 --------- requirements/dev.txt | 18 +++++++++--------- requirements/pip-tools.txt | 2 +- requirements/pip.txt | 4 ++-- 5 files changed, 20 insertions(+), 29 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 3bc6f4adea..ff1e292b31 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -6,9 +6,9 @@ # accessible-pygments==0.0.5 # via pydata-sphinx-theme -alabaster==0.7.16 +alabaster==1.0.0 # via sphinx -babel==2.15.0 +babel==2.16.0 # via # pydata-sphinx-theme # sphinx @@ -50,7 +50,7 @@ snowballstemmer==2.2.0 # via sphinx soupsieve==2.5 # via beautifulsoup4 -sphinx==7.4.7 +sphinx==8.0.2 # via # -r base.in # pydata-sphinx-theme @@ -63,17 +63,17 @@ sphinx-intl==2.2.0 # via -r base.in sphinx-reredirects==0.1.5 # via -r base.in -sphinxcontrib-applehelp==1.0.8 +sphinxcontrib-applehelp==2.0.0 # via sphinx -sphinxcontrib-devhelp==1.0.6 +sphinxcontrib-devhelp==2.0.0 # via sphinx -sphinxcontrib-htmlhelp==2.0.6 +sphinxcontrib-htmlhelp==2.1.0 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.8 +sphinxcontrib-qthelp==2.0.0 # via sphinx -sphinxcontrib-serializinghtml==1.1.10 +sphinxcontrib-serializinghtml==2.0.0 # via sphinx typing-extensions==4.12.2 # via pydata-sphinx-theme diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index b957ec4cd3..31879f79e8 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -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 diff --git a/requirements/dev.txt b/requirements/dev.txt index f1229bf48c..20b2db42a2 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -8,11 +8,11 @@ accessible-pygments==0.0.5 # via # -r base.txt # pydata-sphinx-theme -alabaster==0.7.16 +alabaster==1.0.0 # via # -r base.txt # sphinx -babel==2.15.0 +babel==2.16.0 # via # -r base.txt # pydata-sphinx-theme @@ -92,7 +92,7 @@ soupsieve==2.5 # via # -r base.txt # beautifulsoup4 -sphinx==7.4.7 +sphinx==8.0.2 # via # -r base.txt # pydata-sphinx-theme @@ -105,15 +105,15 @@ sphinx-intl==2.2.0 # via -r base.txt sphinx-reredirects==0.1.5 # via -r base.txt -sphinxcontrib-applehelp==1.0.8 +sphinxcontrib-applehelp==2.0.0 # via # -r base.txt # sphinx -sphinxcontrib-devhelp==1.0.6 +sphinxcontrib-devhelp==2.0.0 # via # -r base.txt # sphinx -sphinxcontrib-htmlhelp==2.0.6 +sphinxcontrib-htmlhelp==2.1.0 # via # -r base.txt # sphinx @@ -121,11 +121,11 @@ sphinxcontrib-jsmath==1.0.1 # via # -r base.txt # sphinx -sphinxcontrib-qthelp==1.0.8 +sphinxcontrib-qthelp==2.0.0 # via # -r base.txt # sphinx -sphinxcontrib-serializinghtml==1.1.10 +sphinxcontrib-serializinghtml==2.0.0 # via # -r base.txt # sphinx @@ -137,7 +137,7 @@ urllib3==2.2.2 # via # -r base.txt # requests -wheel==0.43.0 +wheel==0.44.0 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index e499562275..61ed0330b2 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -16,7 +16,7 @@ pyproject-hooks==1.1.0 # via # build # pip-tools -wheel==0.43.0 +wheel==0.44.0 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/pip.txt b/requirements/pip.txt index 61054b1563..e902563fde 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.43.0 +wheel==0.44.0 # via -r pip.in # The following packages are considered to be unsafe in a requirements file: pip==24.2 # via -r pip.in -setuptools==71.1.0 +setuptools==72.1.0 # via -r pip.in From 48f06ce36ca1fed15c7f2c2b922b96ed9850935b Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Wed, 14 Aug 2024 10:22:02 -0400 Subject: [PATCH 2/3] build: Constrain sphinx until sphinx-contrib-images is updated. --- requirements/constraints.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index a51cb08b12..c8ba4d3830 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -10,3 +10,9 @@ # Common constraints for edx repos -c common_constraints.txt + +# This is needed until https://github.com/sphinx-contrib/images/issues/40 is closed. +# The current latest version of sphinx-contrib-images is not compatible with Sphinx 8.0.0 +# and doesn't have proper constraining so we need to hold back sphinx here until the above +# issue is closed. +sphinx<8.0.0 From 7835cd0aa6cbe68bcc08e362999c7f6802dd59f7 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Wed, 14 Aug 2024 10:22:56 -0400 Subject: [PATCH 3/3] chore: Re-run `make upgrade` --- requirements/base.txt | 9 +++++---- requirements/dev.txt | 8 ++++---- requirements/pip-tools.txt | 2 +- requirements/pip.txt | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index ff1e292b31..d5daa1b9fc 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,12 +1,12 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade # accessible-pygments==0.0.5 # via pydata-sphinx-theme -alabaster==1.0.0 +alabaster==0.7.16 # via sphinx babel==2.16.0 # via @@ -48,10 +48,11 @@ requests==2.32.3 # via sphinx snowballstemmer==2.2.0 # via sphinx -soupsieve==2.5 +soupsieve==2.6 # via beautifulsoup4 -sphinx==8.0.2 +sphinx==7.4.7 # via + # -c constraints.txt # -r base.in # pydata-sphinx-theme # sphinx-book-theme diff --git a/requirements/dev.txt b/requirements/dev.txt index 20b2db42a2..b332f158ec 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -8,7 +8,7 @@ accessible-pygments==0.0.5 # via # -r base.txt # pydata-sphinx-theme -alabaster==1.0.0 +alabaster==0.7.16 # via # -r base.txt # sphinx @@ -88,11 +88,11 @@ snowballstemmer==2.2.0 # via # -r base.txt # sphinx -soupsieve==2.5 +soupsieve==2.6 # via # -r base.txt # beautifulsoup4 -sphinx==8.0.2 +sphinx==7.4.7 # via # -r base.txt # pydata-sphinx-theme diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 61ed0330b2..dc554ece75 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade diff --git a/requirements/pip.txt b/requirements/pip.txt index e902563fde..919406f980 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.12 # by the following command: # # make upgrade @@ -10,5 +10,5 @@ wheel==0.44.0 # The following packages are considered to be unsafe in a requirements file: pip==24.2 # via -r pip.in -setuptools==72.1.0 +setuptools==72.2.0 # via -r pip.in