Update to Plone 5.2.14 and 6.0.9

.gitignore

@@ -20,6 +20,7 @@ __pycache__/
 .tox
 .vscode/
 node_modules/
+.settings/
 
 # venv / buildout related
 bin/
@@ -35,6 +36,7 @@ lib64
 parts/
 pyvenv.cfg
 var/
+local.cfg
 
 # mxdev
 /instance/

Makefile

@@ -20,16 +20,6 @@ all: build-plone-6.0
 help: ## This help message
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
-.PHONY: Update Makefile and Buildout
-update: ## Update Make and Buildout
-	wget -O Makefile https://raw.githubusercontent.com/kitconcept/buildout/master/Makefile
-	wget -O requirements.txt https://raw.githubusercontent.com/kitconcept/buildout/master/requirements.txt
-	wget -O plone-4.3.x.cfg https://raw.githubusercontent.com/kitconcept/buildout/master/plone-4.3.x.cfg
-	wget -O plone-5.1.x.cfg https://raw.githubusercontent.com/kitconcept/buildout/master/plone-5.1.x.cfg
-	wget -O plone-5.2.x.cfg https://raw.githubusercontent.com/kitconcept/buildout/master/plone-5.2.x.cfg
-	wget -O ci.cfg https://raw.githubusercontent.com/kitconcept/buildout/master/ci.cfg
-	wget -O versions.cfg https://raw.githubusercontent.com/kitconcept/buildout/master/versions.cfg
-
 .installed.cfg: bin/buildout *.cfg
 	bin/buildout
 
@@ -47,24 +37,6 @@ py2:
 	bin/pip install --upgrade pip
 	bin/pip install -r requirements.txt
 
-.PHONY: Build Plone 4.3
-build-plone-4.3: py2 ## Build Plone 4.3
-	bin/pip install --upgrade pip
-	bin/pip install -r requirements.txt
-	bin/buildout -c plone-4.3.x.cfg
-
-.PHONY: Build Plone 5.0
-build-plone-5.0: py2 ## Build Plone 5.0
-	bin/pip install --upgrade pip
-	bin/pip install -r requirements.txt
-	bin/buildout -c plone-5.0.x.cfg
-
-.PHONY: Build Plone 5.1
-build-plone-5.1: py2  ## Build Plone 5.1
-	bin/pip install --upgrade pip
-	bin/pip install -r requirements.txt
-	bin/buildout -c plone-5.1.x.cfg
-
 .PHONY: Build Plone 5.2 with Python 2
 build-plone-5.2-py: py2  ## Build Plone 5.2 with Python 2
 	bin/pip install --upgrade pip

base.cfg

@@ -7,11 +7,16 @@ parts =
     coverage
     test-coverage
     code-analysis
+    omelette
     releaser
 develop = .
 sources-dir = extras
 auto-checkout =
 
+[versions]
+# Do not use a release of plone.rest:
+plone.rest =
+
 [instance]
 recipe = plone.recipe.zope2instance
 user = admin:admin
@@ -59,6 +64,10 @@ eggs =
     readme
     docutils
 
+[omelette]
+recipe = collective.recipe.omelette
+eggs = ${instance:eggs}
+
 [sources]
 plone.dexterity = git git://github.com/plone/plone.dexterity.git [email protected]:plone/plone.dexterity.git branch=plip-680
 plone.rest = git git://github.com/plone/plone.rest.git [email protected]:plone/plone.rest.git branch=main

news/178.internal

@@ -0,0 +1 @@
+Update Plone to 6.0.9 and 5.2.14 in buildout. Also removes buildout of unsupported Plone versions. @wesleybl

plone-5.2.x.cfg

@@ -1,26 +1,4 @@
 [buildout]
 extends =
+    https://dist.plone.org/release/5.2.14/versions.cfg
     base.cfg
-    https://dist.plone.org/release/5.2.7/versions.cfg
-find-links += https://dist.plone.org/thirdparty/
-versions=versions
-
-[versions]
-plone.rest =
-black = 23.3.0
-
-# Error: The requirement ('virtualenv>=20.0.35') is not allowed by your [versions] constraint (20.0.26)
-virtualenv = 20.0.35
-
-# Error: The requirement ('pep517>=0.9') is not allowed by your [versions] constraint (0.8.2)
-pep517 = 0.9.1
-
-# Error: The requirement ('importlib-metadata>=1') is not allowed by your [versions] constraint (0.23)
-importlib-metadata = 2.0.0
-
-# cryptography 3.4 requires a rust compiler installed on the system:
-# https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst#34---2021-02-07
-cryptography = 3.3.2
-
-# cffi 1.14.3 fails on apple m1
-cffi = 1.14.4

plone-6.0.x.cfg

@@ -1,20 +1,4 @@
 [buildout]
 extends =
-    https://dist.plone.org/release/6.0.7/versions.cfg
+    https://dist.plone.org/release/6.0.9/versions.cfg
     base.cfg
-
-[instance]
-recipe = plone.recipe.zope2instance
-zodb-temporary-storage = off
-
-[versions]
-plone.rest =
-black = 23.3.0
-pygments = 2.14.0
-
-# all this is necessary to make the p.a.contenttypes (robotframework) test dependency happy :(
-robotframework-browser = 17.5.2
-robotframework-assertion-engine = 2.0.0
-robotframework-debuglibrary = 2.3.0
-robotframework-pythonlibcore = 4.2.0
-grpcio-tools = 1.59.0

requirements-5.2.txt

@@ -1,12 +1 @@
-# Keep this file in sync with: https://dist.plone.org/release/5.2.9/requirements.txt
-setuptools==42.0.2
-zc.buildout==2.13.7
-wheel==0.37.1
-
-# Windows specific down here (has to be installed here, fails in buildout)
-# Dependency of zope.sendmail:
-pywin32 ; platform_system == 'Windows'
-# SSL Certs on Windows, because Python is missing them otherwise:
-certifi ; platform_system == 'Windows'
-# Dependency of collective.recipe.omelette:
-ntfsutils ; platform_system == 'Windows' and python_version < '3.0'
+-r https://dist.plone.org/release/5.2.14/requirements.txt

requirements-6.0.txt

@@ -1 +1 @@
--r https://dist.plone.org/release/6.0.7/requirements.txt
+-r https://dist.plone.org/release/6.0.9/requirements.txt

requirements.txt

@@ -1,4 +1 @@
-# Keep this file in sync with: https://github.com/kitconcept/buildout/edit/master/requirements.txt
-setuptools==42.0.2
-zc.buildout==2.13.4
-wheel
+-r requirements-6.0.txt