From 35d6447557f1ea795ebd4c29e84e60d8b6413309 Mon Sep 17 00:00:00 2001 From: mauritsvanrees Date: Sat, 31 Aug 2024 22:44:28 +0200 Subject: [PATCH] [fc] Repository: Products.CMFPlone Branch: refs/heads/6.0.x Date: 2024-08-29T20:43:39+02:00 Author: Maurits van Rees (mauritsvanrees) Commit: https://github.com/plone/Products.CMFPlone/commit/057d04da608164d5995ad6d1964721c782ff2009 Use five.registerPackage so an editable install with pip works. Fixes https://github.com/plone/Products.CMFPlone/issues/4002 Files changed: A news/4002.bugfix M Products/CMFPlone/configure.zcml Repository: Products.CMFPlone Branch: refs/heads/6.0.x Date: 2024-08-31T22:44:28+02:00 Author: Maurits van Rees (mauritsvanrees) Commit: https://github.com/plone/Products.CMFPlone/commit/0753477e77e28c04e7f63e8598f920a66f57e6f8 Merge pull request #4004 from plone/maurits-issue-4002-five-register-package-60 Use five.registerPackage so an editable install with pip works. [6.0] Files changed: A news/4002.bugfix M Products/CMFPlone/configure.zcml --- last_commit.txt | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index 8e39f14333..91eae07603 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,36 +1,36 @@ -Repository: plone.releaser +Repository: Products.CMFPlone -Branch: refs/heads/master -Date: 2024-08-29T21:10:34+02:00 +Branch: refs/heads/6.0.x +Date: 2024-08-29T20:43:39+02:00 Author: Maurits van Rees (mauritsvanrees) -Commit: https://github.com/plone/plone.releaser/commit/47c4da206b9f99fd94b371cec52135c90818f336 +Commit: https://github.com/plone/Products.CMFPlone/commit/057d04da608164d5995ad6d1964721c782ff2009 -Fix checking/adding/removing checkouts: search in mxsources.ini. +Use five.registerPackage so an editable install with pip works. + +Fixes https://github.com/plone/Products.CMFPlone/issues/4002 Files changed: -A news/945.bugfix -M plone/releaser/manage.py -M plone/releaser/pip.py +A news/4002.bugfix +M Products/CMFPlone/configure.zcml -b'diff --git a/news/945.bugfix b/news/945.bugfix\nnew file mode 100644\nindex 0000000..f237dd6\n--- /dev/null\n+++ b/news/945.bugfix\n@@ -0,0 +1,2 @@\n+Fix checking/adding/removing checkouts: search in `mxsources.ini`.\n+[maurits]\ndiff --git a/plone/releaser/manage.py b/plone/releaser/manage.py\nindex b235d28..25b036f 100644\n--- a/plone/releaser/manage.py\n+++ b/plone/releaser/manage.py\n@@ -137,12 +137,12 @@ def _get_checkouts(path=None):\n """Get the parsed checkouts file at the given path.\n \n If no path is given, we use several paths:\n- both checkouts.cfg and mxdev.ini.\n+ both checkouts.cfg and mxcheckouts.ini.\n """\n if path:\n paths = [path]\n else:\n- paths = glob.glob("mxdev.ini") + glob.glob("checkouts.cfg")\n+ paths = glob.glob("mxcheckouts.ini") + glob.glob("checkouts.cfg")\n for path in paths:\n if path.endswith(".ini"):\n checkouts = MxCheckoutsFile(path)\n@@ -155,7 +155,7 @@ def check_checkout(package_name, *, path=None):\n """Check if package is in the checkouts.\n \n If no path is given, we try several paths:\n- both checkouts.cfg and mxdev.ini.\n+ both checkouts.cfg and mxcheckouts.ini.\n """\n for checkouts in _get_checkouts(path=path):\n loc = checkouts.file_location\n@@ -169,7 +169,7 @@ def remove_checkout(package_name, *, path=None):\n """Remove package from auto checkouts.\n \n If no path is given, we try several paths:\n- both checkouts.cfg and mxdev.ini.\n+ both checkouts.cfg and mxcheckouts.ini.\n """\n for checkouts in _get_checkouts(path=path):\n checkouts.remove(package_name)\n@@ -179,7 +179,7 @@ def add_checkout(package_name, *, path=None):\n """Add package to auto checkouts.\n \n If no path is given, we try several paths:\n- both checkouts.cfg and mxdev.ini.\n+ both checkouts.cfg and mxcheckouts.ini.\n """\n for checkouts in _get_checkouts(path=path):\n checkouts.add(package_name)\ndiff --git a/plone/releaser/pip.py b/plone/releaser/pip.py\nindex d791fa9..fb1ded9 100644\n--- a/plone/releaser/pip.py\n+++ b/plone/releaser/pip.py\n@@ -254,6 +254,7 @@ def append_package(self, package_name, enabled=True):\n use = "true" if enabled else "false"\n contents += f"\\n[{package_name}]\\nuse = {use}\\n"\n self.path.write_text(contents)\n+ print(f"{self.file_location}: {package_name} added to checkouts.")\n \n def __setitem__(self, package_name, enabled=True):\n """Enable or disable a checkout.\n' +b'diff --git a/Products/CMFPlone/configure.zcml b/Products/CMFPlone/configure.zcml\nindex efe2bac1e8..8ca804f598 100644\n--- a/Products/CMFPlone/configure.zcml\n+++ b/Products/CMFPlone/configure.zcml\n@@ -2,11 +2,13 @@\n xmlns="http://namespaces.zope.org/zope"\n xmlns:browser="http://namespaces.zope.org/browser"\n xmlns:cmf="http://namespaces.zope.org/cmf"\n+ xmlns:five="http://namespaces.zope.org/five"\n xmlns:i18n="http://namespaces.zope.org/i18n"\n xmlns:zcml="http://namespaces.zope.org/zcml"\n i18n_domain="plone"\n >\n \n+ \n \n \n \ndiff --git a/news/4002.bugfix b/news/4002.bugfix\nnew file mode 100644\nindex 0000000000..8dc1c4c0e3\n--- /dev/null\n+++ b/news/4002.bugfix\n@@ -0,0 +1,2 @@\n+Use `five.registerPackage` so an editable install with `pip` works.\n+[maurits]\n' -Repository: plone.releaser +Repository: Products.CMFPlone -Branch: refs/heads/master -Date: 2024-08-31T22:44:05+02:00 -Author: Maurits van Rees (mauritsvanrees) -Commit: https://github.com/plone/plone.releaser/commit/b5ae17e8f336fd06bfe907baa62f97d01bd313e8 +Branch: refs/heads/6.0.x +Date: 2024-08-31T22:44:28+02:00 +Author: Maurits van Rees (mauritsvanrees) +Commit: https://github.com/plone/Products.CMFPlone/commit/0753477e77e28c04e7f63e8598f920a66f57e6f8 -Merge pull request #74 from plone/maurits-mxcheckouts-ini +Merge pull request #4004 from plone/maurits-issue-4002-five-register-package-60 -Fix checking/adding/removing checkouts: search in mxsources.ini. +Use five.registerPackage so an editable install with pip works. [6.0] Files changed: -A news/945.bugfix -M plone/releaser/manage.py -M plone/releaser/pip.py +A news/4002.bugfix +M Products/CMFPlone/configure.zcml -b'diff --git a/news/945.bugfix b/news/945.bugfix\nnew file mode 100644\nindex 0000000..f237dd6\n--- /dev/null\n+++ b/news/945.bugfix\n@@ -0,0 +1,2 @@\n+Fix checking/adding/removing checkouts: search in `mxsources.ini`.\n+[maurits]\ndiff --git a/plone/releaser/manage.py b/plone/releaser/manage.py\nindex b235d28..25b036f 100644\n--- a/plone/releaser/manage.py\n+++ b/plone/releaser/manage.py\n@@ -137,12 +137,12 @@ def _get_checkouts(path=None):\n """Get the parsed checkouts file at the given path.\n \n If no path is given, we use several paths:\n- both checkouts.cfg and mxdev.ini.\n+ both checkouts.cfg and mxcheckouts.ini.\n """\n if path:\n paths = [path]\n else:\n- paths = glob.glob("mxdev.ini") + glob.glob("checkouts.cfg")\n+ paths = glob.glob("mxcheckouts.ini") + glob.glob("checkouts.cfg")\n for path in paths:\n if path.endswith(".ini"):\n checkouts = MxCheckoutsFile(path)\n@@ -155,7 +155,7 @@ def check_checkout(package_name, *, path=None):\n """Check if package is in the checkouts.\n \n If no path is given, we try several paths:\n- both checkouts.cfg and mxdev.ini.\n+ both checkouts.cfg and mxcheckouts.ini.\n """\n for checkouts in _get_checkouts(path=path):\n loc = checkouts.file_location\n@@ -169,7 +169,7 @@ def remove_checkout(package_name, *, path=None):\n """Remove package from auto checkouts.\n \n If no path is given, we try several paths:\n- both checkouts.cfg and mxdev.ini.\n+ both checkouts.cfg and mxcheckouts.ini.\n """\n for checkouts in _get_checkouts(path=path):\n checkouts.remove(package_name)\n@@ -179,7 +179,7 @@ def add_checkout(package_name, *, path=None):\n """Add package to auto checkouts.\n \n If no path is given, we try several paths:\n- both checkouts.cfg and mxdev.ini.\n+ both checkouts.cfg and mxcheckouts.ini.\n """\n for checkouts in _get_checkouts(path=path):\n checkouts.add(package_name)\ndiff --git a/plone/releaser/pip.py b/plone/releaser/pip.py\nindex d791fa9..fb1ded9 100644\n--- a/plone/releaser/pip.py\n+++ b/plone/releaser/pip.py\n@@ -254,6 +254,7 @@ def append_package(self, package_name, enabled=True):\n use = "true" if enabled else "false"\n contents += f"\\n[{package_name}]\\nuse = {use}\\n"\n self.path.write_text(contents)\n+ print(f"{self.file_location}: {package_name} added to checkouts.")\n \n def __setitem__(self, package_name, enabled=True):\n """Enable or disable a checkout.\n' +b'diff --git a/Products/CMFPlone/configure.zcml b/Products/CMFPlone/configure.zcml\nindex efe2bac1e8..8ca804f598 100644\n--- a/Products/CMFPlone/configure.zcml\n+++ b/Products/CMFPlone/configure.zcml\n@@ -2,11 +2,13 @@\n xmlns="http://namespaces.zope.org/zope"\n xmlns:browser="http://namespaces.zope.org/browser"\n xmlns:cmf="http://namespaces.zope.org/cmf"\n+ xmlns:five="http://namespaces.zope.org/five"\n xmlns:i18n="http://namespaces.zope.org/i18n"\n xmlns:zcml="http://namespaces.zope.org/zcml"\n i18n_domain="plone"\n >\n \n+ \n \n \n \ndiff --git a/news/4002.bugfix b/news/4002.bugfix\nnew file mode 100644\nindex 0000000000..8dc1c4c0e3\n--- /dev/null\n+++ b/news/4002.bugfix\n@@ -0,0 +1,2 @@\n+Use `five.registerPackage` so an editable install with `pip` works.\n+[maurits]\n'