-
-
Notifications
You must be signed in to change notification settings - Fork 76
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: 2025-01-27T20:17:55-08:00 Author: David Glick (davisagli) <[email protected]> Commit: plone/plone.volto@abc90d7 Preparing release 5.0.2 Files changed: M CHANGES.md M setup.py D news/178.bugfix D news/181.bugfix D news/4090.bugfix Repository: plone.volto Branch: refs/heads/main Date: 2025-01-27T20:18:40-08:00 Author: David Glick (davisagli) <[email protected]> Commit: plone/plone.volto@d4593a5 Back to development: 5.0.3 Files changed: M setup.py
- Loading branch information
Showing
1 changed file
with
15 additions
and
38 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,57 +1,34 @@ | ||
| Repository: plone.distribution | ||
| Repository: plone.volto | ||
|
|
||
|
|
||
| Branch: refs/heads/main | ||
| Date: 2025-01-22T17:21:53+01:00 | ||
| Author: Maurits van Rees (mauritsvanrees) <[email protected]> | ||
| Commit: https://github.com/plone/plone.distribution/commit/c12ee5b43d4c902144c7063ded2a3153daf87235 | ||
|
|
||
| Include revisions only when passing --include-revisions. | ||
|
|
||
| This needs https://github.com/plone/plone.exportimport/pull/44. | ||
| It would be good to have that merged and in a release, so we can add that release as minimum version in our dependencies. | ||
|
|
||
| Files changed: | ||
| A news/39.feature | ||
| M README.md | ||
| M src/plone/distribution/cli/__init__.py | ||
|
|
||
| b'diff --git a/README.md b/README.md\nindex 72ee071..576390d 100644\n--- a/README.md\n+++ b/README.md\n@@ -293,11 +293,14 @@ Folder containing JSON data representing this distribution\'s content.\n To export content from a site into this folder, use the `bin/export-distribution` script.\n \n ```shell\n-bin/export-distribution path/to/zope.conf Plone\n+bin/export-distribution [--include-revisions] path/to/zope.conf Plone\n ```\n \n > In the example above, "Plone" is the ID of the Plone site to export.\n \n+By default, the revisions history (older versions of each content item) are not exported.\n+If you do want them, add `--include-revisions` on the command line.\n+\n ## Advanced Usage\n \n ### Hiding Distributions\ndiff --git a/news/39.feature b/news/39.feature\nnew file mode 100644\nindex 0000000..0c2a4f6\n--- /dev/null\n+++ b/news/39.feature\n@@ -0,0 +1 @@\n+Include revisions only when passing `--include-revisions`. @mauritsvanrees\ndiff --git a/src/plone/distribution/cli/__init__.py b/src/plone/distribution/cli/__init__.py\nindex 4ab63d6..208f4a5 100644\n--- a/src/plone/distribution/cli/__init__.py\n+++ b/src/plone/distribution/cli/__init__.py\n@@ -13,6 +13,7 @@\n "options": {\n "zopeconf": "Path to zope.conf",\n "site": "Plone site ID to export the content from",\n+ "--include-revisions": "Include revision history",\n },\n },\n }\n@@ -21,7 +22,10 @@\n def _parse_args(description: str, options: dict, args: list):\n parser = argparse.ArgumentParser(description=description)\n for key, help in options.items():\n- parser.add_argument(key, help=help)\n+ if key.startswith("-"):\n+ parser.add_argument(key, action="store_true", help=help)\n+ else:\n+ parser.add_argument(key, help=help)\n namespace, _ = parser.parse_known_args(args[1:])\n return namespace\n \n@@ -30,6 +34,7 @@ def export(args=sys.argv):\n """Export a Plone site to a distribution."""\n logger = cli_helpers.get_logger("Exporter")\n exporter_cli = CLI_SPEC["exporter"]\n+ # We get an argparse.Namespace instance.\n namespace = _parse_args(exporter_cli["description"], exporter_cli["options"], args)\n app = cli_helpers.get_app(namespace.zopeconf)\n site = cli_helpers.get_site(app, namespace.site, logger)\n@@ -41,6 +46,6 @@ def export(args=sys.argv):\n logger.info(f"Exporting Plone site at /{site.id}")\n logger.info(f" Target path: {path}")\n with api.env.adopt_roles(["Manager"]):\n- results = get_exporter(site).export_site(path)\n+ results = get_exporter(site).export_site(path, options=namespace)\n for item in results[1:]:\n logger.info(f" Wrote {item.relative_to(path)}")\n' | ||
|
|
||
| Repository: plone.distribution | ||
|
|
||
|
|
||
| Branch: refs/heads/main | ||
| Date: 2025-01-23T23:26:40+01:00 | ||
| Author: Maurits van Rees (mauritsvanrees) <[email protected]> | ||
| Commit: https://github.com/plone/plone.distribution/commit/191d265900cbcbf4c98194102420f6f7a18da27a | ||
|
|
||
| Require plone.exportimport 1.0.0b1 as minimum. | ||
| Date: 2025-01-27T20:17:55-08:00 | ||
| Author: David Glick (davisagli) <[email protected]> | ||
| Commit: https://github.com/plone/plone.volto/commit/abc90d73391c589a59a6285e1e0d084672d3812e | ||
|
|
||
| This is needed for the --include-revisions option. | ||
| Preparing release 5.0.2 | ||
|
|
||
| Files changed: | ||
| M CHANGES.md | ||
| M setup.py | ||
| D news/178.bugfix | ||
| D news/181.bugfix | ||
| D news/4090.bugfix | ||
|
|
||
| b'diff --git a/setup.py b/setup.py\nindex 247f835..6158741 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -55,7 +55,7 @@\n "plone.api",\n "plone.base",\n "plone.dexterity",\n- "plone.exportimport>=1.0.0a5",\n+ "plone.exportimport>=1.0.0b1",\n "plone.i18n",\n "plone.protect",\n "plone.rest",\n' | ||
| b'diff --git a/CHANGES.md b/CHANGES.md\nindex 20619e1..e7117ee 100644\n--- a/CHANGES.md\n+++ b/CHANGES.md\n@@ -9,6 +9,17 @@\n \n <!-- towncrier release notes start -->\n \n+## 5.0.2 (2025-01-27)\n+\n+\n+### Bug fixes:\n+\n+- Implement a specific robots.txt for Volto sites.\n+ There is an upgrade step which will update the existing plone.robots_txt registry setting unless it has been customized.\n+ @ericof #178\n+- Add nav_title and head_title to the default summary serializer metadata fields. @davisagli #181\n+- Fix DeprecationWarnings. [maurits] #4090\n+\n ## 5.0.1 (2024-12-17)\n \n \ndiff --git a/news/178.bugfix b/news/178.bugfix\ndeleted file mode 100644\nindex 0df4fbd..0000000\n--- a/news/178.bugfix\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-Implement a specific robots.txt for Volto sites.\n-There is an upgrade step which will update the existing plone.robots_txt registry setting unless it has been customized.\n-@ericof\ndiff --git a/news/181.bugfix b/news/181.bugfix\ndeleted file mode 100644\nindex 70193a8..0000000\n--- a/news/181.bugfix\n+++ /dev/null\n@@ -1 +0,0 @@\n-Add nav_title and head_title to the default summary serializer metadata fields. @davisagli\ndiff --git a/news/4090.bugfix b/news/4090.bugfix\ndeleted file mode 100644\nindex 8528aef..0000000\n--- a/news/4090.bugfix\n+++ /dev/null\n@@ -1 +0,0 @@\n-Fix DeprecationWarnings. [maurits]\ndiff --git a/setup.py b/setup.py\nindex c1f1b10..270f604 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -13,7 +13,7 @@\n \n setup(\n name="plone.volto",\n- version="5.0.2.dev0",\n+ version="5.0.2",\n description="Volto integration add-on for Plone",\n long_description=long_description,\n long_description_content_type="text/markdown",\n' | ||
|
|
||
| Repository: plone.distribution | ||
| Repository: plone.volto | ||
|
|
||
|
|
||
| Branch: refs/heads/main | ||
| Date: 2025-01-27T10:40:48-08:00 | ||
| Date: 2025-01-27T20:18:40-08:00 | ||
| Author: David Glick (davisagli) <[email protected]> | ||
| Commit: https://github.com/plone/plone.distribution/commit/116416260045f295396c3065e870218e51f453f1 | ||
|
|
||
| Merge pull request #108 from plone/maurits-optional-include-versions | ||
| Commit: https://github.com/plone/plone.volto/commit/d4593a55b55f92c2e4a8d54b7a56d81a7cb221ae | ||
|
|
||
| Include revisions only when passing --include-revisions. | ||
| Back to development: 5.0.3 | ||
|
|
||
| Files changed: | ||
| A news/39.feature | ||
| M README.md | ||
| M setup.py | ||
| M src/plone/distribution/cli/__init__.py | ||
|
|
||
| b'diff --git a/README.md b/README.md\nindex 72ee071..576390d 100644\n--- a/README.md\n+++ b/README.md\n@@ -293,11 +293,14 @@ Folder containing JSON data representing this distribution\'s content.\n To export content from a site into this folder, use the `bin/export-distribution` script.\n \n ```shell\n-bin/export-distribution path/to/zope.conf Plone\n+bin/export-distribution [--include-revisions] path/to/zope.conf Plone\n ```\n \n > In the example above, "Plone" is the ID of the Plone site to export.\n \n+By default, the revisions history (older versions of each content item) are not exported.\n+If you do want them, add `--include-revisions` on the command line.\n+\n ## Advanced Usage\n \n ### Hiding Distributions\ndiff --git a/news/39.feature b/news/39.feature\nnew file mode 100644\nindex 0000000..0c2a4f6\n--- /dev/null\n+++ b/news/39.feature\n@@ -0,0 +1 @@\n+Include revisions only when passing `--include-revisions`. @mauritsvanrees\ndiff --git a/setup.py b/setup.py\nindex 247f835..6158741 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -55,7 +55,7 @@\n "plone.api",\n "plone.base",\n "plone.dexterity",\n- "plone.exportimport>=1.0.0a5",\n+ "plone.exportimport>=1.0.0b1",\n "plone.i18n",\n "plone.protect",\n "plone.rest",\ndiff --git a/src/plone/distribution/cli/__init__.py b/src/plone/distribution/cli/__init__.py\nindex 4ab63d6..208f4a5 100644\n--- a/src/plone/distribution/cli/__init__.py\n+++ b/src/plone/distribution/cli/__init__.py\n@@ -13,6 +13,7 @@\n "options": {\n "zopeconf": "Path to zope.conf",\n "site": "Plone site ID to export the content from",\n+ "--include-revisions": "Include revision history",\n },\n },\n }\n@@ -21,7 +22,10 @@\n def _parse_args(description: str, options: dict, args: list):\n parser = argparse.ArgumentParser(description=description)\n for key, help in options.items():\n- parser.add_argument(key, help=help)\n+ if key.startswith("-"):\n+ parser.add_argument(key, action="store_true", help=help)\n+ else:\n+ parser.add_argument(key, help=help)\n namespace, _ = parser.parse_known_args(args[1:])\n return namespace\n \n@@ -30,6 +34,7 @@ def export(args=sys.argv):\n """Export a Plone site to a distribution."""\n logger = cli_helpers.get_logger("Exporter")\n exporter_cli = CLI_SPEC["exporter"]\n+ # We get an argparse.Namespace instance.\n namespace = _parse_args(exporter_cli["description"], exporter_cli["options"], args)\n app = cli_helpers.get_app(namespace.zopeconf)\n site = cli_helpers.get_site(app, namespace.site, logger)\n@@ -41,6 +46,6 @@ def export(args=sys.argv):\n logger.info(f"Exporting Plone site at /{site.id}")\n logger.info(f" Target path: {path}")\n with api.env.adopt_roles(["Manager"]):\n- results = get_exporter(site).export_site(path)\n+ results = get_exporter(site).export_site(path, options=namespace)\n for item in results[1:]:\n logger.info(f" Wrote {item.relative_to(path)}")\n' | ||
| b'diff --git a/setup.py b/setup.py\nindex 270f604..a6c87e9 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -13,7 +13,7 @@\n \n setup(\n name="plone.volto",\n- version="5.0.2",\n+ version="5.0.3.dev0",\n description="Volto integration add-on for Plone",\n long_description=long_description,\n long_description_content_type="text/markdown",\n' | ||
|
|