Merge branch 'main' into plone-6.1

plone · May 16, 2024 · 0808aa0 · 0808aa0
2 parents 3264fcf + 487ae21
commit 0808aa0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/.python-version b/.python-version
@@ -0,0 +1 @@
+3.9
diff --git a/requirements-6.0.txt b/requirements-6.0.txt
@@ -1 +1 @@
--r https://dist.plone.org/release/6.1.0a3/requirements.txt
+-r https://dist.plone.org/release/6.0.11.1/requirements.txt
diff --git a/requirements-6.1.txt b/requirements-6.1.txt
@@ -1 +1 @@
--r https://dist.plone.org/release/6.0.11.1/requirements.txt
+-r https://dist.plone.org/release/6.1.0a3/requirements.txt
diff --git a/src/plone/restapi/tests/http-examples/registry_get_list.resp b/src/plone/restapi/tests/http-examples/registry_get_list.resp
@@ -242,7 +242,7 @@ Content-Type: application/json
             "schema": {
                 "properties": {
                     "default": "disabled",
-                    "description": "Use this setting to enable or disable Captcha validation for comments. Install plone.formwidget.captcha, plone.formwidget.recaptcha, collective.akismet, or collective.z3cform.norobots if there are no options available.",
+                    "description": "Use this setting to enable or disable Captcha validation for comments. Install plone.formwidget.captcha, plone.formwidget.recaptcha, plone.formwidget.hcaptcha, collective.akismet, or collective.z3cform.norobots if there are no options available.",
                     "factory": "Choice",
                     "title": "Captcha",
                     "type": "string",
@@ -423,5 +423,5 @@ Content-Type: application/json
             "value": "The person that created an item"
         }
     ],
-    "items_total": 2972
+    "items_total": 2973
 }
diff --git a/src/plone/restapi/tests/http-examples/translated_messages_addons.resp b/src/plone/restapi/tests/http-examples/translated_messages_addons.resp
@@ -27,7 +27,7 @@ Content-Type: application/json
             "upgrade_info": {
                 "available": false,
                 "hasProfile": true,
-                "installedVersion": "2.0.0",
+                "installedVersion": "3.0.0",
                 "newVersion": "1.2.3",
                 "required": true
             },
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		-r https://dist.plone.org/release/6.1.0a3/requirements.txt
		-r https://dist.plone.org/release/6.0.11.1/requirements.txt