Merge branch 'master' into gforcada-patch-1

plone · Feb 19, 2024 · 766896e · 766896e
2 parents 4f8b4d3 + 633e7f3
commit 766896e
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 23 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -15,6 +15,30 @@
 
 <!-- towncrier release notes start -->
 
+## 6.1.0a1 (2024-01-26)
+
+
+### Bug fixes:
+
+- Make PloneSite have IContentish again. @Akshat2Jain @jaroel #3833
+- Fix problem when adding a Plone site with a custom INonInstallable utility without a getNonInstallableProfiles method.
+
+  Fixes: #3862. #3862
+- Update `@@test-rendering-cheatsheet` to Bootstrap 5.3 features including color mode switcher.
+  [petschki] #3870
+- Corrected the name in a button and help text to "Classic UI" when creating a Plone site. @1letter #3873
+- Correct the behavior interface for lead image in the syndication adapter.
+  [thet] #3875
+- Change adapts to @adapter decorator.
+  [thet] #3876
+- Handle catalog queries with parenthesis inside quotes
+  [erral] #3879
+- Deprecate `get_production_resource_directory` since it is not used anywhere in core.
+  [@jensens] #3887
+- Add data-bundle="diazo" back, for backward compatibility with backend.xml (Classic UI).
+  Add a data-bundle="plonecustomcss" also for @@custom.css stylesheet
+  [yurj] #3890
+
 ## 6.1.0a1.dev0 (2023-10-18)
 
 

diff --git a/Products/CMFPlone/profiles/default/metadata.xml b/Products/CMFPlone/profiles/default/metadata.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metadata>
-  <version>6100</version>
+  <version>6101</version>
 </metadata>
diff --git a/Products/CMFPlone/tests/robot/test_linkintegrity.robot b/Products/CMFPlone/tests/robot/test_linkintegrity.robot
@@ -77,15 +77,14 @@ a link in rich text
   Click Button  css=button[aria-label="Insert/edit link"]
 
   Given patterns are loaded
-  # Somehow this does not work:
-  # Wait For Then Click Element  css=.pat-relateditems .select2-input.select2-default
   Wait until element is visible  css=.pat-relateditems .select2-input.select2-default
   Click Element  css=.pat-relateditems .select2-input.select2-default
   Wait until element is visible  css=.pat-relateditems-result.one-level-up a.pat-relateditems-result-browse
   Click Element  css=.pat-relateditems-result.one-level-up a.pat-relateditems-result-browse
   Wait until element is visible  xpath=(//span[contains(., 'Foo')])
+  Sleep  2s
   Click Element  xpath=(//span[contains(., 'Foo')])
-  Wait until page contains  Foo
+  Wait until element is visible  css=.pat-relateditems-item-title
   Wait For Then Click Element  css=.modal-footer .btn-primary
   Wait For Then Click Element  css=#form-buttons-save
 

diff --git a/news/3833.bugfix b/news/3833.bugfix
diff --git a/news/3862.bugfix b/news/3862.bugfix
diff --git a/news/3870.bugfix b/news/3870.bugfix
diff --git a/news/3873.bugfix b/news/3873.bugfix
diff --git a/news/3875.bugfix b/news/3875.bugfix
diff --git a/news/3876.bugfix b/news/3876.bugfix
diff --git a/news/3879.bugfix b/news/3879.bugfix
diff --git a/news/3887.bugfix b/news/3887.bugfix
diff --git a/news/3890.bugfix b/news/3890.bugfix
diff --git a/news/3902.internal b/news/3902.internal
@@ -0,0 +1 @@
+Fix robot test "When page is linked show warning". @wesleybl
diff --git a/news/6101.bugfix b/news/6101.bugfix
@@ -0,0 +1,2 @@
+Updated metadata version to 6101.
+[maurits]
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup
 
 
-version = "6.1.0a1.dev1"
+version = "6.1.0a2.dev0"
 
 
 setup(
@@ -25,6 +25,7 @@
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
     ],
     python_requires=">=3.8",
     keywords="Plone CMF Python Zope CMS Webapplication",