From 7fb6bf2581faba4b8c87f4669093634bf237589c Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Sun, 9 Feb 2025 17:04:55 +0100 Subject: [PATCH 1/6] plone 6.1.0 --- versions.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/versions.cfg b/versions.cfg index 58742c4..931d303 100644 --- a/versions.cfg +++ b/versions.cfg @@ -1,8 +1,8 @@ [buildout] extends = - https://dist.plone.org/release/6.0.14/versions.cfg - https://dist.plone.org/release/6.0.14/versions-ecosystem.cfg - https://dist.plone.org/release/6.0.14/versions-extra.cfg + https://dist.plone.org/release/6.1.0/versions.cfg + https://dist.plone.org/release/6.1.0/versions-ecosystem.cfg + https://dist.plone.org/release/6.1.0/versions-extra.cfg [iocomune] version = __CURRENT_VERSION__ From e1d991fcc8c6ba9c5bff77bc563ff61940dc0129 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Sun, 9 Feb 2025 17:08:29 +0100 Subject: [PATCH 2/6] dockerfiles --- Dockerfile | 4 ++-- Dockerfile.acceptance | 4 ++-- Dockerfile.development | 4 ++-- requirements.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 69dd7b7..27bfdf4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM plone/plone-backend:6.0.10.1 +FROM plone/plone-backend:6.1.0 COPY docker/create-constraints.py docker/constraints.cfg docker/requirements.txt /app/ COPY versions.cfg / -RUN pip install -r https://dist.plone.org/release/6.0.10.1/requirements.txt ${PIP_PARAMS} && \ +RUN pip install -r https://dist.plone.org/release/6.1.0/requirements.txt ${PIP_PARAMS} && \ python create-constraints.py constraints.cfg constraints.txt && \ ./bin/pip install --ignore-requires-python -r requirements.txt -c constraints.txt ${PIP_PARAMS} && \ find /app/lib -name LC_MESSAGES -exec chown -R plone:plone {} \; diff --git a/Dockerfile.acceptance b/Dockerfile.acceptance index 174a832..3a1fea9 100644 --- a/Dockerfile.acceptance +++ b/Dockerfile.acceptance @@ -1,7 +1,7 @@ -FROM plone/server-acceptance:6.0.10.1 +FROM plone/server-acceptance:6.1.0 COPY docker/create-constraints.py docker/*.cfg docker/*.txt /app/ COPY versions.cfg / -RUN pip install -r https://dist.plone.org/release/6.0.10.1/requirements.txt ${PIP_PARAMS} && \ +RUN pip install -r https://dist.plone.org/release/6.1.0/requirements.txt ${PIP_PARAMS} && \ python create-constraints.py constraints.cfg constraints.txt && \ ./bin/pip install --ignore-requires-python -r requirements-acceptance.txt -c constraints.txt ${PIP_PARAMS} && \ find /app/lib -name LC_MESSAGES -exec chown -R plone:plone {} \; diff --git a/Dockerfile.development b/Dockerfile.development index 9101e5e..d70efc3 100644 --- a/Dockerfile.development +++ b/Dockerfile.development @@ -1,10 +1,10 @@ -FROM plone/plone-backend:6.0.10.1 +FROM plone/plone-backend:6.1.0 COPY docker/create-constraints.py docker/constraints.cfg docker/requirements.txt requirements-development.txt mx.ini /app/ COPY versions.cfg / -RUN pip install -r https://dist.plone.org/release/6.0.10.1/requirements.txt ${PIP_PARAMS} && \ +RUN pip install -r https://dist.plone.org/release/6.1.0/requirements.txt ${PIP_PARAMS} && \ python create-constraints.py constraints.cfg constraints.txt && \ ./bin/pip install mxdev && \ ./bin/mxdev -c mx.ini && \ diff --git a/requirements.txt b/requirements.txt index 2e4627d..0814af5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ --r https://dist.plone.org/release/6.0.13/requirements.txt +-r https://dist.plone.org/release/6.1.0/requirements.txt From 97ffb22c0e2581f56a501db9835a3c4bbcf7aa61 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Sun, 9 Feb 2025 17:18:19 +0100 Subject: [PATCH 3/6] fix webtest version conflict --- versions.cfg | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/versions.cfg b/versions.cfg index 931d303..f69bfcd 100644 --- a/versions.cfg +++ b/versions.cfg @@ -19,7 +19,11 @@ version = __CURRENT_VERSION__ [versions] # verify during plone version update -grpcio-tools=1.66.2 + +# The conflict is caused by: +# zope-testbrowser 7.0 depends on WebTest>=2.0.30 +# The user requested (constraint) webtest==3.0.1,==3.0.3 +webtest = 3.0.1 # plone missing plone.patternslib = 1.3.0 @@ -98,6 +102,7 @@ design.plone.iocittadino = 1.1.5 Brotli = 1.0.9 cssselect2 = 0.7.0 fonttools = 4.39.3 +grpcio-tools=1.66.2 html5lib = 1.1 isodate = 0.6.1 pdfkit = 1.0.0 From 455e729e089d8f11baecf9e4f3cef2c9bca45e5f Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 11 Feb 2025 20:52:07 +0100 Subject: [PATCH 4/6] fixed --- versions.cfg | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions.cfg b/versions.cfg index f69bfcd..0401c0c 100644 --- a/versions.cfg +++ b/versions.cfg @@ -20,11 +20,6 @@ version = __CURRENT_VERSION__ [versions] # verify during plone version update -# The conflict is caused by: -# zope-testbrowser 7.0 depends on WebTest>=2.0.30 -# The user requested (constraint) webtest==3.0.1,==3.0.3 -webtest = 3.0.1 - # plone missing plone.patternslib = 1.3.0 plone.formwidget.contenttree = 1.2.0 From 8ea85c17184e2b5cef94e82e2ecb5712f37cdd76 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 11 Feb 2025 21:00:27 +0100 Subject: [PATCH 5/6] fix test --- versions.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/versions.cfg b/versions.cfg index 0401c0c..be9725e 100644 --- a/versions.cfg +++ b/versions.cfg @@ -19,6 +19,7 @@ version = __CURRENT_VERSION__ [versions] # verify during plone version update +Products.validation = 3.0.1 # plone missing plone.patternslib = 1.3.0 From a8c403dbfb358610854e8c355d3ac812e6e903e3 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 11 Feb 2025 21:17:32 +0100 Subject: [PATCH 6/6] docker --- docker/create-constraints.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docker/create-constraints.py b/docker/create-constraints.py index 4e4e68d..827cd2e 100644 --- a/docker/create-constraints.py +++ b/docker/create-constraints.py @@ -37,6 +37,14 @@ # Note: this works like a dictionary, but is a class 'zc.buildout.buildout.Options'. versions = config.versions +# remove duplicated entries +uniq = {} +for (package, version) in versions.items(): + if package.lower() in uniq and version.split(".") < uniq[package.lower()].split("."): + continue + uniq[package.lower()] = version +versions = uniq + with open(constraints_file, "w") as cfile: cfile.write("# File created by {}\n".format(__file__)) cfile.write("# Constraints parsed from {}\n".format(config_file))