Merge pull request #538 from plone/mrtango-fix-build

fix CI

.github/workflows/python-package.yml

@@ -15,12 +15,12 @@ jobs:
         strategy:
             fail-fast: true
             matrix:
-                python-version: ["3.8", "3.9", "3.10"]
+                python-version: ["3.9", "3.10"]
 
         steps:
             - uses: actions/setup-python@v2
               with:
-                  python-version: '3.9'
+                  python-version: '3.10'
             - uses: actions/checkout@v2
             - uses: actions/cache@v2
               with:
@@ -36,8 +36,8 @@ jobs:
             - name: Install dependencies
               run: |
                   python -m pip install --upgrade pip
-                  pip install flake8 tox tox-gh-actions
                   if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+                  pip install tox-gh-actions>=3.0.0
                   pip install -e .
             - name: Black-Check
               run: |

bobtemplates/plone/addon/constraints_plone52.txt

@@ -4,4 +4,6 @@
 # zc.buildout==2.13.2
 
 isort>=5
-black==21.6b0
+black==22.8.0
+tox==4.3.5
+flake8==5.0.4

bobtemplates/plone/addon/constraints_plone60.txt

@@ -10,8 +10,7 @@
 #
 ## SSL Certs on windows, because Python is missing them otherwise:
 #certifi ; platform_system == 'Windows'
-
+tox==4.3.5
 isort>=5
 black==22.8.0
-flake8>=5.0.4
-flake8-html>=0.4.2
+flake8==5.0.4

bobtemplates/plone/addon/tox.ini

@@ -50,9 +50,9 @@ setenv =
 
 deps =
     Plone52: -rrequirements_plone52.txt
-    Plone52: -cconstraints_plone52.txt
+#    Plone52: -cconstraints_plone52.txt
     Plone60: -rrequirements_plone60.txt
-    Plone60: -cconstraints_plone60.txt
+#    Plone60: -cconstraints_plone60.txt
     coverage
 
 
@@ -84,9 +84,9 @@ deps =
     isort
     flake8
     # helper to generate HTML reports:
-    flake8-html>=0.4.2
+    # flake8-html>=0.4.3
     # Useful flake8 plugins that are Python and Plone specific:
-    flake8-coding
+    ; flake8-coding
     flake8-debugger
     flake8-deprecated
     flake8-print
@@ -107,12 +107,11 @@ deps =
 
 commands =
     mkdir -p {toxinidir}/reports/flake8
-    - flake8 --format=html --htmldir={toxinidir}/reports/flake8 --doctests {toxinidir}/src {toxinidir}/setup.py
     flake8 --doctests {toxinidir}/src {toxinidir}/setup.py
     isort --check-only {toxinidir}/src {toxinidir}/setup.py
     # black --check --diff -v {toxinidir}/src {toxinidir}/setup.py
 
-whitelist_externals =
+allowlist_externals =
     mkdir
 
 
@@ -154,28 +153,28 @@ basepython = python3.7
 skip_install = true
 deps = {[lint]deps}
 commands = {[lint]commands}
-whitelist_externals = {[lint]whitelist_externals}
+allowlist_externals = {[lint]allowlist_externals}
 
 [testenv:py38-lint]
 basepython = python3.8
 skip_install = true
 deps = {[lint]deps}
 commands = {[lint]commands}
-whitelist_externals = {[lint]whitelist_externals}
+allowlist_externals = {[lint]allowlist_externals}
 
 [testenv:py39-lint]
 basepython = python3.9
 skip_install = true
 deps = {[lint]deps}
 commands = {[lint]commands}
-whitelist_externals = {[lint]whitelist_externals}
+allowlist_externals = {[lint]allowlist_externals}
 
 [testenv:py310-lint]
 basepython = python3.10
 skip_install = true
 deps = {[lint]deps}
 commands = {[lint]commands}
-whitelist_externals = {[lint]whitelist_externals}
+allowlist_externals = {[lint]allowlist_externals}
 
 [testenv:docs]
 skip_install = true

constraints.txt

@@ -2,10 +2,10 @@
 # -----------------------------------------------
 # Pin Versions / Version Ranges if necessary.
 setuptools==57.0.0
-tox>=3.6
+tox==4.3.5
 isort>=5
-flake8>=5.0.4
-flake8-html>=0.4.2
+flake8==5.0.4
+flake8-html==0.4.2
 black==22.8.0
 pytest>=4.3.0
 coverage>=5.2.0

requirements.txt

@@ -1,3 +1,5 @@
 -cconstraints.txt
 setuptools
 Sphinx
+flake8
+tox

skeleton-tests/base.py

