Merge remote-tracking branch 'origin/master' into nightly

changelog.d/20230316_113639_regis_fix_yaml_patch_ordering.md

@@ -0,0 +1 @@
+- [Bugfix] Make sure that v0 plugin patches are applied in the same order as plugins are listed. (by @regisb)

tests/test_plugins_v0.py

@@ -86,7 +86,7 @@ class PluginsTests(PluginsTestCase):
         plugins_v0.DictPlugin(
             {"name": "plugin1", "patches": {"patch1": "Hello {{ ID }}"}}
         )
-        plugins.load("plugin1")
+        plugins.load_all(["plugin1"])
         patches = list(plugins.iter_patches("patch1"))
         self.assertEqual(["Hello {{ ID }}"], patches)
 

tutor/plugins/v0.py

@@ -146,7 +146,7 @@ class BasePlugin:
                 raise exceptions.TutorError(
                     f"Invalid patch '{patch_name}' in plugin {self.name}. Expected str, got {content.__class__}."
                 )
-            hooks.Filters.ENV_PATCH(patch_name).add_item(content)
+            hooks.Filters.ENV_PATCHES.add_item((patch_name, content))
 
     def _load_tasks(self) -> None:
         """