From b729fe0d686d2ff560887e31183c10cb680660c3 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Fri, 5 Jul 2024 14:29:23 +0200 Subject: [PATCH 1/9] upgrade to plone 6.0.11.1 --- CHANGELOG.md | 4 ++++ versions.cfg | 13 ++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e791d35..9b0504b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## yyyymmdd-vv +- upgrade to plone 6.0.11.1 [mamico] +- update node/node.ext.ldap/node.ext.ugm [mamico] + ## 20240624-03 - update design.plone.contenttypes from 6.2.11 -> 6.2.12 [lucabel] diff --git a/versions.cfg b/versions.cfg index 378e737..e2fc541 100644 --- a/versions.cfg +++ b/versions.cfg @@ -1,8 +1,8 @@ [buildout] extends = - https://dist.plone.org/release/6.0.10.1/versions.cfg - https://dist.plone.org/release/6.0.10.1/versions-ecosystem.cfg - https://dist.plone.org/release/6.0.10.1/versions-extra.cfg + https://dist.plone.org/release/6.0.11.1/versions.cfg + https://dist.plone.org/release/6.0.11.1/versions-ecosystem.cfg + https://dist.plone.org/release/6.0.11.1/versions-extra.cfg [iocomune] version = __CURRENT_VERSION__ @@ -19,7 +19,6 @@ zope-conf-additional = [versions] # verify during plone version update -plone.restapi = 9.6.0 # plone missing plone.patternslib = 1.3.0 @@ -146,9 +145,9 @@ perfmetrics = 3.3.0 # LDAP bda.cache = 1.3.0 five.globalrequest = 99.1 -node = 1.2.1 -node.ext.ldap = 1.1 -node.ext.ugm = 1.0 +node = 1.2.2 +node.ext.ldap = 1.2 +node.ext.ugm = 1.1 odict = 1.9.0 pas.plugins.ldap = 1.8.2 passlib = 1.7.4 From ea362383fc47595d850cd0fc1225ff8da3952740 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Mon, 8 Jul 2024 13:55:48 +0200 Subject: [PATCH 2/9] cleanup dos_protection hack removed --- CHANGELOG.md | 2 ++ versions.cfg | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b0504b..454a1da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## yyyymmdd-vv - upgrade to plone 6.0.11.1 [mamico] - update node/node.ext.ldap/node.ext.ugm [mamico] +- dos_protection removed (there is a monkey in Products.CMFPlone that + fix the issue) [mamico] ## 20240624-03 - update design.plone.contenttypes from 6.2.11 -> 6.2.12 [lucabel] diff --git a/versions.cfg b/versions.cfg index e2fc541..e15e780 100644 --- a/versions.cfg +++ b/versions.cfg @@ -7,15 +7,15 @@ extends = [iocomune] version = __CURRENT_VERSION__ -[config] -maxupload = 120MB +#[config] +#maxupload = 120MB # workaround per https://github.com/plone/Products.CMFPlone/issues/3848 -[instance-settings] -zope-conf-additional = - - form-memory-limit ${config:maxupload} - +#[instance-settings] +#zope-conf-additional = +# +# form-memory-limit ${config:maxupload} +# [versions] # verify during plone version update From 8fda5ba02f2c61893982c88aa693b73b0668ab5b Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 6 Aug 2024 02:06:15 +0200 Subject: [PATCH 3/9] plone 6.0.12 --- versions.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/versions.cfg b/versions.cfg index 2e85063..48796f5 100644 --- a/versions.cfg +++ b/versions.cfg @@ -1,8 +1,8 @@ [buildout] extends = - https://dist.plone.org/release/6.0.11.1/versions.cfg - https://dist.plone.org/release/6.0.11.1/versions-ecosystem.cfg - https://dist.plone.org/release/6.0.11.1/versions-extra.cfg + https://dist.plone.org/release/6.0.12/versions.cfg + https://dist.plone.org/release/6.0.12/versions-ecosystem.cfg + https://dist.plone.org/release/6.0.12/versions-extra.cfg [iocomune] version = __CURRENT_VERSION__ From 31e28e4a4fb81696ce6d850a45ea527b2e317658 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 10 Sep 2024 09:35:49 +0200 Subject: [PATCH 4/9] fix buildout --- development.cfg | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/development.cfg b/development.cfg index 8e80097..905d74c 100644 --- a/development.cfg +++ b/development.cfg @@ -11,7 +11,7 @@ [buildout] extends = - https://raw.githubusercontent.com/plone/buildout.coredev/6.0.10.1/buildout.cfg + https://raw.githubusercontent.com/plone/buildout.coredev/6.0.13/buildout.cfg versions.cfg parts += site diff --git a/requirements.txt b/requirements.txt index 5f29083..2e4627d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ --r https://dist.plone.org/release/6.0.10.1/requirements.txt \ No newline at end of file +-r https://dist.plone.org/release/6.0.13/requirements.txt From 671d0e73f88a255e4e82374fcae19a7b60ad12dc Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 10 Sep 2024 09:46:30 +0200 Subject: [PATCH 5/9] test --- CHANGELOG.md | 1 - development.cfg | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a39de74..d7936a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -70,7 +70,6 @@ - Add slate compatibility ## 20240723-01 ->>>>>>> main - update redturtle.volto 5.5.0 -> 5.5.1 - Allow to select which image miniature use in RSS [lucabel] diff --git a/development.cfg b/development.cfg index 905d74c..dc384e5 100644 --- a/development.cfg +++ b/development.cfg @@ -17,10 +17,12 @@ parts += site omelette allow-picked-versions = false +custom-eggs += + design.plone.policy + design.plone.contenttypes [instance] eggs += - design.plone.policy collective.upgrade [site] From 29bc9dfeae2aced06724b2b108d82f721dc85cc8 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Tue, 10 Sep 2024 09:54:26 +0200 Subject: [PATCH 6/9] py311 --- .github/workflows/buildout.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildout.yml b/.github/workflows/buildout.yml index 562f116..385469f 100644 --- a/.github/workflows/buildout.yml +++ b/.github/workflows/buildout.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.11" - name: Install dependencies run: | python -m pip install --upgrade pip From a2f13016cfee26bd46797fbc354552e71c8f7969 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Thu, 12 Sep 2024 15:18:04 +0200 Subject: [PATCH 7/9] remove design.* from tests --- development.cfg | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/development.cfg b/development.cfg index dc384e5..84b2107 100644 --- a/development.cfg +++ b/development.cfg @@ -17,13 +17,15 @@ parts += site omelette allow-picked-versions = false -custom-eggs += - design.plone.policy - design.plone.contenttypes +#custom-eggs += +# design.plone.policy +# design.plone.contenttypes [instance] eggs += collective.upgrade + design.plone.policy + design.plone.contenttypes [site] recipe = collective.recipe.plonesite From e2a0ce2a0ec01f04b76b09644a1ef55b600e5718 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Thu, 12 Sep 2024 15:29:44 +0200 Subject: [PATCH 8/9] remove tests for plone.app.portlets --- development.cfg | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/development.cfg b/development.cfg index 84b2107..dfd386c 100644 --- a/development.cfg +++ b/development.cfg @@ -17,9 +17,11 @@ parts += site omelette allow-picked-versions = false -#custom-eggs += -# design.plone.policy -# design.plone.contenttypes +test-eggs += + design.plone.policy[test] + design.plone.contenttypes[test] +test-eggs -= + plone.app.portlets [test] [instance] eggs += From 212565b6ad1d059351a5e6c23662f336b349af12 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Thu, 12 Sep 2024 17:49:53 +0200 Subject: [PATCH 9/9] remove design.* tests --- development.cfg | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/development.cfg b/development.cfg index dfd386c..9ea399c 100644 --- a/development.cfg +++ b/development.cfg @@ -17,11 +17,13 @@ parts += site omelette allow-picked-versions = false -test-eggs += - design.plone.policy[test] - design.plone.contenttypes[test] -test-eggs -= - plone.app.portlets [test] +# XXX: se si aggiungono i test di design.* di rompono quelli di plone, in particolare +# plone.app.portlets. rimuoverlo col -= del buildout sembra non funzionare +# test-eggs += +# design.plone.policy[test] +# design.plone.contenttypes[test] +# test-eggs -= +# plone.app.portlets [test] [instance] eggs +=