Merge pull request #56 from euphorie/python-versions

Update supported Python versions to match the ones supported by the l…

.github-6.0.cfg

@@ -9,6 +9,6 @@ parts =
     createcoverage
 download-cache = downloads
 
-[buildout:python311]
-parts +=
-    code-analysis
+[versions]
+createcoverage = 1.5
+z3c.ptcompat = 4.0

.github/workflows/main.yml

@@ -15,6 +15,7 @@ jobs:
           - ["Py3.8-Plone5.2", "3.8", "5.2"]
           - ["Py3.9-Plone6.0", "3.9", "6.0"]
           - ["Py3.11-Plone6.0", "3.11", "6.0"]
+          - ["Py3.13-Plone6.0", "3.13", "6.0"]
     runs-on: ubuntu-latest
     name: ${{ matrix.config[0] }}
     steps:
@@ -40,11 +41,7 @@ jobs:
           bin/buildout -c .github-${{ matrix.config[2] }}.cfg
       - name: Pre commit
         uses: pre-commit/action@v2.0.0
-        if: ${{ matrix.config[1] == '3.11' }}
-      - name: Code Analysis
-        run: |
-          bin/code-analysis
-        if: ${{ matrix.config[1] == '3.11' }}
+        if: ${{ matrix.config[1] == '3.13' }}
       - name: Test
         run: |
           bin/coverage run bin/test -s plonetheme.nuplone

.pre-commit-config.yaml

@@ -1,23 +1,23 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.4.0
+    rev: v3.19.1
     hooks:
       - id: pyupgrade
         args: [--py37-plus]
   - repo: https://github.com/ambv/black
-    rev: 23.3.0
+    rev: 24.10.0
     hooks:
       - id: black
   - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+    rev: 7.1.1
     hooks:
       - id: flake8
   - repo: https://github.com/PyCQA/bandit
-    rev: 1.7.5
+    rev: 1.8.2
     hooks:
       - id: bandit
         exclude: /tests/

README.rst

@@ -40,7 +40,7 @@ between this package and the old `NuPlone <http://pypi.python.org/pypi/Products.
 Compatibility
 =============
 
-NuPlone 2.x is meant to be used with Plone 5.2.
+NuPlone 2.x is meant to be used with Plone 5.2 or Plone 6.0.
 
 Upgrade to NuPlone 2.x
 ----------------------

devel.cfg

@@ -2,7 +2,6 @@
 extends = buildout.cfg
 parts +=
     test
-    code-analysis
     createcoverage
     pythontools
 allow-picked-versions = true
@@ -20,17 +19,6 @@ eggs =
     Pillow
 
 
-[code-analysis]
-recipe = plone.recipe.codeanalysis
-directory = ${buildout:directory}/plonetheme
-flake8-exclude = bootstrap.py,bootstrap-buildout.py,docs,*.egg.,omelette
-flake8-max-line-length = 88
-flake8-ignore = E203,W503,W504,Q000,C812,C901,T000
-return-status-codes = True
-pre-commit-hook = False
-pre-push-hook = False
-
-
 [createcoverage]
 recipe = zc.recipe.egg
 eggs = createcoverage
@@ -46,18 +34,3 @@ eggs =
 
 
 [versions]
-build = 0.10.0
-click = 8.1.3
-coverage = 7.2.7
-createcoverage = 1.5
-flake8 = 6.0.0
-lingua = 4.15.0
-mccabe = 0.7.0
-plone.recipe.codeanalysis = 3.0.1
-polib = 1.2.0
-pycodestyle = 2.10.0
-pyflakes = 3.0.1
-pyproject-hooks = 1.0.0
-z3c.ptcompat = 2.3.0
-check-manifest = 0.49
-tomli = 2.0.1

docs/changes.rst

@@ -22,6 +22,9 @@ Changelog
 - Revert to Patternslib 9.9.5 until 9.9.10 is released to prevent potential issues with pat-inject.
   [thet]
 
+- Update supported Python versions to match the ones supported by the latest Plone 5.2 and Plone 6.0
+  [ale-rt]
+
 
 2.2.2 (2023-11-06)
 ------------------
@@ -552,4 +555,3 @@ This version is built for Plone 5.1 and higher!
 
 - First release.
   [wichert, cornae]
-

plonetheme/nuplone/skin/tests/test_adapter.py

@@ -1,4 +1,5 @@
 """StatusMessage adapter tests."""
+
 from plonetheme.nuplone.testing import NUPLONE_INTEGRATION_TESTING
 from Products.statusmessages.interfaces import IStatusMessage
 from unittest import TestCase

plonetheme/nuplone/tiles/navigation.py

@@ -181,9 +181,11 @@ def update(self):
                     filter(
                         None,
                         [
-                            "active"
-                            if node["current"] or node["currentParent"]
-                            else None,
+                            (
+                                "active"
+                                if node["current"] or node["currentParent"]
+                                else None
+                            ),
                             "current" if node["current"] else None,
                         ],
                     )

plonetheme/nuplone/tiles/tabs.py

@@ -31,9 +31,11 @@ def update(self):
             {
                 "id": brain.id,
                 "title": brain.Title,
-                "url": "%s/view" % brain.getURL()
-                if brain.portal_type in use_view_types
-                else brain.getURL(),
+                "url": (
+                    "%s/view" % brain.getURL()
+                    if brain.portal_type in use_view_types
+                    else brain.getURL()
+                ),
                 "class": None,
             }
             for brain in catalog.searchResults(query)

setup.py

@@ -26,11 +26,12 @@
         "Operating System :: OS Independent",
         "Programming Language :: JavaScript",
         "Programming Language :: Python",
-        "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",
+        "Programming Language :: Python :: 3.13",
     ],
     keywords="web zope plone theme",
     author="Cornelis Kolbach, Wichert Akkerman and Syslab.com",
@@ -41,7 +42,7 @@
     namespace_packages=["plonetheme"],
     include_package_data=True,
     zip_safe=False,
-    python_requires=">=3.7",
+    python_requires=">=3.8",
     install_requires=[
         "setuptools",
         "Plone >=5.2",