Skip to content

Commit 3241e6a

Browse files
authored
Merge pull request #1216 from overhangio/teak
v20.0.0 teak release
2 parents cb79585 + 121169a commit 3241e6a

File tree

22 files changed

+58
-127
lines changed

22 files changed

+58
-127
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ instructions, because git commits are used to generate release notes:
2020

2121
<!-- scriv-insert-here -->
2222

23+
<a id='changelog-20.0.0'></a>
24+
## v20.0.0 (2025-06-16)
25+
26+
- 💥[Depreciation] Remove the unnecessary site-configuration script in favour of the [`create_or_update_site_configuration`](https://github.com/openedx/edx-platform/blob/master/openedx/core/djangoapps/site_configuration/management/commands/create_or_update_site_configuration.py) management command provided in edx-platform. (by @Danyal-Faheem)
27+
28+
- 💥[Feature] Upgrade to Teak. (by @ahmed-arb)
29+
2330
<a id='changelog-19.0.5'></a>
2431
## v19.0.5 (2025-06-10)
2532

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ ci-test-bundle: ## Run basic tests on bundle
9595
yes "" | ./dist/tutor config save --interactive
9696
./dist/tutor config save
9797
./dist/tutor plugins list
98-
./dist/tutor plugins enable android discovery ecommerce forum license mfe minio notes webui xqueue
98+
./dist/tutor plugins enable android discovery forum license mfe minio notes webui xqueue
9999
./dist/tutor plugins list
100100
./dist/tutor license --help
101101

docs/configuration.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Open edX customisation
132132

133133
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.
134134

135-
- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/sumac.3"``, or ``master`` in :ref:`Tutor Main <main>`)
135+
- ``OPENEDX_COMMON_VERSION`` (default: ``"release/teak.1"``, or ``master`` in :ref:`Tutor Main <main>`)
136136

137137
This defines the default version that will be pulled from all Open edX git repositories.
138138

@@ -384,9 +384,9 @@ Note that your edx-platform version must be a fork of the latest release **tag**
384384

385385
If you don't create your fork from this tag, you *will* have important compatibility issues with other services. In particular:
386386

387-
- Do not try to run a fork from an older (pre-Sumac) version of edx-platform: this will simply not work.
387+
- Do not try to run a fork from an older (pre-Teak) version of edx-platform: this will simply not work.
388388
- Do not try to run a fork from the edx-platform master branch: there is a 99% probability that it will fail.
389-
- Do not try to run a fork from the open-release/sumac.master branch: Tutor will attempt to apply security and bug fix patches that might already be included in the open-release/sumac.master but which were not yet applied to the latest release tag. Patch application will thus fail if you base your fork from the open-release/sumac.master branch.
389+
- 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.
390390

391391
.. _i18n:
392392

docs/dev.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ The ``openedx-dev`` Docker image is based on the same ``openedx`` image used by
113113

114114
- 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).
115115
- Additional Python and system requirements are installed for convenient debugging: `ipython <https://ipython.org/>`__, `ipdb <https://pypi.org/project/ipdb/>`__, vim, telnet.
116-
- The edx-platform `development requirements <https://github.com/openedx/edx-platform/blob/open-release/sumac.master/requirements/edx/development.in>`__ are installed.
116+
- The edx-platform `development requirements <https://github.com/openedx/edx-platform/blob/release/teak/requirements/edx/development.in>`__ are installed.
117117

118118

119119
If you are using a custom ``openedx`` image, then you will need to rebuild ``openedx-dev`` every time you modify ``openedx``. To so, run::

docs/install.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ To inspect the Tutor source code, install Tutor from `the Github repository <htt
8080
Configuring DNS records
8181
-----------------------
8282

83-
When running a server in production, it is necessary to define `DNS records <https://en.wikipedia.org/wiki/Domain_Name_System#Resource_records>`__ which will make it possible to access your Open edX platform by name in your browser. The precise procedure to create DNS records varies from one provider to the next and is beyond the scope of these docs. You should create a record of type A with a name equal to your LMS hostname (given by ``tutor config printvalue LMS_HOST``) and a value that indicates the IP address of your server. Applications other than the LMS, such as the studio, ecommerce, etc. typically reside in subdomains of the LMS. Thus, you should also create a CNAME record to point all subdomains of the LMS to the LMS_HOST.
83+
When running a server in production, it is necessary to define `DNS records <https://en.wikipedia.org/wiki/Domain_Name_System#Resource_records>`__ which will make it possible to access your Open edX platform by name in your browser. The precise procedure to create DNS records varies from one provider to the next and is beyond the scope of these docs. You should create a record of type A with a name equal to your LMS hostname (given by ``tutor config printvalue LMS_HOST``) and a value that indicates the IP address of your server. Applications other than the LMS, such as the studio, credentials, etc. typically reside in subdomains of the LMS. Thus, you should also create a CNAME record to point all subdomains of the LMS to the LMS_HOST.
8484

8585
For instance, to run an Open edX server at https://learn.mydomain.com on a server with IP address 1.1.1.1, you would need to configure the following DNS records::
8686

