From 8ffd22ee8e3eae2dbf6c15fe024011c32b9973d3 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Sun, 28 Jul 2024 20:02:09 -0400 Subject: [PATCH 1/3] chore: Upgrade Python requirements --- requirements/base.txt | 34 +++++++++-------------- requirements/common_constraints.txt | 8 ++++++ requirements/dev.txt | 43 +++++++++-------------------- requirements/pip-tools.txt | 12 +------- requirements/pip.txt | 6 ++-- 5 files changed, 38 insertions(+), 65 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 1116676de2..3bc6f4adea 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,12 +1,12 @@ # -# 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 # -accessible-pygments==0.0.4 +accessible-pygments==0.0.5 # via pydata-sphinx-theme -alabaster==0.7.13 +alabaster==0.7.16 # via sphinx babel==2.15.0 # via @@ -21,7 +21,7 @@ charset-normalizer==3.3.2 # via requests click==8.1.7 # via sphinx-intl -docutils==0.19 +docutils==0.21.2 # via # pydata-sphinx-theme # sphinx @@ -29,10 +29,6 @@ idna==3.7 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==6.11.0 - # via - # -c common_constraints.txt - # sphinx jinja2==3.1.4 # via sphinx markupsafe==2.1.5 @@ -41,52 +37,48 @@ packaging==24.1 # via # pydata-sphinx-theme # sphinx -pydata-sphinx-theme==0.14.4 +pydata-sphinx-theme==0.15.4 # via sphinx-book-theme pygments==2.18.0 # via # accessible-pygments # pydata-sphinx-theme # sphinx -pytz==2024.1 - # via babel requests==2.32.3 # via sphinx snowballstemmer==2.2.0 # via sphinx soupsieve==2.5 # via beautifulsoup4 -sphinx==6.2.1 +sphinx==7.4.7 # via # -r base.in # pydata-sphinx-theme # sphinx-book-theme # sphinx-intl # sphinx-reredirects -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.3 # via -r base.in sphinx-intl==2.2.0 # via -r base.in -sphinx-reredirects==0.1.4 +sphinx-reredirects==0.1.5 # via -r base.in -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==1.0.8 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==1.0.6 # via sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.0.6 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==1.0.8 # via sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==1.1.10 # via sphinx typing-extensions==4.12.2 # via pydata-sphinx-theme urllib3==2.2.2 # via requests -zipp==3.19.2 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index e3bf8eaecd..b957ec4cd3 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -17,6 +17,7 @@ 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 @@ -30,3 +31,10 @@ django-simple-history==3.0.0 # 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 diff --git a/requirements/dev.txt b/requirements/dev.txt index ac32570c53..f1229bf48c 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -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 # -accessible-pygments==0.0.4 +accessible-pygments==0.0.5 # via # -r base.txt # pydata-sphinx-theme -alabaster==0.7.13 +alabaster==0.7.16 # via # -r base.txt # sphinx @@ -37,7 +37,7 @@ click==8.1.7 # -r base.txt # pip-tools # sphinx-intl -docutils==0.19 +docutils==0.21.2 # via # -r base.txt # pydata-sphinx-theme @@ -50,11 +50,6 @@ imagesize==1.4.1 # via # -r base.txt # sphinx -importlib-metadata==6.11.0 - # via - # -r base.txt - # build - # sphinx jinja2==3.1.4 # via # -r base.txt @@ -71,7 +66,7 @@ packaging==24.1 # sphinx pip-tools==7.4.1 # via -r dev.in -pydata-sphinx-theme==0.14.4 +pydata-sphinx-theme==0.15.4 # via # -r base.txt # sphinx-book-theme @@ -85,10 +80,6 @@ pyproject-hooks==1.1.0 # via # build # pip-tools -pytz==2024.1 - # via - # -r base.txt - # babel requests==2.32.3 # via # -r base.txt @@ -101,28 +92,28 @@ soupsieve==2.5 # via # -r base.txt # beautifulsoup4 -sphinx==6.2.1 +sphinx==7.4.7 # via # -r base.txt # pydata-sphinx-theme # sphinx-book-theme # sphinx-intl # sphinx-reredirects -sphinx-book-theme==1.0.1 +sphinx-book-theme==1.1.3 # via -r base.txt sphinx-intl==2.2.0 # via -r base.txt -sphinx-reredirects==0.1.4 +sphinx-reredirects==0.1.5 # via -r base.txt -sphinxcontrib-applehelp==1.0.4 +sphinxcontrib-applehelp==1.0.8 # via # -r base.txt # sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==1.0.6 # via # -r base.txt # sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.0.6 # via # -r base.txt # sphinx @@ -130,18 +121,14 @@ sphinxcontrib-jsmath==1.0.1 # via # -r base.txt # sphinx -sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-qthelp==1.0.8 # via # -r base.txt # sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==1.1.10 # via # -r base.txt # sphinx -tomli==2.0.1 - # via - # build - # pip-tools typing-extensions==4.12.2 # via # -r base.txt @@ -152,10 +139,6 @@ urllib3==2.2.2 # requests wheel==0.43.0 # via pip-tools -zipp==3.19.2 - # via - # -r base.txt - # importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 6f1ed05adb..e499562275 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.8 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # make upgrade @@ -8,10 +8,6 @@ build==1.2.1 # via pip-tools click==8.1.7 # via pip-tools -importlib-metadata==6.11.0 - # via - # -c common_constraints.txt - # build packaging==24.1 # via build pip-tools==7.4.1 @@ -20,14 +16,8 @@ pyproject-hooks==1.1.0 # via # build # pip-tools -tomli==2.0.1 - # via - # build - # pip-tools wheel==0.43.0 # via pip-tools -zipp==3.19.2 - # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/pip.txt b/requirements/pip.txt index 4c5338f254..61054b1563 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,5 +1,5 @@ # -# 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 @@ -8,7 +8,7 @@ wheel==0.43.0 # via -r pip.in # The following packages are considered to be unsafe in a requirements file: -pip==24.1.2 +pip==24.2 # via -r pip.in -setuptools==70.3.0 +setuptools==71.1.0 # via -r pip.in From 10ff190db1b73c17a13e178a0377857e7b262cb6 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Thu, 1 Aug 2024 13:22:11 -0400 Subject: [PATCH 2/3] build: Update to build with python 3.12 --- .github/workflows/build.yml | 2 +- en_us/contribute/.readthedocs.yaml | 2 +- en_us/course_authors/.readthedocs.yaml | 2 +- en_us/course_catalog_api_user_guide/.readthedocs.yaml | 2 +- en_us/data/.readthedocs.yaml | 2 +- en_us/developers/.readthedocs.yaml | 2 +- en_us/discovery_api/.readthedocs.yaml | 2 +- en_us/edx_style_guide/.readthedocs.yaml | 2 +- en_us/enterprise_api/.readthedocs.yaml | 2 +- en_us/install_operations/.readthedocs.yaml | 2 +- en_us/landing_page/.readthedocs.yaml | 2 +- en_us/olx/.readthedocs.yaml | 2 +- en_us/open_edx_course_authors/.readthedocs.yaml | 2 +- en_us/open_edx_release_notes/.readthedocs.yaml | 2 +- en_us/open_edx_students/.readthedocs.yaml | 2 +- en_us/shared/.readthedocs.yaml | 2 +- en_us/students_redirect/.readthedocs.yaml | 2 +- en_us/xblock-tutorial/.readthedocs.yaml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 25f797eae9..a182b3605c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: - name: "Set up Python" uses: "actions/setup-python@v2" with: - python-version: "3.8" + python-version: "3.12" - name: "Install Graphviz" uses: "kamiazya/setup-graphviz@v1" diff --git a/en_us/contribute/.readthedocs.yaml b/en_us/contribute/.readthedocs.yaml index f67600e964..194a11adb0 100644 --- a/en_us/contribute/.readthedocs.yaml +++ b/en_us/contribute/.readthedocs.yaml @@ -13,7 +13,7 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.12" python: install: diff --git a/en_us/course_authors/.readthedocs.yaml b/en_us/course_authors/.readthedocs.yaml index 8c314ce47a..e97fea6d94 100644 --- a/en_us/course_authors/.readthedocs.yaml +++ b/en_us/course_authors/.readthedocs.yaml @@ -13,7 +13,7 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.12" python: install: diff --git a/en_us/course_catalog_api_user_guide/.readthedocs.yaml b/en_us/course_catalog_api_user_guide/.readthedocs.yaml index 16f4f65e83..837b41cf81 100644 --- a/en_us/course_catalog_api_user_guide/.readthedocs.yaml +++ b/en_us/course_catalog_api_user_guide/.readthedocs.yaml @@ -13,7 +13,7 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.12" python: install: diff --git a/en_us/data/.readthedocs.yaml b/en_us/data/.readthedocs.yaml index 4522abd65b..a064ab3d3a 100644 --- a/en_us/data/.readthedocs.yaml +++ b/en_us/data/.readthedocs.yaml @@ -13,7 +13,7 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.12" python: install: diff --git a/en_us/developers/.readthedocs.yaml b/en_us/developers/.readthedocs.yaml index 6d2f147b3e..9739be1ea6 100644 --- a/en_us/developers/.readthedocs.yaml +++ b/en_us/developers/.readthedocs.yaml @@ -13,7 +13,7 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.12" python: install: diff --git a/en_us/discovery_api/.readthedocs.yaml b/en_us/discovery_api/.readthedocs.yaml index 0fb3beef79..034332b196 100644 --- a/en_us/discovery_api/.readthedocs.yaml +++ b/en_us/discovery_api/.readthedocs.yaml @@ -13,7 +13,7 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.12" python: install: diff --git a/en_us/edx_style_guide/.readthedocs.yaml b/en_us/edx_style_guide/.readthedocs.yaml index c6c363f0c7..b41ca9f8a4 100644 --- a/en_us/edx_style_guide/.readthedocs.yaml +++ b/en_us/edx_style_guide/.readthedocs.yaml @@ -13,7 +13,7 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.12" python: install: diff --git a/en_us/enterprise_api/.readthedocs.yaml b/en_us/enterprise_api/.readthedocs.yaml index 8d3a586496..8192d84910 100644 --- a/en_us/enterprise_api/.readthedocs.yaml +++ b/en_us/enterprise_api/.readthedocs.yaml @@ -13,7 +13,7 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.12" python: install: diff --git a/en_us/install_operations/.readthedocs.yaml b/en_us/install_operations/.readthedocs.yaml index 3062c1690e..f63ddc3b1e 100644 --- a/en_us/install_operations/.readthedocs.yaml +++ b/en_us/install_operations/.readthedocs.yaml @@ -13,7 +13,7 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.12" python: install: diff --git a/en_us/landing_page/.readthedocs.yaml b/en_us/landing_page/.readthedocs.yaml index 61491bc74a..f6acaae3da 100644 --- a/en_us/landing_page/.readthedocs.yaml +++ b/en_us/landing_page/.readthedocs.yaml @@ -13,7 +13,7 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.12" python: install: diff --git a/en_us/olx/.readthedocs.yaml b/en_us/olx/.readthedocs.yaml index ef360999e2..96afb587c3 100644 --- a/en_us/olx/.readthedocs.yaml +++ b/en_us/olx/.readthedocs.yaml @@ -13,7 +13,7 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.12" python: install: diff --git a/en_us/open_edx_course_authors/.readthedocs.yaml b/en_us/open_edx_course_authors/.readthedocs.yaml index ab479238cd..c868fae331 100644 --- a/en_us/open_edx_course_authors/.readthedocs.yaml +++ b/en_us/open_edx_course_authors/.readthedocs.yaml @@ -13,7 +13,7 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.12" python: install: diff --git a/en_us/open_edx_release_notes/.readthedocs.yaml b/en_us/open_edx_release_notes/.readthedocs.yaml index 1a84ca588b..7c287dace9 100644 --- a/en_us/open_edx_release_notes/.readthedocs.yaml +++ b/en_us/open_edx_release_notes/.readthedocs.yaml @@ -13,7 +13,7 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.12" python: install: diff --git a/en_us/open_edx_students/.readthedocs.yaml b/en_us/open_edx_students/.readthedocs.yaml index 8fb9bde7d3..bba5f2eedc 100644 --- a/en_us/open_edx_students/.readthedocs.yaml +++ b/en_us/open_edx_students/.readthedocs.yaml @@ -13,7 +13,7 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.12" python: install: diff --git a/en_us/shared/.readthedocs.yaml b/en_us/shared/.readthedocs.yaml index 121cbca3f4..ff1eb8807f 100644 --- a/en_us/shared/.readthedocs.yaml +++ b/en_us/shared/.readthedocs.yaml @@ -13,7 +13,7 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.12" python: install: diff --git a/en_us/students_redirect/.readthedocs.yaml b/en_us/students_redirect/.readthedocs.yaml index 9911b268a6..53f8c276e3 100644 --- a/en_us/students_redirect/.readthedocs.yaml +++ b/en_us/students_redirect/.readthedocs.yaml @@ -13,7 +13,7 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.12" python: install: diff --git a/en_us/xblock-tutorial/.readthedocs.yaml b/en_us/xblock-tutorial/.readthedocs.yaml index 5eb6619a5c..48a09c6edc 100644 --- a/en_us/xblock-tutorial/.readthedocs.yaml +++ b/en_us/xblock-tutorial/.readthedocs.yaml @@ -13,7 +13,7 @@ sphinx: build: os: ubuntu-22.04 tools: - python: "3.8" + python: "3.12" python: install: From 984c003b6fb0d3d7f4a12375414109a219c2438b Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Thu, 1 Aug 2024 13:56:44 -0400 Subject: [PATCH 3/3] build: Drop the feedback form html context. The new theme does not use this function so we don't need to have the html_context have info about it. --- shared/conf.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/shared/conf.py b/shared/conf.py index ad2095bf0c..7056b4a33a 100644 --- a/shared/conf.py +++ b/shared/conf.py @@ -167,19 +167,10 @@ def set_audience(category, audience): if help_data: html_context.update(help_data) -FEEDBACK_FORM_FMT = "https://docs.google.com/forms/d/1T5QGnYb_QnQoMO7T_eatq02miPTY40WVe3cgGphNAdY/viewform?entry.1952574704&entry.241692674={pageid}" - -def feedback_form_url(project, page): - """Create a URL for feedback on a particular page in a project.""" - return FEEDBACK_FORM_FMT.format(pageid=urllib.quote("{}: {}".format(project, page))) - -# We want the feedback_form_url function available in HTML templates, but it -# makes html_context un-JSON-able, so don't add it if we are doing JSON. -if the_builder != "json": - html_context['feedback_form_url'] = feedback_form_url - # General information about the project. +print(html_context) + copyright = '{year}, The Axim Collaborative'.format(year=datetime.datetime.now().year) # Intersphinx manages the connections between books.