-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Branch: refs/heads/main Date: 2021-12-06T11:35:33-03:00 Author: Érico Andrei (ericof) <ericof@gmail.com> Commit: plone/plone.volto@2102edd Support Plone 6.0.0a2 Files changed: M .github/workflows/tests.yml M CHANGES.rst M Makefile M plone-5.2.x.cfg M plone-6.0.x.cfg M requirements/plone-6.0.txt Repository: plone.volto Branch: refs/heads/main Date: 2021-12-06T16:32:23+01:00 Author: Érico Andrei (ericof) <ericof@gmail.com> Commit: plone/plone.volto@c1b58a4 Merge pull request #34 from plone/upgrade-plone-6.0.0a2 Support Plone 6.0.0a2 Files changed: M .github/workflows/tests.yml M CHANGES.rst M Makefile M plone-5.2.x.cfg M plone-6.0.x.cfg M requirements/plone-6.0.txt
- Loading branch information
Showing
1 changed file
with
34 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,42 @@ | ||
| Repository: plone.app.layout | ||
| Repository: plone.volto | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2021-12-06T09:19:51+01:00 | ||
| Author: Johannes Raggam (thet) <thetetet@gmail.com> | ||
| Commit: https://github.com/plone/plone.app.layout/commit/7e2178d2ae11780d9211c71d8c97e4f81cd27620 | ||
| Branch: refs/heads/main | ||
| Date: 2021-12-06T11:35:33-03:00 | ||
| Author: Érico Andrei (ericof) <ericof@gmail.com> | ||
| Commit: https://github.com/plone/plone.volto/commit/2102edde3eb11f363f5d5a0f2490ecf53adc185b | ||
|
|
||
| Global sections viewlet performance optimizations: | ||
| Support Plone 6.0.0a2 | ||
|
|
||
| - Remove pointless caching on types_using_view, | ||
| - Store settings in variable for multiple access, bypassing cache checks, | ||
| - Remove now pointless caching on settings property, | ||
| - Deprecate now unused navtree_depth property. | ||
| Files changed: | ||
| M .github/workflows/tests.yml | ||
| M CHANGES.rst | ||
| M Makefile | ||
| M plone-5.2.x.cfg | ||
| M plone-6.0.x.cfg | ||
| M requirements/plone-6.0.txt | ||
|
|
||
| b'diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml\nindex 5b4b9c4..a024e3c 100644\n--- a/.github/workflows/tests.yml\n+++ b/.github/workflows/tests.yml\n@@ -7,7 +7,7 @@ jobs:\n fail-fast: false\n matrix:\n python: [3.7, 3.8, 3.9]\n- plone: ["6.0.0a1", "5.2-latest"]\n+ plone: ["6.0.0a2", "5.2-latest"]\n exclude:\n - plone: "5.2-latest"\n python: 3.9\ndiff --git a/CHANGES.rst b/CHANGES.rst\nindex d411198..045e2a1 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -4,7 +4,10 @@ Changelog\n 3.1.0a7 (unreleased)\n --------------------\n \n-- Nothing changed yet.\n+Internal:\n+\n+- Test with Plone 6.0.0a2\n+ [ericof]\n \n \n 3.1.0a6 (2021-11-22)\ndiff --git a/Makefile b/Makefile\nindex d499918..46483d7 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -51,7 +51,7 @@ build: .installed.cfg ## Build Plone 5.2\n .PHONY: Build Plone 6.0\n build-plone-6.0: bin/pip ## Build Plone 6.0\n \tbin/pip install --upgrade pip\n-\tbin/pip install -r https://dist.plone.org/release/6.0.0a1/requirements.txt\n+\tbin/pip install -r https://dist.plone.org/release/6.0.0a2/requirements.txt\n \tbin/buildout -c plone-6.0.x.cfg\n \n .PHONY: Test\ndiff --git a/plone-5.2.x.cfg b/plone-5.2.x.cfg\nindex b1fde4a..876cba2 100644\n--- a/plone-5.2.x.cfg\n+++ b/plone-5.2.x.cfg\n@@ -2,6 +2,7 @@\n extends =\n base.cfg\n http://dist.plone.org/release/5.2.5/versions.cfg\n+\n find-links += http://dist.plone.org/thirdparty/\n \n [versions]\ndiff --git a/plone-6.0.x.cfg b/plone-6.0.x.cfg\nindex 3444dcd..351f975 100644\n--- a/plone-6.0.x.cfg\n+++ b/plone-6.0.x.cfg\n@@ -1,9 +1,9 @@\n [buildout]\n extends =\n- https://dist.plone.org/release/6.0.0a1/versions.cfg\n+ https://dist.plone.org/release/6.0.0a2/versions.cfg\n base.cfg\n-find-links = https://dist.plone.org/release/6.0.0a1/\n-versions=versions\n+\n+find-links += https://dist.plone.org/release/6.0.0a2/\n \n \n [instance]\n@@ -11,6 +11,7 @@ recipe = plone.recipe.zope2instance\n zodb-temporary-storage = off\n \n [versions]\n+plone.volto =\n black = 21.7b0\n \n # cffi 1.14.3 fails on apple m1\ndiff --git a/requirements/plone-6.0.txt b/requirements/plone-6.0.txt\nindex e073f36..3a0e3a8 100644\n--- a/requirements/plone-6.0.txt\n+++ b/requirements/plone-6.0.txt\n@@ -1,3 +1,3 @@\n--c https://dist.plone.org/release/6.0.0a1/constraints.txt\n+-c https://dist.plone.org/release/6.0.0a2/constraints.txt\n wheel\n Plone\n\\ No newline at end of file\n' | ||
|
|
||
| Repository: plone.volto | ||
|
|
||
|
|
||
| Branch: refs/heads/main | ||
| Date: 2021-12-06T16:32:23+01:00 | ||
| Author: Érico Andrei (ericof) <ericof@gmail.com> | ||
| Commit: https://github.com/plone/plone.volto/commit/c1b58a4ed21e61d5878662b1f79aaa696164bc24 | ||
|
|
||
| Merge pull request #34 from plone/upgrade-plone-6.0.0a2 | ||
|
|
||
| Support Plone 6.0.0a2 | ||
|
|
||
| Files changed: | ||
| A news/275.feature | ||
| M plone/app/layout/viewlets/common.py | ||
| M .github/workflows/tests.yml | ||
| M CHANGES.rst | ||
| M Makefile | ||
| M plone-5.2.x.cfg | ||
| M plone-6.0.x.cfg | ||
| M requirements/plone-6.0.txt | ||
|
|
||
| b'diff --git a/news/275.feature b/news/275.feature\nnew file mode 100644\nindex 00000000..dd427e5b\n--- /dev/null\n+++ b/news/275.feature\n@@ -0,0 +1,7 @@\n+Global sections viewlet performance optimizations:\n+\n+- Remove pointless caching on types_using_view,\n+- Store settings in variable for multiple access, bypassing cache checks,\n+- Remove now pointless caching on settings property,\n+- Deprecate now unused navtree_depth property.\n+[thet]\ndiff --git a/plone/app/layout/viewlets/common.py b/plone/app/layout/viewlets/common.py\nindex 9b91fab4..e436eeda 100644\n--- a/plone/app/layout/viewlets/common.py\n+++ b/plone/app/layout/viewlets/common.py\n@@ -9,7 +9,6 @@\n from plone.app.layout.navigation.root import getNavigationRootObject\n from plone.i18n.interfaces import ILanguageSchema\n from plone.memoize.view import memoize\n-from plone.memoize.view import memoize_contextless\n from plone.protect.utils import addTokenToUrl\n from plone.registry.interfaces import IRegistry\n from Products.CMFCore.utils import getToolByName\n@@ -242,7 +241,6 @@ class GlobalSectionsViewlet(ViewletBase):\n _subtree_markup_wrapper = u\'<ul class="has_subtree dropdown">{out}</ul>\'\n \n @property\n- @memoize_contextless\n def settings(self):\n registry = getUtility(IRegistry)\n settings = registry.forInterface(INavigationSchema, prefix="plone")\n@@ -259,6 +257,7 @@ def navtree_path(self):\n return getNavigationRoot(self.context)\n \n @property\n+ @deprecate("This property will be removed in Plone 6")\n def navtree_depth(self):\n return self.settings.navigation_depth\n \n@@ -271,7 +270,6 @@ def current_language(self):\n )\n \n @property\n- @memoize_contextless\n def types_using_view(self):\n registry = getUtility(IRegistry)\n types_using_view = registry.get("plone.types_use_view_action_in_listings", [])\n@@ -281,6 +279,7 @@ def types_using_view(self):\n @memoize\n def navtree(self):\n ret = defaultdict(list)\n+ settings = self.settings\n navtree_path = self.navtree_path\n portal_tabs = self.portal_tabs\n for tab in portal_tabs:\n@@ -306,30 +305,30 @@ def navtree(self):\n self.customize_tab(entry, tab)\n ret[navtree_path].append(entry)\n \n- if not self.settings.generate_tabs:\n+ if not settings.generate_tabs:\n return ret\n \n query = {\n "path": {\n "query": self.navtree_path,\n- "depth": self.navtree_depth,\n+ "depth": settings.navigation_depth,\n },\n- "portal_type": {"query": self.settings.displayed_types},\n+ "portal_type": {"query": settings.displayed_types},\n "Language": self.current_language,\n- "sort_on": self.settings.sort_tabs_on,\n+ "sort_on": settings.sort_tabs_on,\n "is_default_page": False,\n }\n \n- if self.settings.sort_tabs_reversed:\n+ if settings.sort_tabs_reversed:\n query["sort_order"] = "reverse"\n \n- if not self.settings.nonfolderish_tabs:\n+ if not settings.nonfolderish_tabs:\n query["is_folderish"] = True\n \n- if self.settings.filter_on_workflow:\n- query["review_state"] = list(self.settings.workflow_states_to_show or ())\n+ if settings.filter_on_workflow:\n+ query["review_state"] = list(settings.workflow_states_to_show or ())\n \n- if not self.settings.show_excluded_items:\n+ if not settings.show_excluded_items:\n query["exclude_from_nav"] = False\n \n context_path = "/".join(self.context.getPhysicalPath())\n' | ||
| b'diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml\nindex 5b4b9c4..a024e3c 100644\n--- a/.github/workflows/tests.yml\n+++ b/.github/workflows/tests.yml\n@@ -7,7 +7,7 @@ jobs:\n fail-fast: false\n matrix:\n python: [3.7, 3.8, 3.9]\n- plone: ["6.0.0a1", "5.2-latest"]\n+ plone: ["6.0.0a2", "5.2-latest"]\n exclude:\n - plone: "5.2-latest"\n python: 3.9\ndiff --git a/CHANGES.rst b/CHANGES.rst\nindex d411198..045e2a1 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -4,7 +4,10 @@ Changelog\n 3.1.0a7 (unreleased)\n --------------------\n \n-- Nothing changed yet.\n+Internal:\n+\n+- Test with Plone 6.0.0a2\n+ [ericof]\n \n \n 3.1.0a6 (2021-11-22)\ndiff --git a/Makefile b/Makefile\nindex d499918..46483d7 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -51,7 +51,7 @@ build: .installed.cfg ## Build Plone 5.2\n .PHONY: Build Plone 6.0\n build-plone-6.0: bin/pip ## Build Plone 6.0\n \tbin/pip install --upgrade pip\n-\tbin/pip install -r https://dist.plone.org/release/6.0.0a1/requirements.txt\n+\tbin/pip install -r https://dist.plone.org/release/6.0.0a2/requirements.txt\n \tbin/buildout -c plone-6.0.x.cfg\n \n .PHONY: Test\ndiff --git a/plone-5.2.x.cfg b/plone-5.2.x.cfg\nindex b1fde4a..876cba2 100644\n--- a/plone-5.2.x.cfg\n+++ b/plone-5.2.x.cfg\n@@ -2,6 +2,7 @@\n extends =\n base.cfg\n http://dist.plone.org/release/5.2.5/versions.cfg\n+\n find-links += http://dist.plone.org/thirdparty/\n \n [versions]\ndiff --git a/plone-6.0.x.cfg b/plone-6.0.x.cfg\nindex 3444dcd..351f975 100644\n--- a/plone-6.0.x.cfg\n+++ b/plone-6.0.x.cfg\n@@ -1,9 +1,9 @@\n [buildout]\n extends =\n- https://dist.plone.org/release/6.0.0a1/versions.cfg\n+ https://dist.plone.org/release/6.0.0a2/versions.cfg\n base.cfg\n-find-links = https://dist.plone.org/release/6.0.0a1/\n-versions=versions\n+\n+find-links += https://dist.plone.org/release/6.0.0a2/\n \n \n [instance]\n@@ -11,6 +11,7 @@ recipe = plone.recipe.zope2instance\n zodb-temporary-storage = off\n \n [versions]\n+plone.volto =\n black = 21.7b0\n \n # cffi 1.14.3 fails on apple m1\ndiff --git a/requirements/plone-6.0.txt b/requirements/plone-6.0.txt\nindex e073f36..3a0e3a8 100644\n--- a/requirements/plone-6.0.txt\n+++ b/requirements/plone-6.0.txt\n@@ -1,3 +1,3 @@\n--c https://dist.plone.org/release/6.0.0a1/constraints.txt\n+-c https://dist.plone.org/release/6.0.0a2/constraints.txt\n wheel\n Plone\n\\ No newline at end of file\n' | ||
|
|