@@ -137,11 +137,11 @@ Major Open edX releases are published twice a year, in June and December, by the
137137
4. Test the new release in a sandboxed environment.
138138
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`).
139139

140-
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 Redwood to Sumac and rebuild some Docker images, run::
140+
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::
141141

142142
tutor config save
143143
tutor images build all # list the images that should be rebuilt here
144-
tutor local upgrade --from=redwood
144+
tutor local upgrade --from=sumac
145145
tutor local launch
146146

147147

@@ -153,8 +153,6 @@ Instructions for installing the appropriate Tutor version for older Open edX rel
153153
+-------------------+---------------+--------------------------------------------+
154154
| Open edX Release | Tutor version | Installation command |
155155
+===================+===============+============================================+
156-
| Juniper | v10 | pip install 'tutor[full]>=10.0.0,<11.0.0' |
157-
+-------------------+---------------+--------------------------------------------+
158156
| Koa | v11 | pip install 'tutor[full]>=11.0.0,<12.0.0' |
159157
+-------------------+---------------+--------------------------------------------+
160158
| Lilac | v12 | pip install 'tutor[full]>=12.0.0,<13.0.0' |
@@ -173,6 +171,8 @@ Instructions for installing the appropriate Tutor version for older Open edX rel
173171
+-------------------+---------------+--------------------------------------------+
174172
| Sumac | v19 | pip install 'tutor[full]>=19.0.0,<20.0.0' |
175173
+-------------------+---------------+--------------------------------------------+
174+
| Teak | v20 | pip install 'tutor[full]>=20.0.0,<21.0.0' |
175+
+-------------------+---------------+--------------------------------------------+
176176

177177
.. _autocomplete:
178178

docs/reference/indexes.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Plugin indexes are a great way to have your plugins discovered by other users. P
77
Index file paths
88
================
99

10-
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 "Sumac" release:
10+
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:
1111

12-
- https://overhang.io/tutor/main/sumac/plugins.yml
13-
- ``/path/to/your/local/index/sumac/plugins.yml``
12+
- https://overhang.io/tutor/main/teak/plugins.yml
13+
- ``/path/to/your/local/index/teak/plugins.yml``
1414

1515
To add either indexes, run the ``tutor plugins index add`` command without the suffix. For instance::
1616

@@ -106,9 +106,9 @@ Manage plugins in development
106106
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::
107107

108108
# Create the plugin index directory
109-
mkdir -p ~/localindex/sumac/
109+
mkdir -p ~/localindex/teak/
110110
# Edit the index
111-
vim ~/localindex/sumac/plugins.yml
111+
vim ~/localindex/teak/plugins.yml
112112

113113
Add the following to the index::
114114

docs/tutor.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ Contributions to Tutor and its plugins are highly encouraged. Please adhere to t
121121

122122
- 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``.
123123
- 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.
124-
- At the beginning of each Open edX named release testing period, we split off from ``main`` a special pending release branch (e.g., ``redwood`` 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``.
124+
- 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``.
125125

126126
- **Running Tests and Code Formatting**:
127127

docs/tutorials/edx-platform.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Quite often, developers don't want to work on edx-platform directly, but on a de
6969
cd /my/workspace/edx-ora2
7070
git clone https://github.com/openedx/edx-ora2 .
7171

72-
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/open-release/sumac.master/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**::
72+
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**::
7373

7474
git checkout <my-version-tag-or-branch>
7575

docs/tutorials/proxy.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ With these changes, Tutor will no longer listen to ports 80 and 443 on the host.
2020

2121
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:
2222

23-
- 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, ECOMMERCE_HOST, etc.). See each plugin documentation for more information.
23+
- 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.
2424
- If SSL/TLS is enabled:
2525
- Perform SSL/TLS termination using your own certificates.
2626
- Forward http traffic to https.

requirements/plugins.txt

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
# change version ranges when upgrading from sumac
2-
tutor-android>=19.0.0,<20.0.0
3-
tutor-cairn>=19.0.0,<20.0.0
4-
tutor-credentials>=19.0.0,<20.0.0
5-
tutor-deck>=19.0.0,<20.0.0
6-
tutor-discovery>=19.0.0,<20.0.0
7-
tutor-ecommerce>=19.0.0,<20.0.0
8-
tutor-forum>=19.0.0,<20.0.0
9-
tutor-indigo>=19.0.0,<20.0.0
10-
tutor-jupyter>=19.0.0,<20.0.0
11-
tutor-mfe>=19.0.0,<20.0.0
12-
tutor-minio>=19.0.0,<20.0.0
13-
tutor-notes>=19.0.0,<20.0.0
14-
tutor-webui>=19.0.0,<20.0.0
15-
tutor-xqueue>=19.0.0,<20.0.0
1+
# change version ranges when upgrading from teak
2+
tutor-android>=20.0.0,<21.0.0
3+
tutor-cairn>=20.0.0,<21.0.0
4+
tutor-credentials>=20.0.0,<21.0.0
5+
tutor-discovery>=20.0.0,<21.0.0
6+
tutor-deck>=20.0.0,<21.0.0
7+
tutor-forum>=20.0.0,<21.0.0
8+
tutor-indigo>=20.0.0,<21.0.0
9+
tutor-jupyter>=20.0.0,<21.0.0
10+
tutor-mfe>=20.0.0,<21.0.0
11+
tutor-minio>=20.0.0,<21.0.0
12+
tutor-notes>=20.0.0,<21.0.0
13+
tutor-webui>=20.0.0,<21.0.0
14+
tutor-xqueue>=20.0.0,<21.0.0

0 commit comments

Comments
 (0)