From 5c5a438e1453288a9056e8d9deb3fd751cc67842 Mon Sep 17 00:00:00 2001 From: hinakhadim Date: Fri, 3 May 2024 17:20:54 +0500 Subject: [PATCH] v18.0.0 upgrade to redwood --- CHANGELOG.md | 5 +++++ README.rst | 4 ++-- changelog.d/20240611_174413_hina.khadim_fix_nightly.md | 1 - setup.py | 4 ++-- tutorindigo/__about__.py | 2 +- tutorindigo/plugin.py | 8 ++++---- 6 files changed, 14 insertions(+), 10 deletions(-) delete mode 100644 changelog.d/20240611_174413_hina.khadim_fix_nightly.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e5c5bf73..164ac2d6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,11 @@ instructions, because git commits are used to generate release notes: + +## v18.0.0 (2024-06-20) + +- 💥[Feature] Upgrade to Redwood (by @hinakhadim) + ## v17.4.2 (2024-06-11) diff --git a/README.rst b/README.rst index e0d1f0752..edf54c5c8 100644 --- a/README.rst +++ b/README.rst @@ -75,11 +75,11 @@ Overriding the default "about", "contact", etc. static pages By default, the ``/about`` and ``/contact`` pages contain a simple line of text: "This page left intentionally blank. Feel free to add your own content". This is of course unusable in production. In the following, we detail how to override just any of the static templates used in Open edX. -The static templates used by Open edX to render those pages are all stored in the `edx-platform/lms/templates/static_templates `__ folder. To override those templates, you should add your own in the following folder:: +The static templates used by Open edX to render those pages are all stored in the `edx-platform/lms/templates/static_templates `__ folder. To override those templates, you should add your own in the following folder:: ls tutorindigo/templates/indigo/lms/templates/static_templates" -For instance, edit the "donate.html" file in this directory. We can derive the content of this file from the contents of the `donate.html `__ static template in edx-platform: +For instance, edit the "donate.html" file in this directory. We can derive the content of this file from the contents of the `donate.html `__ static template in edx-platform: .. code-block:: mako diff --git a/changelog.d/20240611_174413_hina.khadim_fix_nightly.md b/changelog.d/20240611_174413_hina.khadim_fix_nightly.md deleted file mode 100644 index a68655da9..000000000 --- a/changelog.d/20240611_174413_hina.khadim_fix_nightly.md +++ /dev/null @@ -1 +0,0 @@ -- [BugFix] Add variable.scss file path of edx-platform for CMS and remove header and footer of profile and account MFE (by @hinakhadim) diff --git a/setup.py b/setup.py index 810a89888..d574ad50f 100644 --- a/setup.py +++ b/setup.py @@ -44,8 +44,8 @@ def load_about(): packages=find_packages(exclude=["tests*"]), include_package_data=True, python_requires=">=3.8", - install_requires=["tutor>=17.0.0,<18.0.0", "tutor-mfe>=17.0.0,<18.0.0"], - extras_require={"dev": "tutor[dev]>=17.0.0,<18.0.0"}, + install_requires=["tutor>=18.0.0,<19.0.0", "tutor-mfe>=18.0.0,<19.0.0"], + extras_require={"dev": "tutor[dev]>=18.0.0,<19.0.0"}, entry_points={"tutor.plugin.v1": ["indigo = tutorindigo.plugin"]}, classifiers=[ "Development Status :: 5 - Production/Stable", diff --git a/tutorindigo/__about__.py b/tutorindigo/__about__.py index 6a86d4e06..c6a8b8ed8 100644 --- a/tutorindigo/__about__.py +++ b/tutorindigo/__about__.py @@ -1 +1 @@ -__version__ = "17.4.2" +__version__ = "18.0.0" diff --git a/tutorindigo/plugin.py b/tutorindigo/plugin.py index 86e5bbe93..afcb46965 100644 --- a/tutorindigo/plugin.py +++ b/tutorindigo/plugin.py @@ -72,7 +72,7 @@ # Override openedx & mfe docker image names -@hooks.Filters.CONFIG_DEFAULTS.add(priority=hooks.priorities.LOW) # type: ignore +@hooks.Filters.CONFIG_DEFAULTS.add(priority=hooks.priorities.LOW) # type: ignore def _override_openedx_docker_image( items: list[tuple[str, t.Any]] ) -> list[tuple[str, t.Any]]: @@ -107,7 +107,7 @@ def _override_openedx_docker_image( """ RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^1.0.0' """, - # remove indigo-header and indigo-footer due to incompatible version deps of MFEs + # remove indigo-header and indigo-footer due to incompatible version deps of MFEs ), ( "mfe-dockerfile-post-npm-install-authn", @@ -122,14 +122,14 @@ def _override_openedx_docker_image( """ RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^1.0.0' """, - # remove indigo-header and indigo-footer due to incompatible version deps of MFEs + # remove indigo-header and indigo-footer due to incompatible version deps of MFEs ), ( "mfe-dockerfile-post-npm-install-learner-dashboard", """ RUN npm install '@edx/brand@npm:@edly-io/indigo-brand-openedx@^1.0.0' """, - # remove indigo-footer due to incompatible version deps of MFEs + # remove indigo-footer due to incompatible version deps of MFEs ), ( "mfe-dockerfile-post-npm-install-profile",