overhangio · ahmed-arb · Jun 27, 2025 · Jun 27, 2025 · Jul 9, 2025 · Jul 22, 2025
diff --git a/Makefile b/Makefile
@@ -98,7 +98,7 @@ ci-test-bundle: ## Run basic tests on bundle
 	yes "" | ./dist/tutor config save --interactive
 	./dist/tutor config save
 	./dist/tutor plugins list
-	./dist/tutor plugins enable android discovery forum license mfe minio notes webui xqueue
+	./dist/tutor plugins enable android discovery forum license mfe minio notes xqueue
 	./dist/tutor plugins list
 	./dist/tutor license --help
 

diff --git a/README.rst b/README.rst
@@ -44,7 +44,7 @@ Features
 * 100% `open source <https://github.com/overhangio/tutor>`__
 * Runs entirely on Docker
 * World-famous 1-click `installation and upgrades <https://docs.tutor.edly.io/install.html>`__
-* Comes with batteries included: `theming <https://github.com/overhangio/indigo>`__, `SCORM <https://github.com/overhangio/openedx-scorm-xblock>`__, `HTTPS <https://docs.tutor.edly.io/configuration.html#ssl-tls-certificates-for-https-access>`__, `web-based administration interface <https://github.com/overhangio/tutor-webui>`__, `mobile app <https://github.com/overhangio/tutor-android>`__, `custom translations <https://docs.tutor.edly.io/configuration.html#adding-custom-translations>`__...
+* Comes with batteries included: `theming <https://github.com/overhangio/indigo>`__, `SCORM <https://github.com/overhangio/openedx-scorm-xblock>`__, `HTTPS <https://docs.tutor.edly.io/configuration.html#ssl-tls-certificates-for-https-access>`__, `mobile app <https://github.com/overhangio/tutor-android>`__, `custom translations <https://docs.tutor.edly.io/configuration.html#adding-custom-translations>`__...
 * Extensible architecture with `plugins <https://docs.tutor.edly.io/plugins/index.html>`__
 * Works with `Kubernetes <https://docs.tutor.edly.io/k8s.html>`__
 * No technical skill required with the `zero-click Tutor AWS image <https://docs.tutor.edly.io/install.html#zero-click-aws-installation>`__

