Merge pull request #19 from collective/make-update

Make update
collective · Sep 6, 2020 · cafb5a9 · cafb5a9
2 parents d4ba828 + cebde9e
commit cafb5a9
Show file tree

Hide file tree

Showing 10 changed files with 152 additions and 82 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 *.py?
 *.swp
 .Python
+pyvenv.cfg
 # dirs
 bin/
 buildout-cache/

diff --git a/.travis.yml b/.travis.yml
@@ -12,21 +12,16 @@ cache:
 env:
   jobs:
     - PLONE_VERSION=4.3.x
-    - PLONE_VERSION=5.0.x
     - PLONE_VERSION=5.1.x
     - PLONE_VERSION=5.2.x
 jobs:
   exclude:
     - python: "3.7"
       env: PLONE_VERSION=4.3.x
-    - python: "3.7"
-      env: PLONE_VERSION=5.0.x
     - python: "3.7"
       env: PLONE_VERSION=5.1.x
     - python: "3.8"
       env: PLONE_VERSION=4.3.x
-    - python: "3.8"
-      env: PLONE_VERSION=5.0.x
     - python: "3.8"
       env: PLONE_VERSION=5.1.x
 before_install:

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -5,8 +5,11 @@ Changelog
 1.1.1 (unreleased)
 ------------------
 
+- Python 3.8 compatibility.
+  [tisto]
+
 - Use Dexterity names to avoid nasty interface lookup errors.
-  [timo]
+  [tisto]
 
 
 1.1.0 (2019-04-15)

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 SHELL := /bin/bash
 CURRENT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
-version = 2.7
+version = 3
 
 # We like colors
 # From: https://coderwall.com/p/izxssa/colored-makefile-for-golang-projects
@@ -27,6 +27,7 @@ update: ## Update Make and Buildout
 	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 travis.cfg https://raw.githubusercontent.com/kitconcept/buildout/master/travis.cfg
 	wget -O versions.cfg https://raw.githubusercontent.com/kitconcept/buildout/master/versions.cfg
 
 .installed.cfg: bin/buildout *.cfg
@@ -35,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
@@ -61,23 +71,37 @@ 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 .
+.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.cfg
-
-bin/python bin/pip:
-	virtualenv --clear --python=python$(version) .
+	bin/buildout -c plone-5.2.x-performance.cfg
 
 .PHONY: Test
 test:  ## Test
 	bin/test
 
+.PHONY: Test Performance
+test-performance:
+	jmeter -n -t performance.jmx -l jmeter.jtl
+
 .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
+	bin/sphinxbuilder
+
+.PHONY: Test Release
+test-release:  ## Run Pyroma and Check Manifest
+	bin/pyroma -n 10 -d .
 
 .PHONY: Release
 release:  ## Release

diff --git a/plone-4.3.x.cfg b/plone-4.3.x.cfg
@@ -1,12 +1,20 @@
 [buildout]
 extends =
     base.cfg
-    http://dist.plone.org/release/4.3.18/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
+# Pillow = 5.4.1
 future = 0.17.1
+six = 1.11.0
+# 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
diff --git a/plone-5.1.x.cfg b/plone-5.1.x.cfg
@@ -1,5 +1,33 @@
 [buildout]
 extends =
     base.cfg
-    http://dist.plone.org/release/5.1.5/versions.cfg
+    https://dist.plone.org/release/5.1.6/versions.cfg
     versions.cfg
+
+[versions]
+# fixes: SyntaxError: invalid syntax (more.py, line 340)
+zipp = 0.5.2
+
+# plone.restapi specific
+plone.schema = 1.2.0
+
+plone.testing = 5.0.0
+
+# zest.releaser
+zest.releaser = 6.20.1
+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.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
diff --git a/plone-5.2.x.cfg b/plone-5.2.x.cfg
@@ -1,6 +1,9 @@
 [buildout]
 extends =
     base.cfg
-    http://dist.plone.org/release/5.2rc1/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]
+black = 19.10b0
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
 # Keep this file in sync with: https://github.com/kitconcept/buildout/edit/master/requirements.txt
-setuptools==40.8.0
-zc.buildout==2.13.1
+setuptools==42.0.2
+zc.buildout==2.13.3
diff --git a/setup.py b/setup.py
@@ -5,17 +5,19 @@
 from setuptools import setup
 
 
