Merge pull request #453 from plone/maurits/tox

Further improvements to the tox PR

.travis.yml

@@ -10,24 +10,12 @@ global:
 matrix:
   fast_finish: true
   include:
-      - python: "3.9"
+      - python: "3.8"
         env: TOXENV=isort,lint
-      - python: "3.9"
+      - python: "3.7"
         env: TOXENV=docs
-      - python: "2.7"
-        env: TOXENV=py27-plone-4.3
-      - python: "2.7"
-        env: TOXENV=py27-plone-5.0
-      - python: "2.7"
-        env: TOXENV=py27-plone-5.1
       - python: "2.7"
         env: TOXENV=py27-plone-5.2
-      - python: "2.7"
-        env: TOXENV=py27-plone-4.3-archetypes
-      - python: "2.7"
-        env: TOXENV=py27-plone-5.0-archetypes
-      - python: "2.7"
-        env: TOXENV=py27-plone-5.1-archetypes
       - python: "2.7"
         env: TOXENV=py27-plone-5.2-archetypes
       - python: "3.6"
@@ -36,8 +24,6 @@ matrix:
         env: TOXENV=py37-plone-5.2
       - python: "3.8"
         env: TOXENV=py38-plone-5.2
-      - python: "3.9"
-        env: TOXENV=py39-plone-5.2
 
 before_install:
     - mkdir -p $HOME/buildout-cache/{downloads,eggs,extends}

buildout.cfg

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

news/431.feature

@@ -0,0 +1,4 @@
+Drop support for Plone 4.3, 5.0, 5.1, add support for 6.0.
+The code might still work, but it is no longer tested.
+You can use releases in the 1.10 series on the older versions.
+[maurits]

setup.py

@@ -14,7 +14,7 @@ def read(*rnames):
     read('CHANGES.rst') + '\n\n' + \
     read('LICENSE')
 
-version = '1.10.5.dev0'
+version = '1.11.0.dev0'
 
 setup(
     name='plone.api',
@@ -59,10 +59,8 @@ def read(*rnames):
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Framework :: Plone',
-        'Framework :: Plone :: 4.3',
-        'Framework :: Plone :: 5.0',
-        'Framework :: Plone :: 5.1',
         'Framework :: Plone :: 5.2',
+        'Framework :: Plone :: 6.0',
         'Framework :: Plone :: Core',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',

tox.ini

@@ -1,8 +1,8 @@
 [tox]
 envlist =
-    py27-plone-{4.3,5.0,5.1,5.2},
-    py27-plone-{4.3,5.0,5.1,5.2}-archetypes,
-    py{36,37,38,39}-plone-{5.2},
+    py27-plone-5.2,
+    py27-plone-5.2-archetypes,
+    py{36,37,38}-plone-{5.2},
     docs,
 #    black-check,
     isort,
@@ -13,42 +13,34 @@ skip_missing_interpreters = False
 
 [testenv]
 skip_install = True
-#usedevelop = True
-#extras =
-#    test
-#    archetypes: archetypes
 
 basepython:
     py27: python2.7
     py36: python3.6
     py37: python3.7
     py38: python3.8
-    py39: python3.9
 
 commands =
     python -VV
     pip list
-    echo "{toxinidir}"
-    echo "{envbindir}/buildout -c {toxinidir}/{env:BUILDOUT_FILE} buildout:directory={envdir} buildout:develop={toxinidir}"
     mkdir -p {toxinidir}/reports/coverage
+# Calling bin/buildout -c toxinidir/buildout.cfg works in principle.
+# But when buildout restarts because it has upgraded or downgraded itself,
+# it will fail to find the buildout config file in the envdir.
+# So make sure the versions in the deps match what is in the buildout config.
     {envbindir}/buildout -c {toxinidir}/{env:BUILDOUT_FILE} buildout:directory={envdir} buildout:develop={toxinidir} bootstrap
     {envbindir}/buildout -c {toxinidir}/{env:BUILDOUT_FILE} buildout:directory={envdir} buildout:develop={toxinidir}
     {envbindir}/coverage run {envbindir}/test -v1 --auto-color {posargs}
 
 setenv =
     COVERAGE_FILE=.coverage.{envname}
-    plone-4.3-archetypes: BUILDOUT_FILE="plone-4.3.x-archetypes.cfg"
-    plone-5.0-archetypes: BUILDOUT_FILE="plone-5.0.x-archetypes.cfg"
-    plone-5.1-archetypes: BUILDOUT_FILE="plone-5.1.x-archetypes.cfg"
-    plone-4.3: BUILDOUT_FILE="plone-4.3.x.cfg"
-    plone-5.0: BUILDOUT_FILE="plone-5.0.x.cfg"
-    plone-5.1: BUILDOUT_FILE="plone-5.1.x.cfg"
+    plone-5.2-archetypes: BUILDOUT_FILE="plone-5.2.x-archetypes.cfg"
     plone-5.2: BUILDOUT_FILE="plone-5.2.x.cfg"
 
 deps =
     pdbpp
-    setuptools
-    zc.buildout
+    setuptools==42.0.2
+    zc.buildout==2.13.3
     coverage
 
 whitelist_externals =
@@ -147,6 +139,9 @@ whitelist_externals =
     mkdir
 
 [testenv:docs]
+# Locally for Maurits this only works with Python 2.7.
+# Travis is happy with 3.7, not with 3.8 or 3.9.
+# So pick the right one in .travis.yml (or GitHub Actions).
 basepython = python
 skip_install = False
 usedevelop = True