diff --git a/changelog.d/20250521_185646_danyal.faheem_remove_preview.md b/changelog.d/20250521_185646_danyal.faheem_remove_preview.md
@@ -0,0 +1 @@
+- 💥[Deprecation] Remove preview page configuration as the page has been migrated to the learning MFE. (by @Danyal-Faheem)
diff --git a/changelog.d/20250805_140709_abdul.muqadim_remove_webui_from_tutor_nightly.md b/changelog.d/20250805_140709_abdul.muqadim_remove_webui_from_tutor_nightly.md
@@ -0,0 +1 @@
+💥[Deprecation] Remove deprecated WebUI plugin in favor of Tutor Deck. (by @Abdul-Muqadim-Arbisoft)
diff --git a/changelog.d/20251029_144855_ahmed.khalid_ulmo.md b/changelog.d/20251029_144855_ahmed.khalid_ulmo.md
@@ -0,0 +1 @@
+💥[Feature] Upgrade to Ulmo. (by @ahmed-arb)
diff --git a/changelog.d/20251103_123634_maria.grimaldi_authz_load_policy.md b/changelog.d/20251103_123634_maria.grimaldi_authz_load_policy.md
@@ -0,0 +1 @@
+- [Feature] Add authorization policy loading functionality to LMS/CMS services. (by @mariajgrimaldi)
diff --git a/changelog.d/20251105_123807_jhony.avella_kustomize_patches_migration.md b/changelog.d/20251105_123807_jhony.avella_kustomize_patches_migration.md
@@ -0,0 +1,3 @@
+- 💥[Improvement] Replacing "patchesStrategicMerge" key with "patches" key in the main Kustomization file (by @jfavellar90). [patchesStrategicMerge](https://kubectl.docs.kubernetes.io/references/kustomize/kustomization/patchesstrategicmerge/) was deprecated in the release v5.0.0 of the Kustomization API. It is replaced by the [patches](https://kubectl.docs.kubernetes.io/references/kustomize/kustomization/patches/) key which is more powerful and allows defining different patch types. This has the following consequences:
+    - The patch "kustomization-patches-strategic-merge" was renamed to "kustomization-patches"
+    - Extra Kustomization patches added via the "kustomization-patches" Tutor patch must respect the format specified [here](https://kubectl.docs.kubernetes.io/references/kustomize/kustomization/patches/). It implies moving old "patchesStrategicMerge" extra patches to the "patches" format.
diff --git a/changelog.d/20251110_164518_mlabeeb03_add_livedeps_main.md b/changelog.d/20251110_164518_mlabeeb03_add_livedeps_main.md
@@ -0,0 +1 @@
+- [Feature] Add tutor livedeps to the list of plugins available by default. (by @mlabeeb03)
diff --git a/docs/configuration.rst b/docs/configuration.rst
@@ -132,7 +132,7 @@ Open edX customisation
 
 This defines the git repository from which you install Open edX platform code. If you run an Open edX fork with custom patches, set this to your own git repository. You may also override this configuration parameter at build time, by providing a ``--build-arg`` option.
 
-- ``OPENEDX_COMMON_VERSION`` (default: ``"release/teak.2"``, or ``master`` in :ref:`Tutor Main <main>`)
+- ``OPENEDX_COMMON_VERSION`` (default: ``"release/ulmo"``, or ``master`` in :ref:`Tutor Main <main>`)
 
 This defines the default version that will be pulled from all Open edX git repositories.
 
@@ -292,7 +292,6 @@ When ``ENABLE_HTTPS`` is ``true``, the whole Open edX platform will be reconfigu
 The following DNS records must exist and point to your server::
 
     LMS_HOST (e.g: myopenedx.com)
-    PREVIEW_LMS_HOST (e.g: preview.myopenedx.com)
     CMS_HOST (e.g: studio.myopenedx.com)
 
 Thus, **this feature will (probably) not work in development** because the DNS records will (probably) not point to your development machine.
@@ -384,9 +383,9 @@ Note that your edx-platform version must be a fork of the latest release **tag**
 
 If you don't create your fork from this tag, you *will* have important compatibility issues with other services. In particular:
 
-- Do not try to run a fork from an older (pre-Teak) version of edx-platform: this will simply not work.
+- Do not try to run a fork from an older (pre-Ulmo) version of edx-platform: this will simply not work.
 - Do not try to run a fork from the edx-platform master branch: there is a 99% probability that it will fail.
-- Do not try to run a fork from the release/teak branch: Tutor will attempt to apply security and bug fix patches that might already be included in the release/teak but which were not yet applied to the latest release tag. Patch application will thus fail if you base your fork from the release/teak branch.
+- Do not try to run a fork from the release/ulmo branch: Tutor will attempt to apply security and bug fix patches that might already be included in the release/ulmo but which were not yet applied to the latest release tag. Patch application will thus fail if you base your fork from the release/ulmo branch.
 
 .. _i18n:
 

diff --git a/docs/dev.rst b/docs/dev.rst
@@ -113,7 +113,7 @@ The ``openedx-dev`` Docker image is based on the same ``openedx`` image used by
 
 - The user that runs inside the container has the same UID as the user on the host, to avoid permission problems inside mounted volumes (and in particular in the edx-platform repository).
 - Additional Python and system requirements are installed for convenient debugging: `ipython <https://ipython.org/>`__, `ipdb <https://pypi.org/project/ipdb/>`__, vim, telnet.
-- The edx-platform `development requirements <https://github.com/openedx/edx-platform/blob/release/teak/requirements/edx/development.in>`__ are installed.
+- The edx-platform `development requirements <https://github.com/openedx/edx-platform/blob/release/ulmo/requirements/edx/development.in>`__ are installed.
 
 
 If you are using a custom ``openedx`` image, then you will need to rebuild ``openedx-dev`` every time you modify ``openedx``. To so, run::

diff --git a/docs/install.rst b/docs/install.rst
@@ -137,11 +137,11 @@ Major Open edX releases are published twice a year, in June and December, by the
 4. Test the new release in a sandboxed environment.
 5. If you are running edx-platform, or some other repository from a custom branch, then you should rebase (and test) your changes on top of the latest release tag (see :ref:`edx_platform_fork`).
 
-The process for upgrading from one major release to the next works similarly to any other upgrade, with the ``launch`` command (see above). The single difference is that if the ``launch`` command detects that your tutor environment was generated with an older release, it will perform a few release-specific upgrade steps. These extra upgrade steps will be performed just once. But they will be ignored if you updated your local environment (for instance: with ``tutor config save``) before running ``launch``. This situation typically occurs if you need to re-build some Docker images (see above). In such a case, you should make use of the ``upgrade`` command. For instance, to upgrade a local installation from Sumac to Teak and rebuild some Docker images, run::
+The process for upgrading from one major release to the next works similarly to any other upgrade, with the ``launch`` command (see above). The single difference is that if the ``launch`` command detects that your tutor environment was generated with an older release, it will perform a few release-specific upgrade steps. These extra upgrade steps will be performed just once. But they will be ignored if you updated your local environment (for instance: with ``tutor config save``) before running ``launch``. This situation typically occurs if you need to re-build some Docker images (see above). In such a case, you should make use of the ``upgrade`` command. For instance, to upgrade a local installation from Teak to Ulmo and rebuild some Docker images, run::
 
     tutor config save
     tutor images build all # list the images that should be rebuilt here
-    tutor local upgrade --from=sumac
+    tutor local upgrade --from=teak
     tutor local launch
 
 
@@ -173,6 +173,8 @@ Instructions for installing the appropriate Tutor version for older Open edX rel
 +-------------------+---------------+--------------------------------------------+
 | Teak              | v20           | pip install 'tutor[full]>=20.0.0,<21.0.0'  |
 +-------------------+---------------+--------------------------------------------+
+| Ulmo              | v21           | pip install 'tutor[full]>=21.0.0,<22.0.0'  |
++-------------------+---------------+--------------------------------------------+
 
 .. _autocomplete:
 

diff --git a/docs/reference/indexes.rst b/docs/reference/indexes.rst
@@ -7,10 +7,10 @@ Plugin indexes are a great way to have your plugins discovered by other users. P
 Index file paths
 ================
 
-A plugin index is a yaml-formatted file. It can be stored on the web or on your computer. In both cases, the index file location must end with "<current release name>/plugins.yml". For instance, the following are valid index locations if you run the Open edX "Teak" release:
+A plugin index is a yaml-formatted file. It can be stored on the web or on your computer. In both cases, the index file location must end with "<current release name>/plugins.yml". For instance, the following are valid index locations if you run the Open edX "Ulmo" release:
 
-- https://overhang.io/tutor/main/teak/plugins.yml
-- ``/path/to/your/local/index/teak/plugins.yml``
+- https://overhang.io/tutor/main/ulmo/plugins.yml
+- ``/path/to/your/local/index/ulmo/plugins.yml``
 
 To add either indexes, run the ``tutor plugins index add`` command without the suffix. For instance::
 
@@ -106,9 +106,9 @@ Manage plugins in development
 Plugin developers and maintainers often want to install local versions of their plugins. They usually achieve this with ``pip install -e /path/to/tutor-plugin``. We can improve that workflow by creating an index for local plugins::
 
     # Create the plugin index directory
-    mkdir -p ~/localindex/teak/
+    mkdir -p ~/localindex/ulmo/
     # Edit the index
-    vim ~/localindex/teak/plugins.yml
+    vim ~/localindex/ulmo/plugins.yml
 
 Add the following to the index::
 

diff --git a/docs/reference/patches.rst b/docs/reference/patches.rst
@@ -145,14 +145,14 @@ File: ``kustomization.yml``
 
 File: ``kustomization.yml``
 
-.. patch:: kustomization-patches-strategic-merge
+.. patch:: kustomization-patches
 
-``kustomization-patches-strategic-merge``
+``kustomization-patches``
 =========================================
 
 File: ``kustomization.yml``
 
-This can be used to add more Kustomization patches that make use of the `strategic merge mechanism <https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kustomization/#customizing>`__. 
+This can be used to add more Kustomization patches. See more details `here <https://kubectl.docs.kubernetes.io/references/kustomize/kustomization/patches/>`__.
 
 .. patch:: kustomization-resources
 

diff --git a/docs/tutor.rst b/docs/tutor.rst
@@ -121,7 +121,7 @@ Contributions to Tutor and its plugins are highly encouraged. Please adhere to t
 
   - Target ``release`` if your change is compatible with the latest official Open edX release and it carries no major backwards-incompatibility nor risk of regression. This ensures that the latest stable release of Tutor benefits from bug fixes and incremental improvements. Once merged, your change will automatically be forward-ported to ``main``.
   - Target ``main`` if your change is only compatible with Open edX's master branches and/or your change would be disruptive to production Tutor site operators. If merged, your change will become part of the next pending release branch (described below) and then incorporated into ``release`` at the time of the next named Open edX release.
-  - At the beginning of each Open edX named release testing period, we split off from ``main`` a special pending release branch (e.g., ``sumac`` or ``teak``). If your Tutor change is necessary for that pending release, merge it to said branch. At the end of the testing period, the pending branch will be merged into ``release`` and deleted. As with any set of changes merged to ``release``, they will then be forward-ported to ``main``.
+  - At the beginning of each Open edX named release testing period, we split off from ``main`` a special pending release branch (e.g., ``teak`` or ``sumac``). If your Tutor change is necessary for that pending release, merge it to said branch. At the end of the testing period, the pending branch will be merged into ``release`` and deleted. As with any set of changes merged to ``release``, they will then be forward-ported to ``main``.
 
 - **Running Tests and Code Formatting**:
 

diff --git a/docs/tutorials/edx-platform.rst b/docs/tutorials/edx-platform.rst
@@ -69,7 +69,7 @@ Quite often, developers don't want to work on edx-platform directly, but on a de
     cd /my/workspace/edx-ora2
     git clone https://github.com/openedx/edx-ora2 .
 
-Then, check out the right version of the package. This is the version that is indicated in the `edx-platform/requirements/edx/base.txt <https://github.com/openedx/edx-platform/blob/release/teak/requirements/edx/base.txt>`__. Be careful that the version that is currently in use in your version of edx-platform is **not necessarily the head of the master branch**::
+Then, check out the right version of the package. This is the version that is indicated in the `edx-platform/requirements/edx/base.txt <https://github.com/openedx/edx-platform/blob/release/ulmo/requirements/edx/base.txt>`__. Be careful that the version that is currently in use in your version of edx-platform is **not necessarily the head of the master branch**::
 
     git checkout <my-version-tag-or-branch>
 

diff --git a/docs/tutorials/proxy.rst b/docs/tutorials/proxy.rst
@@ -20,7 +20,7 @@ With these changes, Tutor will no longer listen to ports 80 and 443 on the host.
 
 It is then your responsibility to configure the web proxy on the host. There are too many use cases and proxy vendors, so Tutor does not provide configuration files that will work for everyone. You should configure your web proxy to:
 
-- Capture traffic for the following hostnames: LMS_HOST, PREVIEW_LMS_HOST, CMS_HOST, as well as any additional host exposed by your plugins (MFE_HOST, CREDENTIALS_HOST, etc.). See each plugin documentation for more information.
+- Capture traffic for the following hostnames: LMS_HOST, CMS_HOST, as well as any additional host exposed by your plugins (MFE_HOST, CREDENTIALS_HOST, etc.). See each plugin documentation for more information.
 - If SSL/TLS is enabled:
     - Perform SSL/TLS termination using your own certificates.
     - Forward http traffic to https.

diff --git a/requirements/plugins.txt b/requirements/plugins.txt
@@ -1,14 +1,14 @@
-# change version ranges when upgrading from teak
-tutor-android>=20.0.0,<21.0.0
-tutor-cairn>=20.0.0,<21.0.0
-tutor-credentials>=20.0.0,<21.0.0
-tutor-discovery>=20.0.0,<21.0.0
-tutor-deck>=20.0.0,<21.0.0
-tutor-forum>=20.0.0,<21.0.0
-tutor-indigo>=20.0.0,<21.0.0
-tutor-jupyter>=20.0.0,<21.0.0
-tutor-mfe>=20.0.0,<21.0.0
-tutor-minio>=20.0.0,<21.0.0
-tutor-notes>=20.0.0,<21.0.0
-tutor-webui>=20.0.0,<21.0.0
-tutor-xqueue>=20.0.0,<21.0.0
+# For Tutor Main, we install plugins from their main branches instead of from PyPI
+tutor-android@git+https://github.com/overhangio/tutor-android@main
+tutor-cairn@git+https://github.com/overhangio/tutor-cairn@main
+tutor-credentials@git+https://github.com/overhangio/tutor-credentials@main
+tutor-deck@git+https://github.com/overhangio/tutor-deck@main
+tutor-discovery@git+https://github.com/overhangio/tutor-discovery@main
+tutor-forum@git+https://github.com/overhangio/tutor-forum@main
+tutor-indigo@git+https://github.com/overhangio/tutor-indigo@main
+tutor-jupyter@git+https://github.com/overhangio/tutor-jupyter@main
+tutor-livedeps@git+https://github.com/overhangio/tutor-livedeps@main
+tutor-mfe@git+https://github.com/overhangio/tutor-mfe@main
+tutor-minio@git+https://github.com/overhangio/tutor-minio@main
+tutor-notes@git+https://github.com/overhangio/tutor-notes@main
+tutor-xqueue@git+https://github.com/overhangio/tutor-xqueue@main
diff --git a/tests/test_env.py b/tests/test_env.py
@@ -260,7 +260,7 @@ def test_current_version_in_latest_env(self) -> None:
             ) as f:
                 f.write(__version__)
             self.assertEqual(__version__, env.current_version(root))
-            self.assertEqual("teak", env.get_env_release(root))
+            self.assertEqual("ulmo", env.get_env_release(root))
             self.assertIsNone(env.should_upgrade_from_release(root))
             self.assertTrue(env.is_up_to_date(root))
 

diff --git a/tutor/__about__.py b/tutor/__about__.py
@@ -2,7 +2,7 @@
 
 # Increment this version number to trigger a new release. See
 # docs/tutor.html#versioning for information on the versioning scheme.
-__version__ = "20.0.2"
+__version__ = "21.0.0"
 
 # The version suffix will be appended to the actual version, separated by a
 # dash. Use this suffix to differentiate between the actual released version and

diff --git a/tutor/commands/jobs_utils.py b/tutor/commands/jobs_utils.py
@@ -177,8 +177,6 @@ def assign_theme(name, domain):
         "{{ LMS_HOST }}:8000",
         "{{ CMS_HOST }}",
         "{{ CMS_HOST }}:8001",
-        "{{ PREVIEW_LMS_HOST }}",
-        "{{ PREVIEW_LMS_HOST }}:8000",
     ]
     for domain_name in domain_names:
         python_command += f"assign_theme('{theme_name}', '{domain_name}')\n"

