Skip to content

Commit

Permalink
v18.0.0 upgrade to redwood
Browse files Browse the repository at this point in the history
  • Loading branch information
hinakhadim authored and regisb committed Jun 20, 2024
1 parent 1ce8de5 commit 207e34a
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 10 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ instructions, because git commits are used to generate release notes:

<!-- scriv-insert-here -->

<a id='changelog-18.0.0'></a>
## v18.0.0 (2024-06-20)

- 💥[Feature] Upgrade to Redwood (by @hinakhadim)

<a id='changelog-17.4.2'></a>
## v17.4.2 (2024-06-11)

Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/edx/edx-platform/tree/open-release/quince.master/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 <https://github.com/edx/edx-platform/tree/open-release/redwood.master/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 <https://github.com/edx/edx-platform/blob/open-release/quince.master/lms/templates/static_templates/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 <https://github.com/edx/edx-platform/blob/open-release/redwood.master/lms/templates/static_templates/donate.html>`__ static template in edx-platform:

.. code-block:: mako
Expand Down
1 change: 0 additions & 1 deletion changelog.d/20240611_174413_hina.khadim_fix_nightly.md

This file was deleted.

4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion tutorindigo/__about__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "17.4.2"
__version__ = "18.0.0"
8 changes: 4 additions & 4 deletions tutorindigo/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
def _override_openedx_docker_image(
items: list[tuple[str, t.Any]]
) -> list[tuple[str, t.Any]]:
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down

0 comments on commit 207e34a

Please sign in to comment.