From 87c498eb276e5a1445e8a789e99d0ff16e81ca1d Mon Sep 17 00:00:00 2001
From: Dylan Jay <software@pretaweb.com>
Date: Fri, 10 Jul 2026 10:06:13 +0700
Subject: [PATCH 1/2] CI: test against Plone 6.2

plone/setup-plone resolves 6.2-latest constraints
(https://dist.plone.org/release/6.2-latest/constraints.txt returns 200),
so the matrix entry runs for real.
---
 .github/workflows/main.yml | 2 +-
 news/104.internal          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 news/104.internal

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3961092..8072677 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.13", "3.12", "3.11", "3.10"]
-        plone-version: ["6.1-latest", "6.0-latest"]
+        plone-version: ["6.2-latest", "6.1-latest", "6.0-latest"]
     with:
       python-version: ${{ matrix.python-version }}
       plone-version: ${{ matrix.plone-version }}
diff --git a/news/104.internal b/news/104.internal
new file mode 100644
index 0000000..fc0d438
--- /dev/null
+++ b/news/104.internal
@@ -0,0 +1 @@
+Test against Plone 6.2 in CI.

From dc978468d9fb22d2e800a7eab2db6806934223e3 Mon Sep 17 00:00:00 2001
From: Dylan Jay <software@pretaweb.com>
Date: Fri, 10 Jul 2026 10:12:03 +0700
Subject: [PATCH 2/2] CI: don't fail-fast; install mxdev's uv extra (tomlkit)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The 6.1/3.10 job failed with 'tomlkit is required for the uv hook' from
'uvx mxdev', and fail-fast then cancelled every other combination —
including all three 6.2 jobs this PR exists to observe.

mxdev declares tomlkit>=0.12.0 under its 'uv' extra, which bare 'uvx mxdev'
does not install. I could not reproduce the failure locally (bare mxdev
succeeds even with --isolated --no-cache), so treat the Makefile change as
'installs the extra the hook documents', not as a verified fix.
---
 .github/workflows/main.yml | 1 +
 Makefile                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8072677..46c1e07 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,6 +22,7 @@ jobs:
     needs:
       - config
     strategy:
+      fail-fast: false
       matrix:
         python-version: ["3.13", "3.12", "3.11", "3.10"]
         plone-version: ["6.2-latest", "6.1-latest", "6.0-latest"]
diff --git a/Makefile b/Makefile
index e11c90f..89157bb 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ config: instance/etc/zope.ini
 requirements-mxdev.txt: ## Generate constraints file
 	@echo "$(GREEN)==> Generate constraints file$(RESET)"
 	@echo '-c https://dist.plone.org/release/$(PLONE_VERSION)/constraints.txt' > requirements.txt
-	@uvx mxdev -c mx.ini
+	@uvx --from "mxdev[uv]" mxdev -c mx.ini
 
 $(VENV_FOLDER): requirements-mxdev.txt ## Install dependencies
 	@echo "$(GREEN)==> Install environment$(RESET)"