Merge pull request #96 from plone/kitconcept-buildout

Kitconcept buildout

CHANGES.rst

@@ -8,6 +8,12 @@ Changelog
 
 .. towncrier release notes start
 
+1.5.1 (unreleased)
+------------------
+
+- Nothing changed yet.
+
+
 1.4.0 (2018-11-08)
 ------------------
 

Makefile

@@ -3,7 +3,7 @@
 SHELL := /bin/bash
 CURRENT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
-version = 2.7
+version = 3.7
 
 # We like colors
 # From: https://coderwall.com/p/izxssa/colored-makefile-for-golang-projects
@@ -36,22 +36,31 @@ update: ## Update Make and Buildout
 bin/buildout: bin/pip
 	bin/pip install --upgrade pip
 	bin/pip install -r requirements.txt
+	bin/pip install black || true
 	@touch -c $@
 
+bin/python bin/pip:
+	python$(version) -m venv . || virtualenv --clear --python=python$(version) .
+
+py2:
+	virtualenv --clear --python=python2 .
+	bin/pip install --upgrade pip
+	bin/pip install -r requirements.txt
+
 .PHONY: Build Plone 4.3
-build-plone-4.3: .installed.cfg ## 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: .installed.cfg ## 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: .installed.cfg  ## 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
@@ -62,17 +71,6 @@ build-plone-5.2: .installed.cfg  ## Build Plone 5.2
 	bin/pip install -r requirements.txt
 	bin/buildout -c plone-5.2.x.cfg
 
- ## Build Plone 5.2 with Python 3
-build-py3:  ## Build Plone 5.2 with Python 3
-	virtualenv --python=python3 .
-	bin/pip install --upgrade pip
-	bin/pip install -r requirements.txt
-	bin/pip install black
-	bin/buildout -c plone-5.2.x.cfg
-
-bin/python bin/pip:
-	virtualenv --clear --python=python$(version) .
-
 .PHONY: Test
 test:  ## Test
 	bin/test
@@ -84,6 +82,7 @@ test-performance:
 .PHONY: Code Analysis
 code-analysis:  ## Code Analysis
 	bin/code-analysis
+	bin/black src/
 
 .PHONY: Build Docs
 docs:  ## Build Docs

buildout.cfg

@@ -1,3 +1,3 @@
 [buildout]
-extends = plone-5.1.x.cfg
+extends = plone-5.2.x.cfg
 

plone-4.3.x.cfg

@@ -1,7 +1,7 @@
 [buildout]
 extends =
     base.cfg
-    http://dist.plone.org/release/4.3.18/versions.cfg
+    http://dist.plone.org/release/4.3.19/versions.cfg
     versions.cfg
 
 [versions]
@@ -10,3 +10,4 @@ zope.interface = 4.1.0
 # fixes zlib failure: https://stackoverflow.com/questions/34631806/fail-during-installation-of-pillow-python-module-in-linux
 Pillow = 5.4.1
 future = 0.17.1
+six = 1.11.0

plone-5.0.x.cfg

@@ -1,5 +1,5 @@
 [buildout]
 extends =
     base.cfg
-    http://dist.plone.org/release/5.0.8/versions.cfg
+    http://dist.plone.org/release/5.0.10/versions.cfg
     versions.cfg

requirements.txt

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

setup.py

@@ -6,7 +6,7 @@ def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 
-version = '1.4.1.dev0'
+version = '1.5.1.dev0'
 
 long_description = (
     read('README.rst') + '\n\n' +

versions.cfg

@@ -1,14 +1,36 @@
 [versions]
+httpie = 0.9.4
+
 # Buildout
 setuptools =
 zc.buildout =
 zc.recipe.egg = 2.0.3
 
-httpie = 0.9.4
-
-# Misc
-plone.recipe.zope2instance = 4.4.0
-
 # plone.recipe.varnish
 plone.recipe.varnish = 1.3
 
+# Code-analysis
+plone.recipe.codeanalysis = 3.0.1
+coverage = 3.7.1
+pep8 = 1.7.1
+flake8 = 3.5.0
+flake8-coding = 1.3.2
+pycodestyle = 2.3.1
+
+# Release
+zest.releaser = 6.17.0
+twine = 1.11.0
+requests = 2.18.4
+towncrier = 19.2.0
+zestreleaser.towncrier = 1.1.0
+docutils = 0.13.1
+
+# Sphinx
+Sphinx = 1.6.5
+docutils = 0.14
+Pygments = 2.2.0
+sphinxcontrib-httpexample = 0.7.0
+sphinxcontrib-httpdomain = 1.5.0
+sphinx-rtd-theme = 0.2.4
+Jinja2 = 2.10
+Babel = 2.5.1