Merge 1f250be into 7069d7e

.github/workflows/ci.yml

@@ -53,11 +53,11 @@ jobs:
       - name: pip install
         run: pip install -r requirements.txt
       - name: choose Plone version
-        run: sed -ie "s#plone-x.x.x.cfg#plone-${{ matrix.plone-version }}.x.cfg#" travis.cfg
+        run: sed -ie "s#plone-x.x.x.cfg#plone-${{ matrix.plone-version }}.x.cfg#" ci.cfg
 
       # buildout
       - name: buildout
-        run: buildout -t 10 -c travis.cfg
+        run: buildout -t 10 -c ci.cfg
         env:
           CI: true
 

.travis.yml

@@ -50,8 +50,8 @@ before_install:
   - virtualenv -p `which python` .
   - bin/pip install -r requirements.txt
 install:
-  - sed -ie "s#plone-x.x.x.cfg#plone-$PLONE_VERSION.cfg#" travis.cfg
-  - bin/buildout -t 10 -c travis.cfg
+  - sed -ie "s#plone-x.x.x.cfg#plone-$PLONE_VERSION.cfg#" ci.cfg
+  - bin/buildout -t 10 -c ci.cfg
 script:
   - if [ "$PLONE_VERSION" == "5.2.x" ] && [ $TRAVIS_PYTHON_VERSION == '3.7' ]; then pip install black && black src/ --check; fi
   - bin/code-analysis

ci.cfg

@@ -0,0 +1,7 @@
+[buildout]
+extends = plone-x.x.x.cfg
+
+[code-analysis]
+recipe = plone.recipe.codeanalysis
+pre-commit-hook = False
+return-status-codes = True

plone-4.3.x.cfg

@@ -1,23 +1,30 @@
 [buildout]
 extends =
     base.cfg
-    http://dist.plone.org/release/4.3.19/versions.cfg
+    https://dist.plone.org/release/4.3.20/versions.cfg
     versions.cfg
 
 [versions]
-plone.restapi =
-plone.schema = 1.2.1
+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
+
 # 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
+
 # Last pyrsistent version that is python 2 compatible:
 pyrsistent = 0.15.7
+
+# Error: The requirement ('distlib<1,>=0.3.1') is not allowed by your [versions] constraint (0.3.0)
+distlib = 0.3.1

plone-5.1.x.cfg

@@ -1,23 +1,24 @@
 [buildout]
 extends =
     base.cfg
-    http://dist.plone.org/release/5.1.6/versions.cfg
+    https://dist.plone.org/release/5.1.7/versions.cfg
     versions.cfg
 
 [versions]
-# fixes: SyntaxError: invalid syntax (more.py, line 340)
-zipp = 0.5.2
+plone.testing = 5.0.0
+
+# Error: The requirement ('virtualenv>=20.0.35') is not allowed by your [versions] constraint (20.0.26)
+virtualenv = 20.0.35
 
-# plone.restapi specific
-plone.schema = 1.2.1
+# Error: The requirement ('distlib<1,>=0.3.1') is not allowed by your [versions] constraint (0.3.0)
+distlib = 0.3.1
 
-# Last pyrsistent version that is python 2 compatible:
-pyrsistent = 0.15.7
+# fixes: SyntaxError: invalid syntax (more.py, line 340)
+zipp = 0.5.2
 
 # 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

plone-5.2.x.cfg

@@ -1,19 +1,22 @@
 [buildout]
 extends =
     base.cfg
-    http://dist.plone.org/release/5.2.2/versions.cfg
-find-links += http://dist.plone.org/thirdparty/
+    https://dist.plone.org/release/5.2.3/versions.cfg
+find-links += https://dist.plone.org/thirdparty/
 versions=versions
 
 [versions]
-plone.restapi =
-plone.namedfile = 5.2.2
+black = 20.8b1
 
-# Error: The requirement ('importlib-metadata>=1') is not allowed by your [versions] constraint (0.23)
-importlib-metadata = 2.0.0
+# Error: The requirement ('virtualenv>=20.0.35') is not allowed by your [versions] constraint (20.0.26)
+virtualenv = 20.0.35
 
 # Error: The requirement ('pep517>=0.9') is not allowed by your [versions] constraint (0.8.2)
 pep517 = 0.9.1
 
-# Error: The requirement ('virtualenv>=20.0.35') is not allowed by your [versions] constraint (20.0.26)
-virtualenv = 20.0.35
+# Error: The requirement ('importlib-metadata>=1') is not allowed by your [versions] constraint (0.23)
+importlib-metadata = 2.0.0
+
+# plone.restapi specific pins
+plone.restapi =
+plone.namedfile = 5.2.2

travis.cfg

@@ -1,7 +0,0 @@
-[buildout]
-extends = plone-x.x.x.cfg
-
-[code-analysis]
-recipe = plone.recipe.codeanalysis
-pre-commit-hook = False
-return-status-codes = True

versions.cfg

@@ -24,7 +24,6 @@ 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
@@ -38,3 +37,8 @@ sphinxcontrib-httpdomain = 1.5.0
 sphinx-rtd-theme = 0.2.4
 Jinja2 = 2.10
 Babel = 2.5.1
+
+# plone.rest(api) specific pins
+
+# last py2 compatible version
+httpie = 1.0.3