tutor 22.0.2__tar.gz → 23.0.0.dev3185__tar.gz

{tutor-22.0.2 → tutor-23.0.0.dev3185}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: tutor
-Version: 22.0.2
+Version: 23.0.0.dev3185
 Summary: The Docker-based Open edX distribution designed for peace of mind
 Project-URL: Homepage, https://docs.tutor.edly.io/
 Project-URL: Documentation, https://docs.tutor.edly.io/
@@ -106,19 +106,6 @@ Requires-Dist: websocket-client==1.9.0; extra == 'dev'
 Requires-Dist: wheel==0.47.0; extra == 'dev'
 Requires-Dist: zipp==3.23.1; extra == 'dev'
 Provides-Extra: full
-Requires-Dist: tutor-android<23.0.0,>=22.0.0; extra == 'full'
-Requires-Dist: tutor-cairn<23.0.0,>=22.0.0; extra == 'full'
-Requires-Dist: tutor-credentials<23.0.0,>=22.0.0; extra == 'full'
-Requires-Dist: tutor-deck<23.0.0,>=22.0.0; extra == 'full'
-Requires-Dist: tutor-discovery<23.0.0,>=22.0.0; extra == 'full'
-Requires-Dist: tutor-forum<23.0.0,>=22.0.0; extra == 'full'
-Requires-Dist: tutor-indigo<23.0.0,>=22.0.0; extra == 'full'
-Requires-Dist: tutor-jupyter<23.0.0,>=22.0.0; extra == 'full'
-Requires-Dist: tutor-livedeps<23.0.0,>=22.0.0; extra == 'full'
-Requires-Dist: tutor-mfe<23.0.0,>=22.0.0; extra == 'full'
-Requires-Dist: tutor-minio<23.0.0,>=22.0.0; extra == 'full'
-Requires-Dist: tutor-notes<23.0.0,>=22.0.0; extra == 'full'
-Requires-Dist: tutor-xqueue<23.0.0,>=22.0.0; extra == 'full'
 Description-Content-Type: text/x-rst
 
 Tutor: the Docker-based Open edX distribution designed for peace of mind

{tutor-22.0.2 → tutor-23.0.0.dev3185}/pyproject.toml

@@ -42,7 +42,11 @@ Community = "https://discuss.openedx.org/tag/tutor"
 path = ".hatch_build.py"
 
 [tool.hatch.version]
+# The "code" source, and not the default regex source: on the main branch the version is
+# derived in __about__.py and cannot be read from the __version__ literal.
+source = "code"
 path = "tutor/__about__.py"
+expression = "__package_version__"
 
 [build-system]
 requires = ["hatchling"]

tutor-23.0.0.dev3185/tutor/__about__.py

@@ -0,0 +1,45 @@
+import os
+
+# Increment this version number to trigger a new release. See
+# docs/tutor.html#versioning for information on the versioning scheme.
+__version__ = "22.0.2"
+
+# 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
+# the versions from other branches. For instance: set the suffix to "main" in
+# the main branch.
+# The suffix is cleanly separated from the __version__ in this module to avoid
+# conflicts when merging branches.
+__version_suffix__ = "main"
+
+# The main branch is where the next Open edX release is prepared, so it carries the
+# version of that upcoming release. It is derived from the RELEASE number above instead
+# of being stored there, such that the __version__ line remains identical on all
+# branches and merging the release branch into main never conflicts.
+if __version_suffix__ == "main":
+    __version__ = f"{int(__version__.split('.', maxsplit=1)[0]) + 1}.0.0"
+
+# Package version, as installed by pip, does not include the version suffix.
+# Otherwise, Tutor Main plugins will automatically install non-Main Tutor
+# version.
+__package_version__ = __version__
+
+# Development releases are published to PyPI from the main branch, on every merge.
+# The dev release number is set by CI at build time. It deliberately applies to the
+# package version only: __version__ determines the Docker image tags, which must not
+# change on every commit.
+__dev_release__ = os.environ.get("TUTOR_DEV_RELEASE")
+if __dev_release__:
+    __package_version__ += f".dev{__dev_release__}"
+
+# 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
+# versions, the version suffix is also appended to the default app name.
+__default_app__ = "tutor"
+
+if __version_suffix__:
+    __version__ += "-" + __version_suffix__
+    __default_app__ += "-" + __version_suffix__
+
+# An app name set explicitly with TUTOR_APP replaces the default.
+__app__ = os.environ.get("TUTOR_APP", __default_app__)

