From 2102edde3eb11f363f5d5a0f2490ecf53adc185b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Andrei?= <ericof@gmail.com>
Date: Mon, 6 Dec 2021 11:35:33 -0300
Subject: [PATCH] Support Plone 6.0.0a2

---
 .github/workflows/tests.yml | 2 +-
 CHANGES.rst                 | 5 ++++-
 Makefile                    | 2 +-
 plone-5.2.x.cfg             | 1 +
 plone-6.0.x.cfg             | 7 ++++---
 requirements/plone-6.0.txt  | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5b4b9c4c..a024e3ce 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -7,7 +7,7 @@ jobs:
       fail-fast: false
       matrix:
         python: [3.7, 3.8, 3.9]
-        plone: ["6.0.0a1", "5.2-latest"]
+        plone: ["6.0.0a2", "5.2-latest"]
         exclude:
           - plone: "5.2-latest"
             python: 3.9
diff --git a/CHANGES.rst b/CHANGES.rst
index d4111989..045e2a13 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,7 +4,10 @@ Changelog
 3.1.0a7 (unreleased)
 --------------------
 
-- Nothing changed yet.
+Internal:
+
+- Test with Plone 6.0.0a2
+  [ericof]
 
 
 3.1.0a6 (2021-11-22)
diff --git a/Makefile b/Makefile
index d4999184..46483d79 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ build: .installed.cfg  ## Build Plone 5.2
 .PHONY: Build Plone 6.0
 build-plone-6.0:  bin/pip ## Build Plone 6.0
 	bin/pip install --upgrade pip
-	bin/pip install -r https://dist.plone.org/release/6.0.0a1/requirements.txt
+	bin/pip install -r https://dist.plone.org/release/6.0.0a2/requirements.txt
 	bin/buildout -c plone-6.0.x.cfg
 
 .PHONY: Test
diff --git a/plone-5.2.x.cfg b/plone-5.2.x.cfg
index b1fde4a2..876cba2d 100644
--- a/plone-5.2.x.cfg
+++ b/plone-5.2.x.cfg
@@ -2,6 +2,7 @@
 extends =
     base.cfg
     http://dist.plone.org/release/5.2.5/versions.cfg
+
 find-links += http://dist.plone.org/thirdparty/
 
 [versions]
diff --git a/plone-6.0.x.cfg b/plone-6.0.x.cfg
index 3444dcd6..351f975b 100644
--- a/plone-6.0.x.cfg
+++ b/plone-6.0.x.cfg
@@ -1,9 +1,9 @@
 [buildout]
 extends =
-    https://dist.plone.org/release/6.0.0a1/versions.cfg
+    https://dist.plone.org/release/6.0.0a2/versions.cfg
     base.cfg
-find-links = https://dist.plone.org/release/6.0.0a1/
-versions=versions
+
+find-links += https://dist.plone.org/release/6.0.0a2/
 
 
 [instance]
@@ -11,6 +11,7 @@ recipe = plone.recipe.zope2instance
 zodb-temporary-storage = off
 
 [versions]
+plone.volto =
 black = 21.7b0
 
 # cffi 1.14.3 fails on apple m1
diff --git a/requirements/plone-6.0.txt b/requirements/plone-6.0.txt
index e073f36b..3a0e3a80 100644
--- a/requirements/plone-6.0.txt
+++ b/requirements/plone-6.0.txt
@@ -1,3 +1,3 @@
--c https://dist.plone.org/release/6.0.0a1/constraints.txt
+-c https://dist.plone.org/release/6.0.0a2/constraints.txt
 wheel
 Plone
\ No newline at end of file