Skip to content

Commit

Permalink
v18.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
DawoudSheraz committed Jun 13, 2024
1 parent a6b0b68 commit 6f6714e
Show file tree
Hide file tree
Showing 16 changed files with 37 additions and 32 deletions.
1 change: 1 addition & 0 deletions changelog.d/20240503_115445_dawoud.sheraz_redwood.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- 💥[Feature] Upgrade to redwood (by @dawoudsheraz)
6 changes: 3 additions & 3 deletions docs/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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: ``"open-release/quince.1"``, or ``master`` in :ref:`nightly <nightly>`)
- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/redwood.1"``, or ``master`` in :ref:`nightly <nightly>`)

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

Expand Down Expand Up @@ -378,9 +378,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-Quince) version of edx-platform: this will simply not work.
- Do not try to run a fork from an older (pre-Redwood) 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 open-release/quince.master branch: Tutor will attempt to apply security and bug fix patches that might already be included in the open-release/quince.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/quince.master branch.
- Do not try to run a fork from the open-release/redwood.master branch: Tutor will attempt to apply security and bug fix patches that might already be included in the open-release/redwood.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/redwood.master branch.

.. _i18n:

Expand Down
2 changes: 1 addition & 1 deletion docs/dev.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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/open-release/quince.master/requirements/edx/development.in>`__ are installed.
- The edx-platform `development requirements <https://github.com/openedx/edx-platform/blob/open-release/redwood.master/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::
Expand Down
4 changes: 2 additions & 2 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,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 Palm to Quince 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 Quince to Redwood 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=palm
tutor local upgrade --from=quince
tutor local launch

.. _autocomplete:
Expand Down
2 changes: 1 addition & 1 deletion docs/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Yes :) This is what happens when you run ``tutor local launch``:
2. Configuration files are generated from templates.
3. Docker images are downloaded.
4. Docker containers are provisioned.
5. A full, production-ready Open edX platform (`Quince <https://edx.readthedocs.io/projects/edx-installing-configuring-and-running/en/open-release-quince.master/platform_releases/quince.html>`__ release) is run with docker-compose.
5. A full, production-ready Open edX platform (`Redwood <https://edx.readthedocs.io/projects/edx-installing-configuring-and-running/en/open-release-redwood.master/platform_releases/redwood.html>`__ release) is run with docker-compose.

The whole procedure should require less than 10 minutes, on a server with good bandwidth. Note that your host environment will not be affected in any way, since everything runs inside docker containers. Root access is not even necessary.

Expand Down
10 changes: 5 additions & 5 deletions docs/reference/indexes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 "Quince" 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 "Redwood" release:

- https://overhang.io/tutor/main/quince/plugins.yml
- ``/path/to/your/local/index/quince/plugins.yml``
- https://overhang.io/tutor/main/redwood/plugins.yml
- ``/path/to/your/local/index/redwood/plugins.yml``

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

Expand Down Expand Up @@ -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/quince/
mkdir -p ~/localindex/redwood/
# Edit the index
vim ~/localindex/quince/plugins.yml
vim ~/localindex/redwood/plugins.yml

Add the following to the index::

Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/edx-platform.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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/open-release/quince.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**::
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/redwood.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**::

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

Expand Down
28 changes: 14 additions & 14 deletions requirements/plugins.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# change version ranges when upgrading from quince
tutor-android>=17.0.0,<18.0.0
tutor-cairn>=17.0.0,<18.0.0
tutor-credentials>=17.0.0,<18.0.0
tutor-discovery>=17.0.0,<18.0.0
tutor-ecommerce>=17.0.0,<18.0.0
tutor-forum>=17.0.0,<18.0.0
tutor-indigo>=17.0.0,<18.0.0
tutor-jupyter>=17.0.0,<18.0.0
tutor-mfe>=17.0.0,<18.0.0
tutor-minio>=17.0.0,<18.0.0
tutor-notes>=17.0.0,<18.0.0
tutor-webui>=17.0.0,<18.0.0
tutor-xqueue>=17.0.0,<18.0.0
# change version ranges when upgrading from redwood
tutor-android>=18.0.0,<19.0.0
tutor-cairn>=18.0.0,<19.0.0
tutor-credentials>=18.0.0,<19.0.0
tutor-discovery>=18.0.0,<19.0.0
tutor-ecommerce>=18.0.0,<19.0.0
tutor-forum>=18.0.0,<19.0.0
tutor-indigo>=18.0.0,<19.0.0
tutor-jupyter>=18.0.0,<19.0.0
tutor-mfe>=18.0.0,<19.0.0
tutor-minio>=18.0.0,<19.0.0
tutor-notes>=18.0.0,<19.0.0
tutor-webui>=18.0.0,<19.0.0
tutor-xqueue>=18.0.0,<19.0.0
2 changes: 1 addition & 1 deletion tests/test_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -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("quince", env.get_env_release(root))
self.assertEqual("redwood", env.get_env_release(root))
self.assertIsNone(env.should_upgrade_from_release(root))
self.assertTrue(env.is_up_to_date(root))

Expand Down
2 changes: 1 addition & 1 deletion tutor/__about__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# the nightly branch.
# The suffix is cleanly separated from the __version__ in this module to avoid
# conflicts when merging branches.
__version_suffix__ = "nightly"
__version_suffix__ = ""

# The app name will be used to define the name of the default tutor root and
# plugin directory. To avoid conflicts between multiple locally-installed
Expand Down
3 changes: 2 additions & 1 deletion tutor/commands/upgrade/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Note: don't forget to change this when we upgrade from quince
# Note: don't forget to change this when we upgrade from redwood
OPENEDX_RELEASE_NAMES = [
"ironwood",
"juniper",
Expand All @@ -9,4 +9,5 @@
"olive",
"palm",
"quince",
"redwood"
]
1 change: 1 addition & 0 deletions tutor/commands/upgrade/compose.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ def upgrade_from(context: click.Context, from_release: str) -> None:

if running_release == "quince":
upgrade_from_quince(context, config)
running_release = "redwood"


def upgrade_from_ironwood(context: click.Context, config: Config) -> None:
Expand Down
1 change: 1 addition & 0 deletions tutor/commands/upgrade/k8s.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ def upgrade_from(context: click.Context, from_release: str) -> None:

if running_release == "quince":
upgrade_from_quince(config)
running_release = "redwood"


def upgrade_from_ironwood(config: Config) -> None:
Expand Down
1 change: 1 addition & 0 deletions tutor/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,7 @@ def get_release(version: str) -> str:
"15": "olive",
"16": "palm",
"17": "quince",
"18": "redwood",
}[version.split(".", maxsplit=1)[0]]


Expand Down
2 changes: 1 addition & 1 deletion tutor/templates/build/openedx/revisions.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
EDX_PLATFORM_REVISION: quince
EDX_PLATFORM_REVISION: redwood
2 changes: 1 addition & 1 deletion tutor/templates/config/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ OPENEDX_LMS_UWSGI_WORKERS: 2
OPENEDX_MYSQL_DATABASE: "openedx"
OPENEDX_MYSQL_USERNAME: "openedx"
# the common version will be automatically set to "master" in the nightly branch
OPENEDX_COMMON_VERSION: "open-release/quince.3"
OPENEDX_COMMON_VERSION: "open-release/redwood.1"
OPENEDX_EXTRA_PIP_REQUIREMENTS: []
MYSQL_HOST: "mysql"
MYSQL_PORT: 3306
Expand Down

0 comments on commit 6f6714e

Please sign in to comment.