{tutor-22.0.2 → tutor-23.0.0.dev3185}/tutor/commands/upgrade/__init__.py

@@ -1,4 +1,4 @@
-# Note: don't forget to change this when we upgrade from verawood
+# Note: don't forget to change this when we upgrade from willow
 OPENEDX_RELEASE_NAMES = [
     "ironwood",
     "juniper",
@@ -14,4 +14,5 @@ OPENEDX_RELEASE_NAMES = [
     "teak",
     "ulmo",
     "verawood",
+    "willow",
 ]

{tutor-22.0.2 → tutor-23.0.0.dev3185}/tutor/commands/upgrade/compose.py

@@ -63,6 +63,9 @@ def upgrade_from(context: click.Context, from_release: str) -> None:
     if running_release == "ulmo":
         running_release = "verawood"
 
+    if running_release == "verawood":
+        running_release = "willow"
+
 
 def upgrade_from_ironwood(context: click.Context, config: Config) -> None:
     click.echo(fmt.title("Upgrading from Ironwood"))

{tutor-22.0.2 → tutor-23.0.0.dev3185}/tutor/commands/upgrade/k8s.py

@@ -62,6 +62,9 @@ def upgrade_from(context: click.Context, from_release: str) -> None:
     if running_release == "ulmo":
         running_release = "verawood"
 
+    if running_release == "verawood":
+        running_release = "willow"
+
 
 def upgrade_from_ironwood(config: Config) -> None:
     upgrade_mongodb(config, "3.4.24", "3.4")

{tutor-22.0.2 → tutor-23.0.0.dev3185}/tutor/env.py

@@ -488,6 +488,7 @@ def get_release(version: str) -> str:
         "20": "teak",
         "21": "ulmo",
         "22": "verawood",
+        "23": "willow",
     }[version.split(".", maxsplit=1)[0]]
 
 

{tutor-22.0.2 → tutor-23.0.0.dev3185}/tutor/plugins/indexes.py

@@ -13,6 +13,8 @@ from tutor.types import Config, get_typed
 PLUGIN_INDEXES_KEY = "PLUGIN_INDEXES"
 # Current release name ('zebulon' or 'main') and version (1-26)
 RELEASE = __version_suffix__ or env.get_current_open_edx_release_name()
+# This constant is unused within Tutor itself, but it is part of the module API
+# and may be imported by plugins (REMOVE-AFTER-V23).
 MAJOR_VERSION = int(__version__.split(".", maxsplit=1)[0])
 
 

{tutor-22.0.2 → tutor-23.0.0.dev3185}/tutor/templates/build/openedx/Dockerfile

@@ -113,10 +113,10 @@ RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared \
     setuptools pip==24.0 wheel==0.43.0
 
 # Install base requirements and asset-building requirements
-RUN --mount=type=bind,from=edx-platform,source=/requirements/edx/base.txt,target=/openedx/edx-platform/requirements/edx/base.txt \
-    --mount=type=bind,from=edx-platform,source=/requirements/edx/assets.txt,target=/openedx/edx-platform/requirements/edx/assets.txt \
+RUN --mount=type=bind,from=edx-platform,source=/pyproject.toml,target=/openedx/edx-platform/pyproject.toml \
+    --mount=type=bind,from=edx-platform,source=/uv.lock,target=/openedx/edx-platform/uv.lock \
     --mount=type=cache,target=/openedx/.cache/pip,sharing=shared \
-    $PIP_COMMAND install -r /openedx/edx-platform/requirements/edx/base.txt -r /openedx/edx-platform/requirements/edx/assets.txt
+    cd /openedx/edx-platform && uv sync --frozen --no-default-groups --group bundled --group assets --no-install-project --active
 
 # Install extra requirements
 RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared \
@@ -292,7 +292,8 @@ USER app
 
 # Install dev python requirements
 RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared \
-    $PIP_COMMAND install -r requirements/edx/development.txt
+    uv export --frozen --no-hashes --no-default-groups --group development | \
+    $PIP_COMMAND install -r /dev/stdin
 # https://pypi.org/project/ipdb/
 # https://pypi.org/project/ipython (>=Python 3.10 started with 8.20)
 RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared \

