fix ci

Author: cekk

constraints_plone60.txt

@@ -1,16 +1 @@
 -c https://dist.plone.org/release/6.0-latest/constraints.txt
-
-#setuptools==54.0.0
-#zc.buildout==3.0.0b2
-#pip==21.0.1
-#
-## Windows specific down here (has to be installed here, fails in buildout)
-## Dependency of zope.sendmail:
-#pywin32 ; platform_system == 'Windows'
-#
-## 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

requirements_plone60.txt

@@ -1,3 +1,2 @@
 -c constraints_plone60.txt
-setuptools
 zc.buildout

src/redturtle/rsync/adapters/adapter.py

@@ -5,6 +5,7 @@
 from plone import api
 from plone.registry.interfaces import IRegistry
 from Products.CMFPlone.interfaces.controlpanel import IMailSchema
+from redturtle.rsync import _
 from redturtle.rsync.interfaces import IRedturtleRsyncAdapter
 from redturtle.rsync.scripts.rsync import logger
 from requests.adapters import HTTPAdapter
@@ -13,7 +14,6 @@
 from zope.component import getUtility
 from zope.interface import implementer
 from zope.interface import Interface
-from redturtle.rsync import _
 
 import json
 import re

src/redturtle/rsync/scripts/rsync.py

@@ -138,7 +138,7 @@ def _main(args):
         runner = ScriptRunner(args=args)
         runner.rsync()
         if not getattr(runner.options, "dry_run", False):
-            logger.info(f"FINAL COMMIT")
+            logger.info("FINAL COMMIT")
             transaction.get().note(
                 runner.adapter.log_item_title(start=runner.adapter.start)
             )

tox.ini

@@ -1,12 +1,9 @@
 [tox]
 envlist =
-    py37-lint,
-    py38-lint,
-    py39-lint,
-    py310-lint,
+    py311-lint,
     black-check,
-    py{38,37}-Plone{52},
-    py{39,310}-Plone{60},
+    py{38}-Plone{52},
+    py{311}-Plone{60},
 #    docs,
 #    coverage-report,
 
@@ -15,11 +12,10 @@ skip_missing_interpreters = True
 
 [gh-actions]
 python =
-    3.6: py36
-    3.7: py37
     3.8: py38
     3.9: py39
     3.10: py310
+    3.11: py311
 
 
 [gh-actions:env]
@@ -54,6 +50,10 @@ deps =
     Plone60: -rrequirements_plone60.txt
 #    Plone60: -cconstraints_plone60.txt
     coverage
+    isort>=5
+    black==22.8.0
+    flake8==5.0.4
+
 
 
 [testenv:coverage-report]
@@ -127,7 +127,7 @@ commands =
 
 
 [testenv:black-check]
-basepython = python3.9
+basepython = python3.11
 skip_install = True
 deps =
     -cconstraints.txt
@@ -138,7 +138,7 @@ commands =
 
 
 [testenv:black-enforce]
-basepython = python3.9
+basepython = python3.11
 skip_install = True
 deps =
     -cconstraints.txt
@@ -176,6 +176,14 @@ deps = {[lint]deps}
 commands = {[lint]commands}
 allowlist_externals = {[lint]allowlist_externals}
 
+[testenv:py311-lint]
+basepython = python3.11
+skip_install = true
+deps = {[lint]deps}
+commands = {[lint]commands}
+allowlist_externals = {[lint]allowlist_externals}
+
+
 [testenv:docs]
 skip_install = true