Skip to content

Commit

Permalink
Merge db0ef0d into 878ff92
Browse files Browse the repository at this point in the history
  • Loading branch information
tisto committed Sep 25, 2020
2 parents 878ff92 + db0ef0d commit 1cee06d
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 37 deletions.
8 changes: 7 additions & 1 deletion Makefile
Expand Up @@ -3,7 +3,7 @@
SHELL := /bin/bash
CURRENT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))

version = 3.7
version = 3

# We like colors
# From: https://coderwall.com/p/izxssa/colored-makefile-for-golang-projects
Expand Down Expand Up @@ -71,6 +71,12 @@ build-plone-5.2: .installed.cfg ## Build Plone 5.2
bin/pip install -r requirements.txt
bin/buildout -c plone-5.2.x.cfg

.PHONY: Build Plone 5.2 Performance
build-plone-5.2-performance: .installed.cfg ## Build Plone 5.2
bin/pip install --upgrade pip
bin/pip install -r requirements.txt
bin/buildout -c plone-5.2.x-performance.cfg

.PHONY: Test
test: ## Test
bin/test
Expand Down
36 changes: 10 additions & 26 deletions plone-4.3.x.cfg
@@ -1,38 +1,22 @@
[buildout]
extends =
base.cfg
http://dist.plone.org/release/4.3.19/versions.cfg
https://dist.plone.org/release/4.3.19/versions.cfg
versions.cfg

[versions]
plone.testing = 5.0.0
pytz = 2017.3
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

# Required for Python 2.7 compatibility
more-itertools = <6.0.0
zipp = >=0.5, <2a

# plone.restapi specific
plone.schema = 1.2.0

# zest.releaser
zest.releaser = 6.20.1
twine = 1.11.0
requests = 2.22.0
towncrier = 19.2.0
zestreleaser.towncrier = 1.1.0
# docutils = 0.13.1

# Sphinx
Sphinx = 1.6.5
docutils = 0.14
# fixes: SyntaxError: invalid syntax (more.py, line 340)
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
sphinxcontrib-httpexample = 0.7.0
sphinxcontrib-httpdomain = 1.5.0
sphinx-rtd-theme = 0.2.4
Jinja2 = 2.10
Babel = 2.5.1
astunparse = 1.6.2
# SyntaxError: invalid syntax (_pmap.py, line 98)
pyrsistent = 0.16.0
13 changes: 8 additions & 5 deletions plone-5.1.x.cfg
@@ -1,30 +1,33 @@
[buildout]
extends =
base.cfg
http://dist.plone.org/release/5.1.6/versions.cfg
https://dist.plone.org/release/5.1.6/versions.cfg
versions.cfg

[versions]
plone.testing = 5.0.0

# fixes: SyntaxError: invalid syntax (more.py, line 340)
zipp = 0.5.2

# plone.restapi specific
plone.schema = 1.2.0
plone.schema = 1.2.1

# zest.releaser
zest.releaser = 6.20.1
twine = 1.11.0
requests = 2.22.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.5.2
Pygments = 2.5.1
sphinxcontrib-httpexample = 0.7.0
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
7 changes: 3 additions & 4 deletions plone-5.2.x.cfg
@@ -1,10 +1,9 @@
[buildout]
extends =
base.cfg
http://dist.plone.org/release/5.2.1/versions.cfg
find-links += http://dist.plone.org/thirdparty/
https://dist.plone.org/release/5.2.2/versions.cfg
find-links += https://dist.plone.org/thirdparty/
versions=versions

[versions]
# httpie depdendency, Pygments conflicts with
Pygments = 2.5.2
black = 20.8b1
2 changes: 1 addition & 1 deletion 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.3
36 changes: 36 additions & 0 deletions versions.cfg
Expand Up @@ -2,3 +2,39 @@
# Buildout
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 = 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

0 comments on commit 1cee06d

Please sign in to comment.