-
-
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/master Date: 2024-05-07T13:19:36+02:00 Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org> Commit: plone/plone.releaser@34520e2 No longer offer to push changes to buildout.coredev. This is no longer what we ever want: the newly uploaded package will not yet be available on all PyPI mirrors. Fixes plone/plone.releaser#69. Files changed: A news/69.bugfix M plone/releaser/release.py Repository: plone.releaser Branch: refs/heads/master Date: 2024-05-09T11:18:39+02:00 Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com> Commit: plone/plone.releaser@a49c704 Merge pull request #70 from plone/maurits-no-coredev-push No longer offer to push changes to buildout.coredev. Files changed: A news/69.bugfix M plone/releaser/release.py
- Loading branch information
Showing
1 changed file
with
19 additions
and
18 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,36 +1,37 @@ | ||
| Repository: plone.app.contenttypes | ||
| Repository: plone.releaser | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2024-05-06T19:52:58Z | ||
| Author: pre-commit-ci[bot] (pre-commit-ci[bot]) <66853113+pre-commit-ci[bot]@users.noreply.github.com> | ||
| Commit: https://github.com/plone/plone.app.contenttypes/commit/73ae3298f4c43ebbe38cb639e262e6f7280e1440 | ||
| Date: 2024-05-07T13:19:36+02:00 | ||
| Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org> | ||
| Commit: https://github.com/plone/plone.releaser/commit/34520e2bce7f8c52f04a5962243515fc73efbf5f | ||
|
|
||
| [pre-commit.ci] pre-commit autoupdate | ||
| No longer offer to push changes to buildout.coredev. | ||
|
|
||
| updates: | ||
| - [github.com/psf/black: 24.3.0 → 24.4.2](https://github.com/psf/black/compare/24.3.0...24.4.2) | ||
| - [github.com/collective/i18ndude: 6.1.0 → 6.2.0](https://github.com/collective/i18ndude/compare/6.1.0...6.2.0) | ||
| This is no longer what we ever want: the newly uploaded package will not yet be available on all PyPI mirrors. | ||
| Fixes https://github.com/plone/plone.releaser/issues/69. | ||
|
|
||
| Files changed: | ||
| M .pre-commit-config.yaml | ||
| A news/69.bugfix | ||
| M plone/releaser/release.py | ||
|
|
||
| b'diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml\nindex 0a5e9d06..d60054bd 100644\n--- a/.pre-commit-config.yaml\n+++ b/.pre-commit-config.yaml\n@@ -16,7 +16,7 @@ repos:\n hooks:\n - id: isort\n - repo: https://github.com/psf/black\n- rev: 24.3.0\n+ rev: 24.4.2\n hooks:\n - id: black\n - repo: https://github.com/collective/zpretty\n@@ -71,7 +71,7 @@ repos:\n - id: check-python-versions\n args: [\'--only\', \'setup.py,pyproject.toml\']\n - repo: https://github.com/collective/i18ndude\n- rev: "6.1.0"\n+ rev: "6.2.0"\n hooks:\n - id: i18ndude\n \n' | ||
| b'diff --git a/news/69.bugfix b/news/69.bugfix\nnew file mode 100644\nindex 0000000..84ace0c\n--- /dev/null\n+++ b/news/69.bugfix\n@@ -0,0 +1,4 @@\n+No longer offer to push changes to buildout.coredev.\n+This is no longer what we ever want: the newly uploaded package will not yet be available on all PyPI mirrors.\n+Fixes `issue 69 <https://github.com/plone/plone.releaser/issues/69>`_.\n+[maurits]\ndiff --git a/plone/releaser/release.py b/plone/releaser/release.py\nindex 3027a6f..01767b6 100644\n--- a/plone/releaser/release.py\n+++ b/plone/releaser/release.py\n@@ -220,31 +220,15 @@ def update_core(data, branch=None):\n g.add("--all")\n print("Committing changes.")\n g.commit(message=message)\n- # When doing releases of several packages in a row,\n- # it is better to not push, because this means a needlessly high load on Jenkins.\n- # Also, if you create a release and immediately push,\n- # then Jenkins will not find the new release yet and fail:\n- # it takes a few minutes for the release to be propagated to all PyPI mirrors.\n- # Pushing still seems the best default, but let\'s have an easy way to not push.\n- print("Checking PLONE_RELEASER_MULTI_PACKAGES env variable.")\n- try:\n- multi = int(os.getenv("PLONE_RELEASER_MULTI_PACKAGES"))\n- except (TypeError, ValueError, AttributeError):\n- print(\n- "ERROR: could not parse PLONE_RELEASER_MULTI_PACKAGES env var. Ignoring it."\n- )\n- multi = False\n- if multi:\n- print(\n- "PLONE_RELEASER_MULTI_PACKAGES env variable set, so not pushing to coredev."\n- )\n- return\n- msg = "Ok to push coredev?"\n- if branch:\n- msg = f"Ok to push coredev {branch}?"\n- if ask(msg, default=True):\n- print("Pushing changes to server.")\n- g.push()\n+ # We used to offer pushing the coredev change, but this is no longer a\n+ # good idea.\n+ print(\n+ "WARNING: a change in one or more buildout.coredev branches was made. "\n+ "Please wait a few minutes and then push this change. Otherwise the "\n+ "newly uploaded package is not yet available on all PyPI mirrors. "\n+ "This would cause Jenkins and GitHub Actions to fail."\n+ )\n+ return\n \n \n def update_other_core_branches(data):\n' | ||
|
|
||
| Repository: plone.app.contenttypes | ||
| Repository: plone.releaser | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2024-05-08T19:29:21+02:00 | ||
| Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org> | ||
| Commit: https://github.com/plone/plone.app.contenttypes/commit/0fa0839bc8bc3edd23a8882e60dcf52f01873a03 | ||
| Date: 2024-05-09T11:18:39+02:00 | ||
| Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com> | ||
| Commit: https://github.com/plone/plone.releaser/commit/a49c70458a691642e13a904b59c57b340c3b6974 | ||
|
|
||
| Merge pull request #691 from plone/pre-commit-ci-update-config | ||
| Merge pull request #70 from plone/maurits-no-coredev-push | ||
|
|
||
| [pre-commit.ci] pre-commit autoupdate | ||
| No longer offer to push changes to buildout.coredev. | ||
|
|
||
| Files changed: | ||
| M .pre-commit-config.yaml | ||
| A news/69.bugfix | ||
| M plone/releaser/release.py | ||
|
|
||
| b'diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml\nindex 0a5e9d06..d60054bd 100644\n--- a/.pre-commit-config.yaml\n+++ b/.pre-commit-config.yaml\n@@ -16,7 +16,7 @@ repos:\n hooks:\n - id: isort\n - repo: https://github.com/psf/black\n- rev: 24.3.0\n+ rev: 24.4.2\n hooks:\n - id: black\n - repo: https://github.com/collective/zpretty\n@@ -71,7 +71,7 @@ repos:\n - id: check-python-versions\n args: [\'--only\', \'setup.py,pyproject.toml\']\n - repo: https://github.com/collective/i18ndude\n- rev: "6.1.0"\n+ rev: "6.2.0"\n hooks:\n - id: i18ndude\n \n' | ||
| b'diff --git a/news/69.bugfix b/news/69.bugfix\nnew file mode 100644\nindex 0000000..84ace0c\n--- /dev/null\n+++ b/news/69.bugfix\n@@ -0,0 +1,4 @@\n+No longer offer to push changes to buildout.coredev.\n+This is no longer what we ever want: the newly uploaded package will not yet be available on all PyPI mirrors.\n+Fixes `issue 69 <https://github.com/plone/plone.releaser/issues/69>`_.\n+[maurits]\ndiff --git a/plone/releaser/release.py b/plone/releaser/release.py\nindex 3027a6f..01767b6 100644\n--- a/plone/releaser/release.py\n+++ b/plone/releaser/release.py\n@@ -220,31 +220,15 @@ def update_core(data, branch=None):\n g.add("--all")\n print("Committing changes.")\n g.commit(message=message)\n- # When doing releases of several packages in a row,\n- # it is better to not push, because this means a needlessly high load on Jenkins.\n- # Also, if you create a release and immediately push,\n- # then Jenkins will not find the new release yet and fail:\n- # it takes a few minutes for the release to be propagated to all PyPI mirrors.\n- # Pushing still seems the best default, but let\'s have an easy way to not push.\n- print("Checking PLONE_RELEASER_MULTI_PACKAGES env variable.")\n- try:\n- multi = int(os.getenv("PLONE_RELEASER_MULTI_PACKAGES"))\n- except (TypeError, ValueError, AttributeError):\n- print(\n- "ERROR: could not parse PLONE_RELEASER_MULTI_PACKAGES env var. Ignoring it."\n- )\n- multi = False\n- if multi:\n- print(\n- "PLONE_RELEASER_MULTI_PACKAGES env variable set, so not pushing to coredev."\n- )\n- return\n- msg = "Ok to push coredev?"\n- if branch:\n- msg = f"Ok to push coredev {branch}?"\n- if ask(msg, default=True):\n- print("Pushing changes to server.")\n- g.push()\n+ # We used to offer pushing the coredev change, but this is no longer a\n+ # good idea.\n+ print(\n+ "WARNING: a change in one or more buildout.coredev branches was made. "\n+ "Please wait a few minutes and then push this change. Otherwise the "\n+ "newly uploaded package is not yet available on all PyPI mirrors. "\n+ "This would cause Jenkins and GitHub Actions to fail."\n+ )\n+ return\n \n \n def update_other_core_branches(data):\n' | ||
|
|