Plone 6.0.7 (#1706)

* Upgrade to Plone 6.0.7 * Update documentation tests after upgrade to Plone 6.0.7 * Upgrade requirements to Plone 6.0.7 as well * Add towncrier entry * comment out sphinxbuilder and sphinx-python on base.cfg to debug GHA * Upgrade from Plone 5.2.12 to 5.2.14 * No need to pin plone.rest to 3.0.0 for Plone 5.2 any longer * Re-add plone.rest pin to version 3. * Pass content_type when updating portrait --------- Co-authored-by: David Glick <david@glicksoftware.com>
plone · Sep 21, 2023 · 4398aad · 4398aad
1 parent 5f44c23
commit 4398aad
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/base.cfg b/base.cfg
@@ -9,8 +9,8 @@ parts =
     dependencies
     update-translations
     find-untranslated
-    sphinxbuilder
-    sphinx-python
+#    sphinxbuilder
+#    sphinx-python
     deploy-to-heroku
     omelette
     zpretty

diff --git a/news/1706.internal b/news/1706.internal
@@ -0,0 +1 @@
+- Upgrade buildout: Plone 6.0.6 -> 6.0.7 and Plone 5.2.12 -> 5.2.14 @tisto
diff --git a/plone-5.2.x.cfg b/plone-5.2.x.cfg
@@ -1,10 +1,10 @@
 [buildout]
 extends =
-    https://dist.plone.org/release/5.2.12/versions.cfg
+    https://dist.plone.org/release/5.2.14/versions.cfg
     base.cfg
 
 [versions]
 black = 22.3.0
 
-# Use the newest plone.rest
-plone.rest = 3.0.0
+# we need the newest plone.rest release
+plone.rest = 3.0.1
diff --git a/plone-6.0.x.cfg b/plone-6.0.x.cfg
@@ -1,6 +1,6 @@
 [buildout]
 extends =
-    https://dist.plone.org/release/6.0.6/versions.cfg
+    https://dist.plone.org/release/6.0.7/versions.cfg
     base.cfg
 
 [buildout:python37]

diff --git a/requirements-5.2.txt b/requirements-5.2.txt
@@ -1,2 +1,2 @@
--r https://dist.plone.org/release/5.2.12/requirements.txt
+-r https://dist.plone.org/release/5.2.14/requirements.txt
 zpretty
diff --git a/requirements-6.0.txt b/requirements-6.0.txt
@@ -1 +1 @@
--r https://dist.plone.org/release/6.0.6/requirements.txt
+-r https://dist.plone.org/release/6.0.7/requirements.txt
diff --git a/src/plone/restapi/services/users/update.py b/src/plone/restapi/services/users/update.py
@@ -185,6 +185,6 @@ def set_member_portrait(self, user, portrait):
             # frontend
             scaled = data
 
-        portrait = Image(id=safe_id, file=scaled, title="")
+        portrait = Image(id=safe_id, file=scaled, title="", content_type=content_type)
         membertool = getToolByName(self, "portal_memberdata")
         membertool._setPortrait(portrait, safe_id)
diff --git a/src/plone/restapi/tests/http-examples/registry_get_list.resp b/src/plone/restapi/tests/http-examples/registry_get_list.resp
@@ -6,7 +6,7 @@ Content-Type: application/json
     "batching": {
         "@id": "http://localhost:55001/plone/@registry",
         "first": "http://localhost:55001/plone/@registry?b_start=0",
-        "last": "http://localhost:55001/plone/@registry?b_start=2850",
+        "last": "http://localhost:55001/plone/@registry?b_start=2950",
         "next": "http://localhost:55001/plone/@registry?b_start=25"
     },
     "items": [
@@ -423,5 +423,5 @@ Content-Type: application/json
             "value": "The person that created an item"
         }
     ],
-    "items_total": 2875
+    "items_total": 2972
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Upgrade buildout: Plone 6.0.6 -> 6.0.7 and Plone 5.2.12 -> 5.2.14 @tisto
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		-r https://dist.plone.org/release/6.0.6/requirements.txt
		-r https://dist.plone.org/release/6.0.7/requirements.txt