-long_description = '\n\n'.join([
-    open('README.rst').read(),
-    open('CONTRIBUTORS.rst').read(),
-    open('CHANGES.rst').read(),
-])
+long_description = "\n\n".join(
+    [
+        open("README.rst").read(),
+        open("CONTRIBUTORS.rst").read(),
+        open("CHANGES.rst").read(),
+    ]
+)
 
 
 setup(
-    name='collective.faq',
-    version='1.1.1-dev.0',
-    description='Plone addon package for managing FAQ sections',
+    name="collective.faq",
+    version="1.1.1-dev.0",
+    description="Plone addon package for managing FAQ sections",
     long_description=long_description,
     # Get more from https://pypi.python.org/pypi?%3Aaction=list_classifiers
     classifiers=[
@@ -25,46 +27,48 @@
         "Framework :: Plone :: 4.3",
         "Framework :: Plone :: 5.0",
         "Framework :: Plone :: 5.1",
+        "Framework :: Plone :: 5.2",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Operating System :: OS Independent",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
     ],
-    keywords='Python Plone',
-    author='kitconcept GmbH',
-    author_email='info@kitconcept.com',
-    url='https://github.com/collective/collective.faq',
-    license='GPL version 2',
-    packages=find_packages('src', exclude=['ez_setup']),
-    namespace_packages=['collective'],
-    package_dir={'': 'src'},
+    keywords="Python Plone",
+    author="kitconcept GmbH",
+    author_email="info@kitconcept.com",
+    url="https://github.com/collective/collective.faq",
+    license="GPL version 2",
+    packages=find_packages("src", exclude=["ez_setup"]),
+    namespace_packages=["collective"],
+    package_dir={"": "src"},
     include_package_data=True,
     zip_safe=False,
     install_requires=[
-        'plone.api',
-        'plone.app.content',
-        'plone.app.contenttypes',
-        'plone.app.dexterity',
-        'plone.app.lockingbehavior',
-        'plone.app.relationfield',
-        'plone.app.versioningbehavior',
-        'Products.GenericSetup>=1.8.2',
-        'setuptools',
-        'z3c.jbot',
+        "plone.api",
+        "plone.app.content",
+        "plone.app.contenttypes",
+        "plone.app.dexterity",
+        "plone.app.lockingbehavior",
+        "plone.app.relationfield",
+        "plone.app.versioningbehavior",
+        "Products.GenericSetup>=1.8.2",
+        "setuptools",
+        "z3c.jbot",
         # 'plone.restapi',
         # 'Products.PloneFormGen',
         # 'plone.formwidget.captcha',
     ],
     extras_require={
-        'test': [
-            'plone.app.testing',
+        "test": [
+            "plone.app.testing",
             # Plone KGS does not use this version, because it would break
             # Remove if your package shall be part of coredev.
             # plone_coredev tests as of 2016-04-01.
-            'plone.testing>=5.0.0',
-            'plone.app.contenttypes',
-            'plone.app.robotframework[debug]',
+            "plone.testing>=5.0.0",
+            "plone.app.contenttypes",
+            "plone.app.robotframework[debug]",
         ],
     },
     entry_points="""

diff --git a/versions.cfg b/versions.cfg
@@ -1,39 +1,43 @@
 [versions]
-# Don't use a released version of collective.faq
-collective.faq =
-
 # Buildout
 setuptools =
 zc.buildout =
 zc.recipe.egg = 2.0.3
 
-Pillow = 5.4.1
+# Don't use a released version of collective.faq
+collective.faq =
+
+# fixes Getting distribution for 'configparser'. assert newdist is not None  # newloc above is missing our dist?!
+configparser = 3.5.3
 
-# Misc
-plone.recipe.zope2instance = 4.4.0
-plone.testing = 5.0.0
+# fixes Error: The requirement ('Pygments>=2.5.1') is not allowed by your [versions] constraint (2.2.0)
+Pygments = 2.5.1
 
-# code analysis
-plone.recipe.codeanalysis = 2.3
+# 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-blind-except = 0.1.0
-flake8-coding = 1.3.0
-flake8-debugger = 1.4.0
-flake8-deprecated = 1.0
-flake8-isort = 0.2
-flake8-pep3101 = 0.3
-flake8-plone-api = 1.0
-flake8-plone-hasattr = 0.1
-flake8-print = 2.0.2
-flake8-quotes = 0.1.1
-flake8-string-format = 0.2.1
-flake8-todo = 0.7
-check-manifest = 0.36
-configparser = 3.5.0
-mccabe = 0.6.1
-pyflakes = 1.6.0
+flake8-coding = 1.3.2
 pycodestyle = 2.3.1
 
-# Releaser
-docutils = 0.14
+# 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