From 1dc6bb8ade6b8d8d913ef9e2e3ea9be813e58b32 Mon Sep 17 00:00:00 2001 From: beto Fandino Date: Thu, 14 May 2026 18:11:12 -0400 Subject: [PATCH 1/5] feat: support verawood release --- .github/workflows/ci.yml | 2 +- pyproject.toml | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d9735f..3c0fbda 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.10", "3.11", "3.12", "3.13"] + python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"] steps: - name: Checkout repository uses: actions/checkout@v6 diff --git a/pyproject.toml b/pyproject.toml index d65dccc..58c192d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "tutor-contrib-drydock" -version = "21.2.0" +version = "22.0.0" description = "A Tutor plugin to manage our opinionated Open edX operations" readme = "README.md" requires-python = ">=3.10" @@ -18,9 +18,10 @@ classifiers = [ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", ] dependencies = [ - "tutor~=21.0" + "tutor @ git+https://github.com/overhangio/tutor@59264ca9f9c6a8e67622ae72080684ffc6ec7e2a" ] [project.urls] @@ -73,9 +74,9 @@ dev = [ ] test = [ "tutor-contrib-s3", - "tutor-forum~=21.0", - "tutor-mfe~=21.0", - "tutor-minio~=21.0", - "tutor-notes~=21.0", + "tutor-mfe @ git+https://github.com/overhangio/tutor-mfe@d0804c2590431780d3a0ed6d24701c20eef5a86d", + "tutor-minio @ git+https://github.com/overhangio/tutor-minio@b05d1f37875789ec6abe9641a05fda1139fd45ed", + "tutor-notes @ git+https://github.com/overhangio/tutor-notes@2cfe80f82dde6e794782d0484a7b1bf6af9296f2", + "tutor-forum @ git+https://github.com/overhangio/tutor-forum@3ecb05cc6aa525554995d37be1077c53d7833ac4", ] From 108a528504797ae0c09c71c683dc9edcdb10de2d Mon Sep 17 00:00:00 2001 From: beto Fandino Date: Tue, 19 May 2026 04:15:24 -0400 Subject: [PATCH 2/5] feat: added release in the changelog --- CHANGELOG.md | 7 +++++++ pyproject.toml | 4 ++-- uv.lock | 43 +++++++++++++++++++------------------------ 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a29d5a0..076b3f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,13 @@ See the fragment files in the [changelog.d/ directory](./changelog.d). + +## 22.0.0 — 2026-05-19 + +### Added + +- Support for the verawood release + ## 21.2.0 — 2026-04-24 diff --git a/pyproject.toml b/pyproject.toml index 58c192d..688ce96 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,7 +60,7 @@ module-root = "." module-name = "drydock" [tool.uv.sources] -tutor-contrib-s3 = { git = "https://github.com/cleura/tutor-contrib-s3", tag = "v2.5.0" } +tutor-contrib-s3 = { git = "https://github.com/eduNEXT/tutor-contrib-s3", tag = "5dc1c06d96b337109f7ca96eda41529a7f22e0e0" } [build-system] requires = ["uv_build>=0.9.5,<0.10.0"] @@ -73,7 +73,7 @@ dev = [ "ty>=0.0.1a29", ] test = [ - "tutor-contrib-s3", + "tutor-contrib-s3 @ git+https://github.com/eduNEXT/tutor-contrib-s3@5dc1c06d96b337109f7ca96eda41529a7f22e0e0", "tutor-mfe @ git+https://github.com/overhangio/tutor-mfe@d0804c2590431780d3a0ed6d24701c20eef5a86d", "tutor-minio @ git+https://github.com/overhangio/tutor-minio@b05d1f37875789ec6abe9641a05fda1139fd45ed", "tutor-notes @ git+https://github.com/overhangio/tutor-notes@2cfe80f82dde6e794782d0484a7b1bf6af9296f2", diff --git a/uv.lock b/uv.lock index e1413b7..50068b7 100644 --- a/uv.lock +++ b/uv.lock @@ -769,8 +769,8 @@ wheels = [ [[package]] name = "tutor" -version = "21.0.3" -source = { registry = "https://pypi.org/simple" } +version = "22.0.0" +source = { git = "https://github.com/overhangio/tutor?rev=59264ca9f9c6a8e67622ae72080684ffc6ec7e2a#59264ca9f9c6a8e67622ae72080684ffc6ec7e2a" } dependencies = [ { name = "appdirs" }, { name = "click" }, @@ -784,11 +784,10 @@ dependencies = [ { name = "pyyaml" }, { name = "typing-extensions" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/f6/b6/90f14ec223a1e3c14e753762582a91e5d1d050e352f4dcd788d73025f2b4/tutor-21.0.3.tar.gz", hash = "sha256:7aa2382b59b0c774902b8c1bffad6d7a7f96902c88b7cde9705bce408ab4cafb", size = 112992, upload-time = "2026-04-10T05:07:11.029Z" } [[package]] name = "tutor-contrib-drydock" -version = "21.2.0" +version = "22.0.0" source = { editable = "." } dependencies = [ { name = "tutor" }, @@ -809,7 +808,7 @@ test = [ ] [package.metadata] -requires-dist = [{ name = "tutor", specifier = "~=21.0" }] +requires-dist = [{ name = "tutor", git = "https://github.com/overhangio/tutor?rev=59264ca9f9c6a8e67622ae72080684ffc6ec7e2a" }] [package.metadata.requires-dev] dev = [ @@ -818,56 +817,52 @@ dev = [ { name = "ty", specifier = ">=0.0.1a29" }, ] test = [ - { name = "tutor-contrib-s3", git = "https://github.com/cleura/tutor-contrib-s3?tag=v2.5.0" }, - { name = "tutor-forum", specifier = "~=21.0" }, - { name = "tutor-mfe", specifier = "~=21.0" }, - { name = "tutor-minio", specifier = "~=21.0" }, - { name = "tutor-notes", specifier = "~=21.0" }, + { name = "tutor-contrib-s3", git = "https://github.com/eduNEXT/tutor-contrib-s3?tag=5dc1c06d96b337109f7ca96eda41529a7f22e0e0" }, + { name = "tutor-forum", git = "https://github.com/overhangio/tutor-forum?rev=3ecb05cc6aa525554995d37be1077c53d7833ac4" }, + { name = "tutor-mfe", git = "https://github.com/overhangio/tutor-mfe?rev=d0804c2590431780d3a0ed6d24701c20eef5a86d" }, + { name = "tutor-minio", git = "https://github.com/overhangio/tutor-minio?rev=b05d1f37875789ec6abe9641a05fda1139fd45ed" }, + { name = "tutor-notes", git = "https://github.com/overhangio/tutor-notes?rev=2cfe80f82dde6e794782d0484a7b1bf6af9296f2" }, ] [[package]] name = "tutor-contrib-s3" -version = "2.5.0" -source = { git = "https://github.com/cleura/tutor-contrib-s3?tag=v2.5.0#6138badaaadea4099f0176dca311523e55d018bd" } +version = "0.1.dev92+g5dc1c06d9" +source = { git = "https://github.com/eduNEXT/tutor-contrib-s3?tag=5dc1c06d96b337109f7ca96eda41529a7f22e0e0#5dc1c06d96b337109f7ca96eda41529a7f22e0e0" } dependencies = [ { name = "tutor" }, ] [[package]] name = "tutor-forum" -version = "21.0.0" -source = { registry = "https://pypi.org/simple" } +version = "22.0.0" +source = { git = "https://github.com/overhangio/tutor-forum?rev=3ecb05cc6aa525554995d37be1077c53d7833ac4#3ecb05cc6aa525554995d37be1077c53d7833ac4" } dependencies = [ { name = "tutor" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/98/7c/9098960807812deafe6f9b95a06f3790a7a6e47f4a1f1215da69dc2bfe57/tutor_forum-21.0.0.tar.gz", hash = "sha256:00aa7c31b1d1563ae99ef567c34900f0b9fb859a6d2dd6a33d6e03d0fbefe758", size = 16746, upload-time = "2026-01-16T13:36:08.109Z" } [[package]] name = "tutor-mfe" -version = "21.0.0" -source = { registry = "https://pypi.org/simple" } +version = "22.0.0" +source = { git = "https://github.com/overhangio/tutor-mfe?rev=d0804c2590431780d3a0ed6d24701c20eef5a86d#d0804c2590431780d3a0ed6d24701c20eef5a86d" } dependencies = [ { name = "tutor" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/29/51/591e2608026176c10a4b01fdd6e637324d1158e35f3b54aabe3214cb9d33/tutor_mfe-21.0.0.tar.gz", hash = "sha256:2a266d9554cbeeb2ac01391071308c14cd5a78b39f9407f088e28373a3870b17", size = 44352, upload-time = "2026-01-16T11:55:17.916Z" } [[package]] name = "tutor-minio" -version = "21.0.0" -source = { registry = "https://pypi.org/simple" } +version = "22.0.0" +source = { git = "https://github.com/overhangio/tutor-minio?rev=b05d1f37875789ec6abe9641a05fda1139fd45ed#b05d1f37875789ec6abe9641a05fda1139fd45ed" } dependencies = [ { name = "tutor" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/99/44/e9ba846ecb82fad051aac19d886a6de1823d61f47b2147aeb3ce8f7942ad/tutor_minio-21.0.0.tar.gz", hash = "sha256:ef2f68c9efbf58b06b1e0e0c27b8ceba5638a1e44ee09c06cf4823291a9133c0", size = 18692, upload-time = "2026-01-16T13:47:52.994Z" } [[package]] name = "tutor-notes" -version = "21.0.0" -source = { registry = "https://pypi.org/simple" } +version = "22.0.0" +source = { git = "https://github.com/overhangio/tutor-notes?rev=2cfe80f82dde6e794782d0484a7b1bf6af9296f2#2cfe80f82dde6e794782d0484a7b1bf6af9296f2" } dependencies = [ { name = "tutor" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/1a/c6/8762e7cba916c8e8172d354e4b3474675e6b265fc62f5fa9ab8b13ac6ae5/tutor_notes-21.0.0.tar.gz", hash = "sha256:7db288c4a2d54db8564a947be6bac251feea193078851ccd405c945695e2ad0a", size = 18886, upload-time = "2026-01-16T13:24:04.004Z" } [[package]] name = "ty" From dee6ce2652229a032f48d07a5f4cdaa33bfe80c9 Mon Sep 17 00:00:00 2001 From: beto Fandino Date: Tue, 19 May 2026 14:56:18 -0400 Subject: [PATCH 3/5] fix: dependencies format --- pyproject.toml | 21 ++++++++++++++------- uv.lock | 4 ++-- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 688ce96..3a19127 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ classifiers = [ "Programming Language :: Python :: 3.14", ] dependencies = [ - "tutor @ git+https://github.com/overhangio/tutor@59264ca9f9c6a8e67622ae72080684ffc6ec7e2a" + "tutor~=22.0" ] [project.urls] @@ -59,8 +59,15 @@ entry_title_template = "file: changelog.d/scriv/entry_title.md.j2" module-root = "." module-name = "drydock" +# TODO: remove before merging [tool.uv.sources] -tutor-contrib-s3 = { git = "https://github.com/eduNEXT/tutor-contrib-s3", tag = "5dc1c06d96b337109f7ca96eda41529a7f22e0e0" } +tutor = {git = "https://github.com/overhangio/tutor", rev = "59264ca9f9c6a8e67622ae72080684ffc6ec7e2a"} # Verawood +tutor-contrib-s3 = {git = "https://github.com/eduNEXT/tutor-contrib-s3", rev = "5dc1c06d96b337109f7ca96eda41529a7f22e0e0"} # Verawood +tutor-mfe = {git = "https://github.com/overhangio/tutor-mfe", rev = "d0804c2590431780d3a0ed6d24701c20eef5a86d"} # Verawood +tutor-minio = {git = "https://github.com/overhangio/tutor-minio", rev = "b05d1f37875789ec6abe9641a05fda1139fd45ed"} # Verawood +tutor-notes = {git = "https://github.com/overhangio/tutor-notes", rev = "2cfe80f82dde6e794782d0484a7b1bf6af9296f2"} # Verawood +tutor-forum = {git = "https://github.com/overhangio/tutor-forum", rev = "3ecb05cc6aa525554995d37be1077c53d7833ac4"} # Verawood + [build-system] requires = ["uv_build>=0.9.5,<0.10.0"] @@ -73,10 +80,10 @@ dev = [ "ty>=0.0.1a29", ] test = [ - "tutor-contrib-s3 @ git+https://github.com/eduNEXT/tutor-contrib-s3@5dc1c06d96b337109f7ca96eda41529a7f22e0e0", - "tutor-mfe @ git+https://github.com/overhangio/tutor-mfe@d0804c2590431780d3a0ed6d24701c20eef5a86d", - "tutor-minio @ git+https://github.com/overhangio/tutor-minio@b05d1f37875789ec6abe9641a05fda1139fd45ed", - "tutor-notes @ git+https://github.com/overhangio/tutor-notes@2cfe80f82dde6e794782d0484a7b1bf6af9296f2", - "tutor-forum @ git+https://github.com/overhangio/tutor-forum@3ecb05cc6aa525554995d37be1077c53d7833ac4", + "tutor-contrib-s3~=22.0", + "tutor-mfe~=22.0", + "tutor-minio~=22.0", + "tutor-notes~=22.0", + "tutor-forum~=22.0", ] diff --git a/uv.lock b/uv.lock index 50068b7..2218e27 100644 --- a/uv.lock +++ b/uv.lock @@ -817,7 +817,7 @@ dev = [ { name = "ty", specifier = ">=0.0.1a29" }, ] test = [ - { name = "tutor-contrib-s3", git = "https://github.com/eduNEXT/tutor-contrib-s3?tag=5dc1c06d96b337109f7ca96eda41529a7f22e0e0" }, + { name = "tutor-contrib-s3", git = "https://github.com/eduNEXT/tutor-contrib-s3?rev=5dc1c06d96b337109f7ca96eda41529a7f22e0e0" }, { name = "tutor-forum", git = "https://github.com/overhangio/tutor-forum?rev=3ecb05cc6aa525554995d37be1077c53d7833ac4" }, { name = "tutor-mfe", git = "https://github.com/overhangio/tutor-mfe?rev=d0804c2590431780d3a0ed6d24701c20eef5a86d" }, { name = "tutor-minio", git = "https://github.com/overhangio/tutor-minio?rev=b05d1f37875789ec6abe9641a05fda1139fd45ed" }, @@ -827,7 +827,7 @@ test = [ [[package]] name = "tutor-contrib-s3" version = "0.1.dev92+g5dc1c06d9" -source = { git = "https://github.com/eduNEXT/tutor-contrib-s3?tag=5dc1c06d96b337109f7ca96eda41529a7f22e0e0#5dc1c06d96b337109f7ca96eda41529a7f22e0e0" } +source = { git = "https://github.com/eduNEXT/tutor-contrib-s3?rev=5dc1c06d96b337109f7ca96eda41529a7f22e0e0#5dc1c06d96b337109f7ca96eda41529a7f22e0e0" } dependencies = [ { name = "tutor" }, ] From e705ec4cbdc3fcaafd98cb5c31b21092a808aa66 Mon Sep 17 00:00:00 2001 From: beto Fandino Date: Tue, 26 May 2026 15:11:12 -0400 Subject: [PATCH 4/5] feat: updated rev in tool uv sources --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0b54549..0adac80 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,9 +60,9 @@ module-name = "drydock" # TODO: remove before merging [tool.uv.sources] -tutor = {git = "https://github.com/overhangio/tutor", rev = "59264ca9f9c6a8e67622ae72080684ffc6ec7e2a"} # Verawood +tutor = {git = "https://github.com/overhangio/tutor", rev = "f7e7a4c6316bc6e42ce68f8e916a72a7ca15811e"} # Verawood tutor-contrib-s3 = {git = "https://github.com/eduNEXT/tutor-contrib-s3", rev = "5dc1c06d96b337109f7ca96eda41529a7f22e0e0"} # Verawood -tutor-mfe = {git = "https://github.com/overhangio/tutor-mfe", rev = "d0804c2590431780d3a0ed6d24701c20eef5a86d"} # Verawood +tutor-mfe = {git = "https://github.com/overhangio/tutor-mfe", rev = "1547ec2787535f9b340ba87909fef2ec32a806c9"} # Verawood tutor-minio = {git = "https://github.com/overhangio/tutor-minio", rev = "b05d1f37875789ec6abe9641a05fda1139fd45ed"} # Verawood tutor-notes = {git = "https://github.com/overhangio/tutor-notes", rev = "2cfe80f82dde6e794782d0484a7b1bf6af9296f2"} # Verawood tutor-forum = {git = "https://github.com/overhangio/tutor-forum", rev = "3ecb05cc6aa525554995d37be1077c53d7833ac4"} # Verawood From 76c046be0c3a0fb72d5f49a04a91fbb7e90ddf89 Mon Sep 17 00:00:00 2001 From: beto Fandino Date: Tue, 26 May 2026 15:22:19 -0400 Subject: [PATCH 5/5] feat: updated rev in tool uv sources --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0adac80..c1b4af1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,6 +11,7 @@ authors = [ classifiers = [ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", + "License :: OSI Approved :: GNU Affero General Public License v3", "Operating System :: OS Independent", "Programming Language :: Python", "Programming Language :: Python :: 3.10", @@ -69,7 +70,7 @@ tutor-forum = {git = "https://github.com/overhangio/tutor-forum", rev = "3ecb05c [build-system] -requires = ["uv_build>=0.11.0,<0.12.0"] +requires = ["uv_build>=0.9.5,<0.10.0"] build-backend = "uv_build" [dependency-groups]