Merge f8ee80f into 862de6f

Makefile

@@ -3,7 +3,7 @@
 SHELL := /bin/bash
 CURRENT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
-version = 3
+version = 3.7
 
 # We like colors
 # From: https://coderwall.com/p/izxssa/colored-makefile-for-golang-projects
@@ -88,6 +88,12 @@ test-performance:
 .PHONY: Code Analysis
 code-analysis:  ## Code Analysis
 	bin/code-analysis
+	if [ -f "bin/black" ]; then bin/black src/ --check ; fi
+
+.PHONY: Black
+black:  ## Black
+	bin/code-analysis
+	if [ -f "bin/black" ]; then bin/black src/ ; fi
 
 .PHONY: Build Docs
 docs:  ## Build Docs

plone-4.3.x.cfg

@@ -16,4 +16,4 @@ zipp = 0.5.2
 # more-itertools >= 6.0.0 dropped python2.7 support
 more-itertools = 5.0.0
 # Error: The requirement ('Pygments>=2.5.1') is not allowed by your [versions] constraint (2.2.0)
-Pygments = 2.5.2
+Pygments = 2.5.2

plone-5.1.x.cfg

@@ -5,8 +5,6 @@ extends =
     versions.cfg
 
 [versions]
-coverage = 5.1
-
 # fixes: SyntaxError: invalid syntax (more.py, line 340)
 zipp = 0.5.2
 
@@ -30,4 +28,4 @@ sphinxcontrib-httpdomain = 1.5.0
 sphinx-rtd-theme = 0.2.4
 Jinja2 = 2.10
 Babel = 2.5.1
-astunparse = 1.6.2
+astunparse = 1.6.2

plone-5.2.x.cfg

@@ -2,18 +2,5 @@
 extends =
     base.cfg
     http://dist.plone.org/release/5.2.1/versions.cfg
-    versions.cfg
 find-links += http://dist.plone.org/thirdparty/
 versions=versions
-
-[versions]
-plone.restapi =
-urllib3 = 1.21.1
-idna = 2.5
-lxml = 4.4.2
-astunparse = 1.6.2
-
-# Add support for not queries in the UUIDIndex
-# This is needed to exclude self from the context-aware
-# querystring-search which is used by the Volto Listing Block
-Products.ZCatalog = 5.1

requirements.txt

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

versions.cfg

@@ -4,12 +4,18 @@ setuptools =
 zc.buildout =
 zc.recipe.egg = 2.0.3
 
+# fixes Getting distribution for 'configparser'. assert newdist is not None  # newloc above is missing our dist?!
+configparser = 3.5.3
+
+# fixes Error: The requirement ('Pygments>=2.5.1') is not allowed by your [versions] constraint (2.2.0)
+Pygments = 2.5.1
+
 # plone.recipe.varnish
 plone.recipe.varnish = 1.3
 
 # Code-analysis
 plone.recipe.codeanalysis = 3.0.1
-coverage = 5.1
+coverage = 3.7.1
 pep8 = 1.7.1
 flake8 = 3.5.0
 flake8-coding = 1.3.2
@@ -31,4 +37,4 @@ sphinxcontrib-httpexample = 0.7.0
 sphinxcontrib-httpdomain = 1.5.0
 sphinx-rtd-theme = 0.2.4
 Jinja2 = 2.10
-Babel = 2.5.1
+Babel = 2.5.1