@@ -28,6 +28,16 @@ def file_exists(base_path, file_path):
 
 
 def run_skeleton_tox_env(wd, config):
+    logger.info("show_versions: python / tox")
+    print("show_versions: python / tox")
+    subprocess.check_call(
+        ["python", "--version"],
+        cwd=wd,
+    )
+    subprocess.check_call(
+        ["tox", "--version"],
+        cwd=wd,
+    )
     try:
         returncode = subprocess.check_call(
             ["tox", "-e", config.skeleton_tox_env, "-p", "auto", "-o", "-v", "-r"],

tox.ini

@@ -43,7 +43,7 @@ commands =
 setenv =
     COVERAGE_FILE=.coverage.{envname}
     Plone52: VERSION=5.2-latest
-    Plone60: VERSION=6.0-dev
+    Plone60: VERSION=6.0-latest
     ENVNAME={envname}
 
 passenv =
@@ -59,12 +59,12 @@ deps =
     pytest-mock
     pytest-html
 
-whitelist_externals =
+allowlist_externals =
     mkdir
 
 depends =
-    {py39}: coverage-clean
-    coverage-report: py39
+    {py310}: coverage-clean
+    coverage-report: py310
 
 
 [testenv:coverage-report]
@@ -93,7 +93,7 @@ skip_install = true
 commands = coverage erase
 
 [testenv:isort-apply]
-basepython = python3.9
+basepython = python3.10
 deps =
     -cconstraints.txt
     isort
@@ -120,55 +120,55 @@ deps =
     -cconstraints.txt
     flake8
     # helper to generate HTML reports:
-    flake8-html
+    ; flake8-html
     # Useful flake8 plugins that are Python and Plone specific:
     isort
     flake8-blind-except
-    flake8-coding
-    flake8-commas
+    ; flake8-coding
+    ; flake8-commas
     flake8-debugger
     flake8-deprecated
     flake8-pep3101
     flake8-plone-api
     flake8-plone-hasattr
     flake8-print
-    flake8-quotes
-    flake8-string-format
+    ; flake8-quotes
+    ; flake8-string-format
     flake8-todo
     ; flake8_strict
 
 commands =
     mkdir -p {toxinidir}/_build/reports/flake8
     isort --check-only {toxinidir}/bobtemplates {toxinidir}/package_tests {toxinidir}/skeleton-tests setup.py
-    - flake8 --format=html --htmldir={toxinidir}/_build/reports/flake8 --doctests {toxinidir}/bobtemplates {toxinidir}/package_tests {toxinidir}/skeleton-tests setup.py
+    - flake8 --doctests {toxinidir}/bobtemplates {toxinidir}/package_tests {toxinidir}/skeleton-tests setup.py
     flake8 {toxinidir}/bobtemplates {toxinidir}/package_tests {toxinidir}/skeleton-tests setup.py --doctests
 
-whitelist_externals =
+allowlist_externals =
     mkdir
 
 [testenv:py38-lint]
 basepython = python3.8
 skip_install = true
 deps = {[lint]deps}
 commands = {[lint]commands}
-whitelist_externals = {[lint]whitelist_externals}
+allowlist_externals = {[lint]allowlist_externals}
 
 [testenv:py39-lint]
 basepython = python3.9
 skip_install = true
 deps = {[lint]deps}
 commands = {[lint]commands}
-whitelist_externals = {[lint]whitelist_externals}
+allowlist_externals = {[lint]allowlist_externals}
 
 [testenv:py310-lint]
 basepython = python3.10
 skip_install = true
 deps = {[lint]deps}
 commands = {[lint]commands}
-whitelist_externals = {[lint]whitelist_externals}
+allowlist_externals = {[lint]allowlist_externals}
 
 [testenv:black-check]
-basepython = python3.9
+basepython = python3.10
 skip_install = True
 deps =
     -cconstraints.txt
@@ -178,7 +178,7 @@ commands =
     black --check --diff -v bobtemplates setup.py skeleton-tests package_tests
 
 [testenv:black-enforce]
-basepython = python3.9
+basepython = python3.10
 skip_install = True
 deps =
     -cconstraints.txt
@@ -188,7 +188,7 @@ commands =
     black -v bobtemplates setup.py skeleton-tests package_tests
 
 [testenv:docs]
-basepython = python3.9
+basepython = python3.10
 commands =
     sphinx-build -b html -d _build/docs/doctrees docs _build/docs/html -W
 #    sphinx-build -b doctest docs _build/docs/doctrees
@@ -199,7 +199,7 @@ deps =
 
 [testenv:release]
 skip_install = true
-basepython = python3.9
+basepython = python3.10
 
 deps =
     -cconstraints.txt