-
-
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/4.x.x Date: 2024-12-17T09:23:14-08:00 Author: David Glick (davisagli) <[email protected]> Commit: plone/plone.volto@861065b Preparing release 4.4.4 Files changed: M CHANGES.rst M setup.py D news/172.bugfix Repository: plone.volto Branch: refs/heads/4.x.x Date: 2024-12-17T09:23:40-08:00 Author: David Glick (davisagli) <[email protected]> Commit: plone/plone.volto@0363b8d Back to development: 4.4.5 Files changed: M setup.py
- Loading branch information
Showing
1 changed file
with
12 additions
and
49 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 |
|---|---|---|
|
|
@@ -2,68 +2,31 @@ Repository: plone.volto | |
|
|
||
|
|
||
| Branch: refs/heads/4.x.x | ||
| Date: 2024-12-17T08:50:30-08:00 | ||
| Date: 2024-12-17T09:23:14-08:00 | ||
| Author: David Glick (davisagli) <[email protected]> | ||
| Commit: https://github.com/plone/plone.volto/commit/30fd433d92c779afe8251f6f0b331f9d1fbdb75f | ||
| Commit: https://github.com/plone/plone.volto/commit/861065b4878058755d9028d24e002037962b22b3 | ||
|
|
||
| test with Plone 6.0.13 | ||
| Preparing release 4.4.4 | ||
|
|
||
| Files changed: | ||
| M .github/workflows/tests.yml | ||
| M Makefile | ||
| M plone-6.0.x.cfg | ||
| M CHANGES.rst | ||
| M setup.py | ||
| D news/172.bugfix | ||
|
|
||
| b'diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml\nindex 18ae8a7..0cf8417 100644\n--- a/.github/workflows/tests.yml\n+++ b/.github/workflows/tests.yml\n@@ -6,11 +6,9 @@ jobs:\n strategy:\n fail-fast: false\n matrix:\n- python: [3.7, 3.8, 3.9, "3.10", "3.11"]\n- plone: ["6.0.6", "5.2.10"]\n+ python: [3.8, 3.9, "3.10", "3.11"]\n+ plone: ["6.0.13", "5.2.10"]\n exclude:\n- - plone: "6.0.6"\n- python: 3.7\n - plone: "5.2.10"\n python: 3.9\n - plone: "5.2.10"\ndiff --git a/Makefile b/Makefile\nindex ec7dc4b..828473c 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -16,7 +16,7 @@ RESET=`tput sgr0`\n YELLOW=`tput setaf 3`\n \n PLONE5=5.2.10\n-PLONE6=6.0.6\n+PLONE6=6.0.13\n \n CODE_QUALITY_VERSION=1.0.1\n LINT=docker run --rm -v "$(PWD)":/github/workspace plone/code-quality:${CODE_QUALITY_VERSION} check\ndiff --git a/plone-6.0.x.cfg b/plone-6.0.x.cfg\nindex 098e043..ff69a97 100644\n--- a/plone-6.0.x.cfg\n+++ b/plone-6.0.x.cfg\n@@ -1,6 +1,6 @@\n [buildout]\n extends =\n- https://dist.plone.org/release/6.0.6/versions.cfg\n+ https://dist.plone.org/release/6.0.13/versions.cfg\n base.cfg\n \n [instance]\n' | ||
| b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 6fc6765a..15b1ed0d 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -8,6 +8,15 @@ Changelog\n \n .. towncrier release notes start\n \n+4.4.4 (2024-12-17)\n+------------------\n+\n+Bug fixes:\n+\n+\n+- Allow setting `preview_image_link` to an image from a different language root folder. @davisagli (#172)\n+\n+\n 4.4.3 (2024-08-01)\n ------------------\n \ndiff --git a/news/172.bugfix b/news/172.bugfix\ndeleted file mode 100644\nindex c4d213e8..00000000\n--- a/news/172.bugfix\n+++ /dev/null\n@@ -1 +0,0 @@\n-Allow setting `preview_image_link` to an image from a different language root folder. @davisagli\ndiff --git a/setup.py b/setup.py\nindex 49dce306..fd7eb4e1 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -25,7 +25,7 @@ def readfile(name):\n \n setup(\n name="plone.volto",\n- version="4.4.4.dev0",\n+ version="4.4.4",\n description="Volto integration add-on for Plone",\n long_description=long_description,\n # Get more from https://pypi.org/classifiers/\n' | ||
|
|
||
| Repository: plone.volto | ||
|
|
||
|
|
||
| Branch: refs/heads/4.x.x | ||
| Date: 2024-12-17T08:55:02-08:00 | ||
| Date: 2024-12-17T09:23:40-08:00 | ||
| Author: David Glick (davisagli) <[email protected]> | ||
| Commit: https://github.com/plone/plone.volto/commit/637e2e48426c96cf47366c468a58510320e49012 | ||
| Commit: https://github.com/plone/plone.volto/commit/0363b8d7b0dc93642917353b29abd9b5034bf454 | ||
|
|
||
| update plone/setup-plone | ||
| Back to development: 4.4.5 | ||
|
|
||
| Files changed: | ||
| M .github/workflows/tests.yml | ||
| M setup.py | ||
|
|
||
| b'diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml\nindex 0cf8417..89c0fd1 100644\n--- a/.github/workflows/tests.yml\n+++ b/.github/workflows/tests.yml\n@@ -22,7 +22,7 @@ jobs:\n \n - name: Setup Plone ${{ matrix.plone }} with Python ${{ matrix.python }}\n id: setup\n- uses: plone/[email protected]\n+ uses: plone/[email protected]\n with:\n python-version: ${{ matrix.python }}\n plone-version: ${{ matrix.plone }}\n' | ||
|
|
||
| Repository: plone.volto | ||
|
|
||
|
|
||
| Branch: refs/heads/4.x.x | ||
| Date: 2024-12-17T08:58:00-08:00 | ||
| Author: David Glick (davisagli) <[email protected]> | ||
| Commit: https://github.com/plone/plone.volto/commit/96d8a6d8cbe6dc1ca7a898e5423fc186d38de345 | ||
|
|
||
| Also update Plone 5 version | ||
|
|
||
| Files changed: | ||
| M .github/workflows/tests.yml | ||
| M Makefile | ||
| M plone-5.2.x.cfg | ||
|
|
||
| b'diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml\nindex 89c0fd1..6cf2235 100644\n--- a/.github/workflows/tests.yml\n+++ b/.github/workflows/tests.yml\n@@ -7,13 +7,13 @@ jobs:\n fail-fast: false\n matrix:\n python: [3.8, 3.9, "3.10", "3.11"]\n- plone: ["6.0.13", "5.2.10"]\n+ plone: ["6.0.13", "5.2.15"]\n exclude:\n- - plone: "5.2.10"\n+ - plone: "5.2.15"\n python: 3.9\n- - plone: "5.2.10"\n+ - plone: "5.2.15"\n python: "3.10"\n- - plone: "5.2.10"\n+ - plone: "5.2.15"\n python: "3.11"\n \n steps:\ndiff --git a/Makefile b/Makefile\nindex 828473c..7bd7a39 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -15,7 +15,7 @@ GREEN=`tput setaf 2`\n RESET=`tput sgr0`\n YELLOW=`tput setaf 3`\n \n-PLONE5=5.2.10\n+PLONE5=5.2.15\n PLONE6=6.0.13\n \n CODE_QUALITY_VERSION=1.0.1\ndiff --git a/plone-5.2.x.cfg b/plone-5.2.x.cfg\nindex 82926b3..f70d4e3 100644\n--- a/plone-5.2.x.cfg\n+++ b/plone-5.2.x.cfg\n@@ -1,7 +1,7 @@\n [buildout]\n extends =\n base.cfg\n- http://dist.plone.org/release/5.2.10/versions.cfg\n+ http://dist.plone.org/release/5.2.15/versions.cfg\n find-links += http://dist.plone.org/thirdparty/\n \n [versions]\n' | ||
|
|
||
| Repository: plone.volto | ||
|
|
||
|
|
||
| Branch: refs/heads/4.x.x | ||
| Date: 2024-12-17T09:05:41-08:00 | ||
| Author: David Glick (davisagli) <[email protected]> | ||
| Commit: https://github.com/plone/plone.volto/commit/f1d47d888f0bfeffa83bd276ca6e662c4b992778 | ||
|
|
||
| Merge pull request #174 from plone/4.x-update-ci | ||
|
|
||
| test with Plone 6.0.13 | ||
|
|
||
| Files changed: | ||
| M .github/workflows/tests.yml | ||
| M Makefile | ||
| M plone-5.2.x.cfg | ||
| M plone-6.0.x.cfg | ||
|
|
||
| b'diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml\nindex 18ae8a7..6cf2235 100644\n--- a/.github/workflows/tests.yml\n+++ b/.github/workflows/tests.yml\n@@ -6,16 +6,14 @@ jobs:\n strategy:\n fail-fast: false\n matrix:\n- python: [3.7, 3.8, 3.9, "3.10", "3.11"]\n- plone: ["6.0.6", "5.2.10"]\n+ python: [3.8, 3.9, "3.10", "3.11"]\n+ plone: ["6.0.13", "5.2.15"]\n exclude:\n- - plone: "6.0.6"\n- python: 3.7\n- - plone: "5.2.10"\n+ - plone: "5.2.15"\n python: 3.9\n- - plone: "5.2.10"\n+ - plone: "5.2.15"\n python: "3.10"\n- - plone: "5.2.10"\n+ - plone: "5.2.15"\n python: "3.11"\n \n steps:\n@@ -24,7 +22,7 @@ jobs:\n \n - name: Setup Plone ${{ matrix.plone }} with Python ${{ matrix.python }}\n id: setup\n- uses: plone/[email protected]\n+ uses: plone/[email protected]\n with:\n python-version: ${{ matrix.python }}\n plone-version: ${{ matrix.plone }}\ndiff --git a/Makefile b/Makefile\nindex ec7dc4b..7bd7a39 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -15,8 +15,8 @@ GREEN=`tput setaf 2`\n RESET=`tput sgr0`\n YELLOW=`tput setaf 3`\n \n-PLONE5=5.2.10\n-PLONE6=6.0.6\n+PLONE5=5.2.15\n+PLONE6=6.0.13\n \n CODE_QUALITY_VERSION=1.0.1\n LINT=docker run --rm -v "$(PWD)":/github/workspace plone/code-quality:${CODE_QUALITY_VERSION} check\ndiff --git a/plone-5.2.x.cfg b/plone-5.2.x.cfg\nindex 82926b3..f70d4e3 100644\n--- a/plone-5.2.x.cfg\n+++ b/plone-5.2.x.cfg\n@@ -1,7 +1,7 @@\n [buildout]\n extends =\n base.cfg\n- http://dist.plone.org/release/5.2.10/versions.cfg\n+ http://dist.plone.org/release/5.2.15/versions.cfg\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 098e043..ff69a97 100644\n--- a/plone-6.0.x.cfg\n+++ b/plone-6.0.x.cfg\n@@ -1,6 +1,6 @@\n [buildout]\n extends =\n- https://dist.plone.org/release/6.0.6/versions.cfg\n+ https://dist.plone.org/release/6.0.13/versions.cfg\n base.cfg\n \n [instance]\n' | ||
| b'diff --git a/setup.py b/setup.py\nindex fd7eb4e..66bed59 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -25,7 +25,7 @@ def readfile(name):\n \n setup(\n name="plone.volto",\n- version="4.4.4",\n+ version="4.4.5.dev0",\n description="Volto integration add-on for Plone",\n long_description=long_description,\n # Get more from https://pypi.org/classifiers/\n' | ||
|
|
||