From ced36322a130840ef9204ceaa71f51f15921d213 Mon Sep 17 00:00:00 2001 From: mauritsvanrees Date: Wed, 12 Jan 2022 13:34:46 +0100 Subject: [PATCH] [fc] Repository: Products.MimetypesRegistry Branch: refs/heads/master Date: 2022-01-12T01:20:49+01:00 Author: Maurits van Rees (mauritsvanrees) Commit: https://github.com/plone/Products.MimetypesRegistry/commit/04db4a5ef2827103c07e837d861461efbac79d42 Fix missing comma in install_requires. This caused the first item to be parsed as: ``` AccessControl>=3.0.0Acquisition ``` This resulted in a warning on startup with a recent setuptools: ``` pkg_resources/_vendor/packaging/specifiers.py:273: DeprecationWarning: Creating a LegacyVersion has been deprecated and will be removed in the next major release ``` Files changed: A news/21.bugfix M setup.py Repository: Products.MimetypesRegistry Branch: refs/heads/master Date: 2022-01-12T13:34:46+01:00 Author: Maurits van Rees (mauritsvanrees) Commit: https://github.com/plone/Products.MimetypesRegistry/commit/4de9f65ff8c41d9667077439820047eab25bf375 Merge pull request #21 from plone/fix-legacy-version-warning Fix missing comma in install_requires. Files changed: A news/21.bugfix M setup.py --- last_commit.txt | 49 +++++++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index ce66124e00..f8f0bb373d 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,34 +1,47 @@ -Repository: plone.volto +Repository: Products.MimetypesRegistry -Branch: refs/heads/main -Date: 2022-01-09T12:50:22+01:00 -Author: Victor Fernandez de Alba (sneridagh) -Commit: https://github.com/plone/plone.volto/commit/3f3865eddbd287a6f2fb121eb102406a7e895716 +Branch: refs/heads/master +Date: 2022-01-12T01:20:49+01:00 +Author: Maurits van Rees (mauritsvanrees) +Commit: https://github.com/plone/Products.MimetypesRegistry/commit/04db4a5ef2827103c07e837d861461efbac79d42 -Fix computed dates in content for demo pages +Fix missing comma in install_requires. + +This caused the first item to be parsed as: + +``` +AccessControl>=3.0.0Acquisition +``` + +This resulted in a warning on startup with a recent setuptools: + +``` +pkg_resources/_vendor/packaging/specifiers.py:273: DeprecationWarning: +Creating a LegacyVersion has been deprecated and will be removed in the next major release +``` Files changed: -M CHANGES.rst -M src/plone/volto/setuphandlers.py +A news/21.bugfix +M setup.py -b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex c896dbf..315d269 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -4,7 +4,8 @@ Changelog\n 3.1.0a8 (unreleased)\n --------------------\n \n-- Nothing changed yet.\n+- Computed copyright dates for content demo pages\n+ [sneridagh]\n \n \n 3.1.0a7 (2021-12-11)\ndiff --git a/src/plone/volto/setuphandlers.py b/src/plone/volto/setuphandlers.py\nindex 8568fee..e2b865a 100644\n--- a/src/plone/volto/setuphandlers.py\n+++ b/src/plone/volto/setuphandlers.py\n@@ -1,4 +1,5 @@\n # -*- coding: utf-8 -*-\n+from datetime import datetime\n from plone import api\n from plone.app.multilingual.browser.setup import SetupMultilingualSite\n from plone.app.multilingual.setuphandlers import enable_translatable_behavior\n@@ -21,6 +22,7 @@\n import logging\n import transaction\n \n+\n logger = logging.getLogger("plone.volto")\n \n \n@@ -510,7 +512,7 @@ def create_root_homepage(context, default_home=None):\n "entityRanges": [],\n "inlineStyleRanges": [],\n "key": "f0prj",\n- "text": "2020 - Volto Team - Plone Foundation",\n+ "text": f"{datetime.now().year} - Volto Team - Plone Foundation",\n "type": "unstyled",\n }\n ],\n@@ -842,7 +844,7 @@ def create_demo_homepage(context):\n "entityRanges": [],\n "inlineStyleRanges": [],\n "key": "f0prj",\n- "text": "2021 - Plone Foundation",\n+ "text": f"{datetime.now().year} - Plone Foundation",\n "type": "unstyled",\n }\n ],\n' +b"diff --git a/news/21.bugfix b/news/21.bugfix\nnew file mode 100644\nindex 0000000..723f034\n--- /dev/null\n+++ b/news/21.bugfix\n@@ -0,0 +1,2 @@\n+Fix missing comma in install_requires.\n+[maurits]\ndiff --git a/setup.py b/setup.py\nindex 77829b0..038f769 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -36,7 +36,7 @@\n license='GPL',\n zip_safe=False,\n install_requires=[\n- 'AccessControl>=3.0.0'\n+ 'AccessControl>=3.0.0',\n 'Acquisition',\n 'Products.CMFCore',\n 'setuptools',\n" -Repository: plone.volto +Repository: Products.MimetypesRegistry -Branch: refs/heads/main -Date: 2022-01-11T22:17:50+01:00 +Branch: refs/heads/master +Date: 2022-01-12T13:34:46+01:00 Author: Maurits van Rees (mauritsvanrees) -Commit: https://github.com/plone/plone.volto/commit/c85c20c7536cda4547e5dea4ff2877e615ec32a7 +Commit: https://github.com/plone/Products.MimetypesRegistry/commit/4de9f65ff8c41d9667077439820047eab25bf375 -Merge pull request #41 from plone/fixdatesindemos +Merge pull request #21 from plone/fix-legacy-version-warning -Fix computed dates in content for demo pages +Fix missing comma in install_requires. Files changed: -M CHANGES.rst -M src/plone/volto/setuphandlers.py +A news/21.bugfix +M setup.py -b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex c896dbf..315d269 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -4,7 +4,8 @@ Changelog\n 3.1.0a8 (unreleased)\n --------------------\n \n-- Nothing changed yet.\n+- Computed copyright dates for content demo pages\n+ [sneridagh]\n \n \n 3.1.0a7 (2021-12-11)\ndiff --git a/src/plone/volto/setuphandlers.py b/src/plone/volto/setuphandlers.py\nindex 8568fee..e2b865a 100644\n--- a/src/plone/volto/setuphandlers.py\n+++ b/src/plone/volto/setuphandlers.py\n@@ -1,4 +1,5 @@\n # -*- coding: utf-8 -*-\n+from datetime import datetime\n from plone import api\n from plone.app.multilingual.browser.setup import SetupMultilingualSite\n from plone.app.multilingual.setuphandlers import enable_translatable_behavior\n@@ -21,6 +22,7 @@\n import logging\n import transaction\n \n+\n logger = logging.getLogger("plone.volto")\n \n \n@@ -510,7 +512,7 @@ def create_root_homepage(context, default_home=None):\n "entityRanges": [],\n "inlineStyleRanges": [],\n "key": "f0prj",\n- "text": "2020 - Volto Team - Plone Foundation",\n+ "text": f"{datetime.now().year} - Volto Team - Plone Foundation",\n "type": "unstyled",\n }\n ],\n@@ -842,7 +844,7 @@ def create_demo_homepage(context):\n "entityRanges": [],\n "inlineStyleRanges": [],\n "key": "f0prj",\n- "text": "2021 - Plone Foundation",\n+ "text": f"{datetime.now().year} - Plone Foundation",\n "type": "unstyled",\n }\n ],\n' +b"diff --git a/news/21.bugfix b/news/21.bugfix\nnew file mode 100644\nindex 0000000..723f034\n--- /dev/null\n+++ b/news/21.bugfix\n@@ -0,0 +1,2 @@\n+Fix missing comma in install_requires.\n+[maurits]\ndiff --git a/setup.py b/setup.py\nindex 77829b0..038f769 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -36,7 +36,7 @@\n license='GPL',\n zip_safe=False,\n install_requires=[\n- 'AccessControl>=3.0.0'\n+ 'AccessControl>=3.0.0',\n 'Acquisition',\n 'Products.CMFCore',\n 'setuptools',\n"