diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9f7df83..8a82f09 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,6 @@ jobs: matrix: config: # [Python version, tox env] - - ["2.7", "py27-plone52"] - ["3.7", "py37-plone52"] - ["3.8", "py38-plone52"] - ["3.8", "py38-plone60"] diff --git a/CHANGES.rst b/CHANGES.rst index 72584a5..3ee7d15 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,8 +4,10 @@ Changelog 2.2 (unreleasd) --------------- -- Add Plone 6 override for plone.app.z3cform.templates.macros.pt - [szakitibi] +- Drop support for Python older than 3.7. [maurits] + +- Add Plone 6.0 and 6.1 override for ``plone.app.z3cform.templates.macros.pt``. + [szakitibi, maurits] 2.1.1 (unreleased) diff --git a/collective/honeypot/fixes.zcml b/collective/honeypot/fixes.zcml index eec42a6..937c265 100644 --- a/collective/honeypot/fixes.zcml +++ b/collective/honeypot/fixes.zcml @@ -6,7 +6,10 @@ - + + + + + + + + + diff --git a/collective/honeypot/plone61/overrides/plone.app.z3cform.templates.macros.pt b/collective/honeypot/plone61/overrides/plone.app.z3cform.templates.macros.pt new file mode 100644 index 0000000..9f7130e --- /dev/null +++ b/collective/honeypot/plone61/overrides/plone.app.z3cform.templates.macros.pt @@ -0,0 +1,236 @@ + + + + +
+ + +

+ + + + + + + + + + +
+ + + + + + + + + +
+ + Form name + + +
+ + + + + + + +
+ +
+ + + +
+ + Form name + +

+ Description +

+ + +
+ + + + + + +
+ + + + + + + + + +
+ + + +
+ + + + + + + + +
+
+ + diff --git a/collective/honeypot/plone61/patches.py b/collective/honeypot/plone61/patches.py new file mode 100644 index 0000000..11c8a6c --- /dev/null +++ b/collective/honeypot/plone61/patches.py @@ -0,0 +1,18 @@ +from collective.honeypot import config + +import logging + + +logger = logging.getLogger("collective.honeypot") +logger.info("Loading plone61 patches.") + +protected = [ + "sendto_form", + "sendto", + "contact-info", + "send_feedback_site", + "register", +] +# Explicitly add the actions that we protect. +config.EXTRA_PROTECTED_ACTIONS.update(protected) +logger.info("Extra protected actions: %r", config.EXTRA_PROTECTED_ACTIONS) diff --git a/requirements-py2.txt b/requirements-py2.txt deleted file mode 100644 index abb2f1c..0000000 --- a/requirements-py2.txt +++ /dev/null @@ -1,11 +0,0 @@ -setuptools==42.0.2 -zc.buildout==2.13.8 -wheel==0.37.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' -# Dependency of collective.recipe.omelette: -ntfsutils ; platform_system == 'Windows' and python_version < '3.0' diff --git a/setup.py b/setup.py index 4a7ab0d..d6d0c00 100644 --- a/setup.py +++ b/setup.py @@ -12,13 +12,16 @@ "Development Status :: 5 - Production/Stable", "Framework :: Plone", "Framework :: Plone :: 5.2", + "Framework :: Plone :: 6.0", + "Framework :: Plone :: 6.1", "License :: OSI Approved :: GNU General Public License (GPL)", "Programming Language :: Python", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ], keywords="honeypot antispam form protection plone", author="Maurits van Rees", @@ -29,6 +32,7 @@ namespace_packages=["collective"], include_package_data=True, zip_safe=False, + python_requires=">=3.7", install_requires=[ "setuptools", "z3c.jbot", diff --git a/tox.ini b/tox.ini index c4a9ca0..e09a7af 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py{27,37,38}-plone52, + py{37,38}-plone52, py{38,39,310}-plone60, skip_missing_interpreters = True @@ -16,5 +16,4 @@ setenv = version_file=test-5.2.x.cfg plone60: version_file=test-6.0.x.cfg deps = - !py27: -rrequirements.txt - py27: -rrequirements-py2.txt + -rrequirements.txt