diff --git a/tutor/commands/upgrade/__init__.py b/tutor/commands/upgrade/__init__.py
@@ -1,4 +1,4 @@
-# Note: don't forget to change this when we upgrade from teak
+# Note: don't forget to change this when we upgrade from ulmo
 OPENEDX_RELEASE_NAMES = [
     "ironwood",
     "juniper",
@@ -12,4 +12,5 @@
     "redwood",
     "sumac",
     "teak",
+    "ulmo",
 ]
diff --git a/tutor/commands/upgrade/compose.py b/tutor/commands/upgrade/compose.py
@@ -57,6 +57,9 @@ def upgrade_from(context: click.Context, from_release: str) -> None:
     if running_release == "sumac":
         running_release = "teak"
 
+    if running_release == "teak":
+        running_release = "ulmo"
+
 
 def upgrade_from_ironwood(context: click.Context, config: Config) -> None:
     click.echo(fmt.title("Upgrading from Ironwood"))

diff --git a/tutor/commands/upgrade/k8s.py b/tutor/commands/upgrade/k8s.py
@@ -56,6 +56,9 @@ def upgrade_from(context: click.Context, from_release: str) -> None:
     if running_release == "sumac":
         running_release = "teak"
 
+    if running_release == "teak":
+        running_release = "ulmo"
+
 
 def upgrade_from_ironwood(config: Config) -> None:
     upgrade_mongodb(config, "3.4.24", "3.4")

