tutor 22.0.2__tar.gz → 22.0.3__tar.gz

{tutor-22.0.2 → tutor-22.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: tutor
-Version: 22.0.2
+Version: 22.0.3
 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/
@@ -24,7 +24,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.10
 Requires-Dist: appdirs
-Requires-Dist: click<8.3.0,>=8.0
+Requires-Dist: click>=8.4
 Requires-Dist: importlib-metadata>=7.0.1
 Requires-Dist: importlib-resources>=6.1.1
 Requires-Dist: jinja2>=2.10
@@ -41,10 +41,10 @@ Requires-Dist: attrs==26.1.0; extra == 'dev'
 Requires-Dist: backports-tarfile==1.2.0; extra == 'dev'
 Requires-Dist: build==1.4.4; extra == 'dev'
 Requires-Dist: cachetools==5.5.2; extra == 'dev'
-Requires-Dist: certifi==2025.8.3; extra == 'dev'
+Requires-Dist: certifi==2026.10.19; extra == 'dev'
 Requires-Dist: charset-normalizer==3.4.7; extra == 'dev'
 Requires-Dist: click-log==0.4.0; extra == 'dev'
-Requires-Dist: click==8.1.8; extra == 'dev'
+Requires-Dist: click==8.5.0; extra == 'dev'
 Requires-Dist: coverage==7.10.7; extra == 'dev'
 Requires-Dist: docutils==0.22.4; extra == 'dev'
 Requires-Dist: durationpy==0.10; extra == 'dev'

{tutor-22.0.2 → tutor-22.0.3}/requirements/base.in

@@ -1,6 +1,5 @@
 appdirs
-# TODO: remove 8.3.0 when https://github.com/overhangio/tutor/issues/1276 is resolved completely
-click>=8.0,<8.3.0
+click>=8.4
 jinja2>=2.10
 kubernetes
 mypy

{tutor-22.0.2 → tutor-22.0.3}/requirements/dev.txt

@@ -20,7 +20,7 @@ cachetools==5.5.2
     # via
     #   -r requirements/base.txt
     #   google-auth
-certifi==2025.8.3
+certifi==2026.10.19
     # via
     #   -r requirements/base.txt
     #   kubernetes
@@ -29,7 +29,7 @@ charset-normalizer==3.4.7
     # via
     #   -r requirements/base.txt
     #   requests
-click==8.1.8
+click==8.5.0
     # via
     #   -r requirements/base.txt
     #   click-log

{tutor-22.0.2 → tutor-22.0.3}/tutor/__about__.py

@@ -2,7 +2,7 @@ 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"
+__version__ = "22.0.3"
 
 # 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

{tutor-22.0.2 → tutor-22.0.3}/tutor/commands/config.py

@@ -12,7 +12,7 @@ from tutor import config as tutor_config
 from tutor import env, exceptions, fmt, hooks, serialize, utils
 from tutor import interactive as interactive_config
 from tutor.commands.context import Context
-from tutor.commands.params import ConfigLoaderParam
+from tutor.commands.params import ConfigLoaderParam, ParamValue
 from tutor.types import Config, ConfigValue
 
 
@@ -25,7 +25,7 @@ def config_command() -> None:
     pass
 
 
-class ConfigKeyParamType(ConfigLoaderParam):
+class ConfigKeyParamType(ConfigLoaderParam[ParamValue]):
     name = "configkey"
 
     def shell_complete(
@@ -49,7 +49,7 @@ class ConfigKeyParamType(ConfigLoaderParam):
         yield from self.config.items()
 
 
-class ConfigKeyValParamType(ConfigKeyParamType):
+class ConfigKeyValParamType(ConfigKeyParamType[tuple[str, t.Any]]):
     """
     Parser for <KEY>=<YAML VALUE> command line arguments.
     """
@@ -131,7 +131,7 @@ class ConfigListKeyValParamType(ConfigKeyValParamType):
     "--unset",
     "unset_vars",
     multiple=True,
-    type=ConfigKeyParamType(),
+    type=ConfigKeyParamType[str](),
     help="Remove a configuration value (can be used multiple times)",
 )
 @click.option(
@@ -221,7 +221,7 @@ def printroot(context: Context) -> None:
 
 
 @click.command(help="Print a configuration value")
-@click.argument("key", type=ConfigKeyParamType())
+@click.argument("key", type=ConfigKeyParamType[str]())
 @click.pass_obj
 def printvalue(context: Context, key: str) -> None:
     config = tutor_config.load(context.root)

{tutor-22.0.2 → tutor-22.0.3}/tutor/commands/images.py

@@ -88,7 +88,7 @@ def _add_core_images_to_push(
     return remote_images
 
 
-class ImageNameParam(ConfigLoaderParam):
+class ImageNameParam(ConfigLoaderParam[str]):
     """
     Convenient auto-completion of image names.
     """

{tutor-22.0.2 → tutor-22.0.3}/tutor/commands/mounts.py

@@ -12,7 +12,7 @@ from tutor.commands.context import Context
 from tutor.commands.params import ConfigLoaderParam
 
 
-class MountParamType(ConfigLoaderParam):
+class MountParamType(ConfigLoaderParam[str]):
     name = "mount"
 
     def shell_complete(

{tutor-22.0.2 → tutor-22.0.3}/tutor/commands/params.py

@@ -6,8 +6,12 @@ from tutor import config as tutor_config
 from tutor import hooks
 from tutor.types import Config
 
+# Type of the value produced by the param type `convert` method. Since click 8.4,
+# `click.ParamType` is generic and must be parameterized with that type.
+ParamValue = t.TypeVar("ParamValue")
 
-class ConfigLoaderParam(click.ParamType):
+
+class ConfigLoaderParam(click.ParamType[ParamValue]):
     """
     Convenient param child class that automatically loads the user configuration on auto-complete.
     """

{tutor-22.0.2 → tutor-22.0.3}/tutor/commands/plugins.py

@@ -19,7 +19,7 @@ from tutor.types import Config
 from .context import Context
 
 
-class PluginName(click.ParamType):
+class PluginName(click.ParamType[str]):
     """
     Convenient param type that supports autocompletion of installed plugin names.
     """
@@ -44,7 +44,7 @@ class PluginName(click.ParamType):
         return [name for name in candidates if name.startswith(incomplete)]
 
 
-class IndexPluginName(click.ParamType):
+class IndexPluginName(click.ParamType[str]):
     """
     Param type for auto-completion of plugin names found in index cache.
     """

{tutor-22.0.2 → tutor-22.0.3}/tutor/config.py

@@ -9,6 +9,11 @@ from tutor.types import Config, ConfigValue, cast_config, get_typed
 
 CONFIG_FILENAME = "config.yml"
 
+# Default value of the MEILISEARCH_URL setting. It is duplicated here from
+# config/defaults.yml because loading the configuration defaults is slow. The
+# two values are checked to be in sync by the unit tests.
+MEILISEARCH_URL_DEFAULT = "http://meilisearch:7700"
+
 
 def load(root: str) -> Config:
     """
@@ -342,3 +347,23 @@ 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_meilisearch_url(config: Config) -> None:
+    """
+    Warn the user in case Meilisearch is not run by Tutor while MEILISEARCH_URL
+    still points at the Tutor-managed instance.
+
+    Meilisearch is a required component of the Open edX platform: RUN_MEILISEARCH=false
+    does not disable it, it only indicates that it is hosted externally.
+    """
+    if get_typed(config, "RUN_MEILISEARCH", bool, True):
+        return
+    if get_typed(config, "MEILISEARCH_URL", str, "") == MEILISEARCH_URL_DEFAULT:
+        fmt.echo_alert(
+            f'Warning: RUN_MEILISEARCH=false, but MEILISEARCH_URL is still set to its default value "{MEILISEARCH_URL_DEFAULT}". '
+            "Meilisearch is a required component of the Open edX platform, so RUN_MEILISEARCH=false only means that it is hosted "
+            "externally. Set MEILISEARCH_URL to the URL of an existing, preconfigured Meilisearch instance, or set "
+            "RUN_MEILISEARCH=true to have Tutor run its own."
+        )

{tutor-22.0.2 → tutor-22.0.3}/tutor/hooks/catalog.py

@@ -287,6 +287,10 @@ class Filters:
     DOCKER_BUILD_COMMAND: Filter[list[str], []] = Filter()
 
     #: List of patches that should be inserted in a given location of the templates.
+    #: Each ``{{ patch("name") }}`` statement in the templates is replaced by the
+    #: rendered content of all the patches with the same name. See :ref:`template_patches`
+    #: for a detailed explanation and the :ref:`template patch catalog <patches>` for
+    #: the list of all available patches.
     #:
     #: :parameter list[tuple[str, str]] patches: pairs of (name, content) tuples. Use this
     #:   filter to modify the Tutor templates.
@@ -325,7 +329,7 @@ class Filters:
     #: - ``list_if``: In a list of ``(value, condition)`` tuples, return the list of ``value`` for which the ``condition`` is true.
     #: - ``long_to_base64``: Base-64 encode a long integer.
     #: - ``iter_values_named``: Yield the values of the configuration settings that match a certain pattern. Example: ``{% for value in iter_values_named(prefix="KEY", suffix="SUFFIX")%}...{% endfor %}``. By default, only non-empty values are yielded. To iterate also on empty values, pass the ``allow_empty=True`` argument.
-    #: - ``patch``: See :ref:`patches <v0_plugin_patches>`.
+    #: - ``patch``: See :ref:`template_patches`.
     #: - ``random_string``: Return a random string of the given length composed of ASCII letters and digits. Example: ``{{ 8|random_string }}``.
     #: - ``reverse_host``: Reverse a domain name (see `reference <https://en.wikipedia.org/wiki/Reverse_domain_name_notation>`__). Example: ``{{ "demo.myopenedx.com"|reverse_host }}`` is equal to "com.myopenedx.demo".
     #: - ``rsa_import_key``: Import a PEM-formatted RSA key and return the corresponding object.

{tutor-22.0.2 → tutor-22.0.3}/tutor/templates/apps/openedx/settings/lms/development.py

@@ -26,10 +26,8 @@ SESSION_COOKIE_SAMESITE = "Lax"
 # CMS authentication
 IDA_LOGOUT_URI_LIST.append("http://{{ CMS_HOST }}:8001/logout/")
 
-FEATURES["ENABLE_COURSEWARE_MICROFRONTEND"] = False
-
 # Disable enterprise integration
-FEATURES["ENABLE_ENTERPRISE_INTEGRATION"] = False
+ENABLE_ENTERPRISE_INTEGRATION = False
 SYSTEM_WIDE_ROLE_CLASSES.remove("enterprise.SystemWideEnterpriseUserRoleAssignment")
 
 LOGGING["loggers"]["oauth2_provider"] = {

{tutor-22.0.2 → tutor-22.0.3}/tutor/templates/apps/openedx/settings/partials/common_all.py

@@ -4,6 +4,14 @@ import os
 
 from xmodule.modulestore.modulestore_settings import update_module_store_settings
 
+# Re-bind the FEATURES proxy to this settings module, so that both flat feature
+# settings and legacy FEATURES["..."] reads and writes resolve here.
+try:
+    from openedx.core.lib.features_setting_proxy import FeaturesProxy
+    FEATURES = FeaturesProxy(globals())
+except ImportError:
+    pass
+
 # Mongodb connection parameters: simply modify `mongodb_parameters` to affect all connections to MongoDb.
 mongodb_parameters = {
     "db": "{{ MONGODB_DATABASE }}",
@@ -229,9 +237,9 @@ JWT_AUTH["JWT_ISSUERS"] = [
 ]
 
 # Enable/Disable some features globally
-FEATURES["ENABLE_DISCUSSION_SERVICE"] = False
-FEATURES["PREVENT_CONCURRENT_LOGINS"] = False
-FEATURES["ENABLE_CORS_HEADERS"] = True
+ENABLE_DISCUSSION_SERVICE = False
+PREVENT_CONCURRENT_LOGINS = False
+ENABLE_CORS_HEADERS = True
 
 # CORS
 CORS_ALLOW_CREDENTIALS = True

{tutor-22.0.2 → tutor-22.0.3}/tutor/templates/apps/openedx/settings/partials/common_cms.py

@@ -21,7 +21,7 @@ FRONTEND_LOGIN_URL = LMS_ROOT_URL + '/login'
 FRONTEND_REGISTER_URL = LMS_ROOT_URL + '/register'
 
 # Enable "reindex" button
-FEATURES["ENABLE_COURSEWARE_INDEX"] = True
+ENABLE_COURSEWARE_INDEX = True
 
 # Create folders if necessary
 for folder in [LOG_DIR, MEDIA_ROOT, STATIC_ROOT, ORA2_FILEUPLOAD_ROOT]:

{tutor-22.0.2 → tutor-22.0.3}/tutor/templates/apps/openedx/settings/partials/common_lms.py

@@ -21,7 +21,7 @@ OAUTH_ENFORCE_SECURE = False
 # Email settings
 DEFAULT_EMAIL_LOGO_URL = LMS_ROOT_URL + "/theming/asset/images/logo.png"
 BULK_EMAIL_SEND_USING_EDX_ACE = True
-FEATURES["ENABLE_FOOTER_MOBILE_APP_LINKS"] = False
+ENABLE_FOOTER_MOBILE_APP_LINKS = False
 
 # Branding
 MOBILE_STORE_ACE_URLS = {}
@@ -38,9 +38,9 @@ CACHES["staticfiles"] = {
 }
 
 # Enable search features
-FEATURES["ENABLE_COURSE_DISCOVERY"] = True
-FEATURES["ENABLE_COURSEWARE_SEARCH"] = True
-FEATURES["ENABLE_DASHBOARD_SEARCH"] = True
+ENABLE_COURSE_DISCOVERY = True
+ENABLE_COURSEWARE_SEARCH = True
+ENABLE_DASHBOARD_SEARCH = True
 
 # Create folders if necessary
 for folder in [DATA_DIR, LOG_DIR, MEDIA_ROOT, STATIC_ROOT, ORA2_FILEUPLOAD_ROOT]:

{tutor-22.0.2 → tutor-22.0.3}/tutor/templates/build/openedx/Dockerfile

@@ -8,10 +8,10 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
     apt update && \
-    apt install -y build-essential curl git language-pack-en
+    apt install -y build-essential ca-certificates curl git language-pack-en
 ENV LC_ALL=en_US.UTF-8
 
-COPY --from=ghcr.io/astral-sh/uv:0.9.18 /uv /usr/local/bin/uv
+COPY --from=ghcr.io/astral-sh/uv:0.13.5 /uv /usr/local/bin/uv
 ARG PIP_COMMAND="uv pip"
 
 # Constrain the build-time setuptools used in the isolated (PEP 517) build
@@ -23,6 +23,8 @@ ARG PIP_COMMAND="uv pip"
 RUN echo "setuptools==80.9.0" > /etc/openedx-build-constraints.txt
 ENV UV_BUILD_CONSTRAINT=/etc/openedx-build-constraints.txt
 ENV PIP_CONSTRAINT=/etc/openedx-build-constraints.txt
+# pip 26 no longer applies PIP_CONSTRAINT to build dependencies
+ENV PIP_BUILD_CONSTRAINT=/etc/openedx-build-constraints.txt
 
 {{ patch("openedx-dockerfile-minimal") }}
 
@@ -110,7 +112,7 @@ RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared \
     # https://pypi.org/project/setuptools/
     # https://pypi.org/project/pip/
     # https://pypi.org/project/wheel/
-    setuptools pip==24.0 wheel==0.43.0
+    setuptools pip==26.2.2 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 \
@@ -118,6 +120,11 @@ RUN --mount=type=bind,from=edx-platform,source=/requirements/edx/base.txt,target
     --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
 
+# Upgrade certifi until edx-platform pins a version without the compromised emSign roots
+# https://emudhra.we-have-a-problem.com/
+RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared \
+    $PIP_COMMAND install "certifi>=2026.10.19"
+
 # Install extra requirements
 RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared \
     $PIP_COMMAND install \
@@ -150,7 +157,7 @@ ENV PATH=/openedx/nodeenv/bin:/openedx/venv/bin:${PATH}
 # Install nodeenv with the version provided by edx-platform
 # https://github.com/openedx/edx-platform/blob/master/requirements/edx/assets.txt
 RUN $PIP_COMMAND install nodeenv==1.9.1
-RUN nodeenv /openedx/nodeenv --node=24.16.0 --prebuilt
+RUN nodeenv /openedx/nodeenv --node=24.22.1 --prebuilt
 
 # Install nodejs requirements
 ARG NPM_REGISTRY={{ NPM_REGISTRY }}
@@ -293,6 +300,9 @@ USER app
 # Install dev python requirements
 RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared \
     $PIP_COMMAND install -r requirements/edx/development.txt
+# development.txt pins the old certifi again, so upgrade it one more time
+RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared \
+    $PIP_COMMAND install "certifi>=2026.10.19"
 # 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-22.0.3}/tutor/templates/config/defaults.yml

@@ -15,7 +15,7 @@ DOCKER_REGISTRY: "docker.io/"
 DOCKER_IMAGE_OPENEDX: "{{ DOCKER_REGISTRY }}overhangio/openedx:{{ TUTOR_VERSION }}"
 DOCKER_IMAGE_OPENEDX_DEV: "openedx-dev:{{ TUTOR_VERSION }}"
 # https://hub.docker.com/_/caddy/tags
-DOCKER_IMAGE_CADDY: "docker.io/caddy:2.11.4"
+DOCKER_IMAGE_CADDY: "docker.io/caddy:2.11.7"
 # https://hub.docker.com/r/getmeili/meilisearch/tags
 DOCKER_IMAGE_MEILISEARCH: "docker.io/getmeili/meilisearch:v1.36.0"
 # https://hub.docker.com/_/mongo/tags

{tutor-22.0.2 → tutor-22.0.3}/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 → tutor-22.0.3}/tutor/templates/local/docker-compose.jobs.yml

@@ -27,6 +27,8 @@ services:
         - ../apps/openedx/settings/cms:/openedx/edx-platform/cms/envs/tutor:roz
         - ../apps/openedx/config:/openedx/config:roz
         - ../../data/lms-job:/openedx/data:z
+        - ../../data/openedx-media:/openedx/media:z
+        - ../../data/openedx-media-private:/openedx/media-private:z
         {%- for mount in iter_mounts(MOUNTS, "openedx", "lms-job") %}
         - {{ mount }}:z
         {%- endfor %}
@@ -42,6 +44,8 @@ services:
         - ../apps/openedx/settings/cms:/openedx/edx-platform/cms/envs/tutor:roz
         - ../apps/openedx/config:/openedx/config:roz
         - ../../data/cms-job:/openedx/data:z
+        - ../../data/openedx-media:/openedx/media:z
+        - ../../data/openedx-media-private:/openedx/media-private:z
         {%- for mount in iter_mounts(MOUNTS, "openedx", "cms-job") %}
         - {{ mount }}:z
         {%- endfor %}