{tutor-22.0.2 → tutor-23.0.0.dev3185}/tutor/templates/jobs/init/mysql.sh

@@ -16,6 +16,12 @@ echo "MySQL is up and running"
 
 # edx-platform database
 mysql -u {{ MYSQL_ROOT_USERNAME }} --password="{{ MYSQL_ROOT_PASSWORD }}" --host "{{ MYSQL_HOST }}" --port {{ MYSQL_PORT }} -e "CREATE DATABASE IF NOT EXISTS {{ OPENEDX_MYSQL_DATABASE }};"
-mysql -u {{ MYSQL_ROOT_USERNAME }} --password="{{ MYSQL_ROOT_PASSWORD }}" --host "{{ MYSQL_HOST }}" --port {{ MYSQL_PORT }} -e "CREATE USER IF NOT EXISTS '{{ OPENEDX_MYSQL_USERNAME }}';"
+# This command may fail if the specified user has created a custom view, such
+# as is done in the enterprise app.
+#
+# Yes, even 'if not exists' does not prevent this. :/
+# https://bugs.mysql.com/bug.php?id=107139
+mysql -u {{ MYSQL_ROOT_USERNAME }} --password="{{ MYSQL_ROOT_PASSWORD }}" --host "{{ MYSQL_HOST }}" --port {{ MYSQL_PORT }} -e "CREATE USER IF NOT EXISTS '{{ OPENEDX_MYSQL_USERNAME }}';" || true
+# If the user truly doesn't exist, we'll get an error here.
 mysql -u {{ MYSQL_ROOT_USERNAME }} --password="{{ MYSQL_ROOT_PASSWORD }}" --host "{{ MYSQL_HOST }}" --port {{ MYSQL_PORT }} -e "ALTER USER '{{ OPENEDX_MYSQL_USERNAME }}'@'%' IDENTIFIED BY '{{ OPENEDX_MYSQL_PASSWORD }}';"
 mysql -u {{ MYSQL_ROOT_USERNAME }} --password="{{ MYSQL_ROOT_PASSWORD }}" --host "{{ MYSQL_HOST }}" --port {{ MYSQL_PORT }} -e "GRANT ALL ON {{ OPENEDX_MYSQL_DATABASE }}.* TO '{{ OPENEDX_MYSQL_USERNAME }}'@'%';"

tutor-22.0.2/requirements/plugins.txt

@@ -1,14 +0,0 @@
-# change version ranges when upgrading from verawood
-tutor-android>=22.0.0,<23.0.0
-tutor-cairn>=22.0.0,<23.0.0
-tutor-credentials>=22.0.0,<23.0.0
-tutor-deck>=22.0.0,<23.0.0
-tutor-discovery>=22.0.0,<23.0.0
-tutor-forum>=22.0.0,<23.0.0
-tutor-indigo>=22.0.0,<23.0.0
-tutor-jupyter>=22.0.0,<23.0.0
-tutor-livedeps>=22.0.0,<23.0.0
-tutor-mfe>=22.0.0,<23.0.0
-tutor-minio>=22.0.0,<23.0.0
-tutor-notes>=22.0.0,<23.0.0
-tutor-xqueue>=22.0.0,<23.0.0

tutor-22.0.2/tutor/__about__.py

@@ -1,28 +0,0 @@
-import os
-
-# Increment this version number to trigger a new release. See
-# docs/tutor.html#versioning for information on the versioning scheme.
-__version__ = "22.0.2"
-
-# 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
-# the versions from other branches. For instance: set the suffix to "main" in
-# the main branch.
-# The suffix is cleanly separated from the __version__ in this module to avoid
-# conflicts when merging branches.
-__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
-# versions, if it is defined the version suffix will also be appended to the app
-# name.
-__app__ = os.environ.get("TUTOR_APP", "tutor")
-
-# Package version, as installed by pip, does not include the version suffix.
-# Otherwise, Tutor Main plugins will automatically install non-Main Tutor
-# version.
-__package_version__ = __version__
-
-if __version_suffix__:
-    __version__ += "-" + __version_suffix__
-    __app__ += "-" + __version_suffix__