Skip to content

Commit bb174b3

Browse files
committed
v21.0.0
1 parent 711d259 commit bb174b3

File tree

15 files changed

+29
-18
lines changed

15 files changed

+29
-18
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
💥[Feature] Upgrade to Ulmo. (by @ahmed-arb)

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: ``"release/teak.2"``, or ``master`` in :ref:`Tutor Main <main>`)
135+
- ``OPENEDX_COMMON_VERSION`` (default: ``"release/ulmo"``, 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

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

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

386-
- Do not try to run a fork from an older (pre-Teak) version of edx-platform: this will simply not work.
386+
- Do not try to run a fork from an older (pre-Ulmo) version of edx-platform: this will simply not work.
387387
- Do not try to run a fork from the edx-platform master branch: there is a 99% probability that it will fail.
388-
- 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.
388+
- 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.
389389

390390
.. _i18n:
391391

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/release/teak/requirements/edx/development.in>`__ are installed.
116+
- The edx-platform `development requirements <https://github.com/openedx/edx-platform/blob/release/ulmo/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: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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 Sumac to Teak 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 Teak to Ulmo 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=sumac
144+
tutor local upgrade --from=teak
145145
tutor local launch
146146

147147

@@ -173,6 +173,8 @@ Instructions for installing the appropriate Tutor version for older Open edX rel
173173
+-------------------+---------------+--------------------------------------------+
174174
| Teak | v20 | pip install 'tutor[full]>=20.0.0,<21.0.0' |
175175
+-------------------+---------------+--------------------------------------------+
176+
| Ulmo | v21 | pip install 'tutor[full]>=21.0.0,<22.0.0' |
177+
+-------------------+---------------+--------------------------------------------+
176178

177179
.. _autocomplete:
178180

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 "Teak" 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 "Ulmo" release:
1111

12-
- https://overhang.io/tutor/main/teak/plugins.yml
13-
- ``/path/to/your/local/index/teak/plugins.yml``
12+
- https://overhang.io/tutor/main/ulmo/plugins.yml
13+
- ``/path/to/your/local/index/ulmo/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/teak/
109+
mkdir -p ~/localindex/ulmo/
110110
# Edit the index
111-
vim ~/localindex/teak/plugins.yml
111+
vim ~/localindex/ulmo/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., ``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``.
124+
- 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``.
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/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**::
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/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**::
7373

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

tests/test_env.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ def test_current_version_in_latest_env(self) -> None:
260260
) as f:
261261
f.write(__version__)
262262
self.assertEqual(__version__, env.current_version(root))
263-
self.assertEqual("teak", env.get_env_release(root))
263+
self.assertEqual("ulmo", env.get_env_release(root))
264264
self.assertIsNone(env.should_upgrade_from_release(root))
265265
self.assertTrue(env.is_up_to_date(root))
266266

tutor/__about__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Increment this version number to trigger a new release. See
44
# docs/tutor.html#versioning for information on the versioning scheme.
5-
__version__ = "20.0.2"
5+
__version__ = "21.0.0"
66

77
# The version suffix will be appended to the actual version, separated by a
88
# dash. Use this suffix to differentiate between the actual released version and

tutor/commands/upgrade/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Note: don't forget to change this when we upgrade from teak
1+
# Note: don't forget to change this when we upgrade from ulmo
22
OPENEDX_RELEASE_NAMES = [
33
"ironwood",
44
"juniper",
@@ -12,4 +12,5 @@
1212
"redwood",
1313
"sumac",
1414
"teak",
15+
"ulmo",
1516
]

0 commit comments

Comments
 (0)