diff --git a/tutor/config.py b/tutor/config.py
@@ -342,19 +342,3 @@ def _update_enabled_plugins_on_unload(_plugin: str, _root: str, config: Config)
     Note that this action must be performed after the plugin has been unloaded, hence the low priority.
     """
     save_enabled_plugins(config)
-
-
-@hooks.Actions.CONFIG_LOADED.add()
-def _check_preview_lms_host(config: Config) -> None:
-    """
-    This will check if the PREVIEW_LMS_HOST is a subdomain of LMS_HOST.
-    if not, prints a warning to notify the user.
-    """
-
-    lms_host = get_typed(config, "LMS_HOST", str, "")
-    preview_lms_host = get_typed(config, "PREVIEW_LMS_HOST", str, "")
-    if not preview_lms_host.endswith("." + lms_host):
-        fmt.echo_alert(
-            f'Warning: PREVIEW_LMS_HOST="{preview_lms_host}" is not a subdomain of LMS_HOST="{lms_host}". '
-            "This configuration is not typically recommended and may lead to unexpected behavior."
-        )
diff --git a/tutor/env.py b/tutor/env.py
@@ -477,6 +477,7 @@ def get_release(version: str) -> str:
         "18": "redwood",
         "19": "sumac",
         "20": "teak",
+        "21": "ulmo",
     }[version.split(".", maxsplit=1)[0]]
 
 

diff --git a/tutor/plugins/v0.py b/tutor/plugins/v0.py
@@ -290,7 +290,6 @@ class OfficialPlugin(BasePlugin):
         "mfe",
         "minio",
         "notes",
-        "webui",
         "xqueue",
     ]
 

diff --git a/tutor/templates/apps/caddy/Caddyfile b/tutor/templates/apps/caddy/Caddyfile
@@ -41,7 +41,7 @@
     {{ patch("caddyfile-proxy")|indent(4) }}
 }
 
-{{ LMS_HOST }}{$default_site_port}, {{ PREVIEW_LMS_HOST }}{$default_site_port} {
+{{ LMS_HOST }}{$default_site_port} {
     @favicon_matcher {
         path_regexp ^/favicon.ico$
     }

diff --git a/tutor/templates/apps/openedx/config/cms.env.yml b/tutor/templates/apps/openedx/config/cms.env.yml
@@ -8,7 +8,6 @@ FEATURES:
   {{ patch("common-env-features")|indent(2) }}
   {{ patch("cms-env-features")|indent(2) }}
   CERTIFICATES_HTML_VIEW: true
-  PREVIEW_LMS_BASE: "{{ PREVIEW_LMS_HOST }}"
   ENABLE_CSMH_EXTENDED: false
   ENABLE_LEARNER_RECORDS: false
   ENABLE_LIBRARY_INDEX: true
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- 💥[Deprecation] Remove preview page configuration as the page has been migrated to the learning MFE. (by @Danyal-Faheem)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		💥[Deprecation] Remove deprecated WebUI plugin in favor of Tutor Deck. (by @Abdul-Muqadim-Arbisoft)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- [Feature] Add authorization policy loading functionality to LMS/CMS services. (by @mariajgrimaldi)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- [Feature] Add tutor livedeps to the list of plugins available by default. (by @mlabeeb03)