From 2d645a8cec88a112d984b4eb62ee907b00fb981c Mon Sep 17 00:00:00 2001
From: Laurent Lasudry <lasudry@gmail.com>
Date: Wed, 7 Oct 2026 15:05:49 +0200
Subject: [PATCH 1/3] Fix checkbox label displaying twice in masterselect

---
 src/plone/formwidget/masterselect/widget.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/plone/formwidget/masterselect/widget.py b/src/plone/formwidget/masterselect/widget.py
index 7a871dc..85abbed 100644
--- a/src/plone/formwidget/masterselect/widget.py
+++ b/src/plone/formwidget/masterselect/widget.py
@@ -135,6 +135,17 @@ class MasterSelectBoolWidget(checkbox.SingleCheckBoxWidget, MasterSelect):
 
     klass = "masterselect-widget"
 
+    @property
+    def label(self):
+        # the single checkbox renders the title itself
+        if self.mode == "input":
+            return ""
+        return getattr(self, "_label", "")
+
+    @label.setter
+    def label(self, value):
+        self._label = value
+
 
 @implementer(IMasterSelectRadioWidget)
 class MasterSelectRadioWidget(radio.RadioWidget, MasterSelect):

From ec596fff1e3b336c5e070e5f035c3c9555f4e6e6 Mon Sep 17 00:00:00 2001
From: Laurent Lasudry <lasudry@gmail.com>
Date: Wed, 7 Oct 2026 15:45:43 +0200
Subject: [PATCH 2/3] Fix buildout

---
 test-6.0.cfg | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test-6.0.cfg b/test-6.0.cfg
index fbdb8a1..8e29764 100644
--- a/test-6.0.cfg
+++ b/test-6.0.cfg
@@ -16,6 +16,9 @@ jedi = 0.18.1
 parso = 0.8.3
 pdbp = 1.7.0
 
+# httpcore 1.* requires h11>=0.16
+h11 = 0.16.0
+
 # Required by:
 # ipdb
 asttokens = 2.0.8

From 4ee6bf8a58848c6467f3abfea346846e4ea193b1 Mon Sep 17 00:00:00 2001
From: Laurent Lasudry <lasudry@gmail.com>
Date: Thu, 8 Oct 2026 09:41:14 +0200
Subject: [PATCH 3/3] Fix buildout

---
 Makefile     |  4 +---
 test-6.0.cfg | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 8bbec36..d3890a4 100644
--- a/Makefile
+++ b/Makefile
@@ -40,10 +40,9 @@ all: buildout
 help:
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n\nTargets:\n"} /^[a-zA-Z_-]+:.*?##/ { printf "  \033[36m%-10s\033[0m %s\n", $$1, $$2 }' $(MAKEFILE_LIST)
 
-<<<<<<< HEAD
 .installed.cfg: bin/buildout *.cfg
 	bin/buildout
-=======
+
 .python-version:  ## Setups pyenv version
 	@pyenv local `pyenv versions |grep "  $(python)" |tail -1 |xargs`
 	@echo "Local pyenv version is `cat .python-version`"
@@ -54,7 +53,6 @@ bin/buildout: .python-version  ## Setups environment
 	./bin/pip install --upgrade pip
 	./bin/pip install -r requirements-$(plone).txt
 	@echo "$(plone)" > .plone-version
->>>>>>> 261a812 (Update buildout to Plone 6.1)
 
 .PHONY: setup
 setup: oneof-plone backup cleanall bin/buildout restore  ## Setups environment
diff --git a/test-6.0.cfg b/test-6.0.cfg
index 8e29764..1574376 100644
--- a/test-6.0.cfg
+++ b/test-6.0.cfg
@@ -19,6 +19,9 @@ pdbp = 1.7.0
 # httpcore 1.* requires h11>=0.16
 h11 = 0.16.0
 
+# some dependency requires typing_extensions>=4.16.0
+typing-extensions = 4.16.0
+
 # Required by:
 # ipdb
 asttokens = 2.0.8
@@ -31,3 +34,29 @@ ptyprocess = 0.7.0
 pure-eval = 0.2.2
 stack-data = 0.5.1
 traitlets = 5.4.0
+
+# Added by buildout at 2026-10-08 09:08:52.208870
+build = 1.6.1
+coverage = 7.16.2
+createcoverage = 1.5
+flake8 = 7.4.1
+flake8-isort = 7.0.0
+httpx = 0.28.1
+i18ndude = 6.3.0
+isort = 9.0.2
+mccabe = 0.7.0
+mypy-extensions = 1.1.0
+plone.recipe.codeanalysis = 3.0.1
+plone.versioncheck = 2.0.2
+pycodestyle = 2.15.0
+pyflakes = 4.0.3
+pyproject-hooks = 1.3.3
+tabcompleter = 1.4.1
+
+# Required by:
+# httpx==0.28.1
+anyio = 4.15.1
+
+# Required by:
+# plone.recipe.codeanalysis==3.0.1
+check-manifest = 0.51