meta update and linting

.editorconfig

@@ -1,5 +1,5 @@
 # Generated from:
-# https://github.com/plone/meta/tree/master/config/default
+# https://github.com/plone/meta/tree/main/config/default
 # See the inline comments on how to expand/tweak this configuration file
 #
 # EditorConfig Configuration file, for more details see:
@@ -13,7 +13,8 @@
 root = true
 
 
-[*]  # For All Files
+[*]
+# Default settings for all files.
 # Unix-style newlines with a newline ending every file
 end_of_line = lf
 insert_final_newline = true
@@ -29,11 +30,12 @@ max_line_length = off
 # 4 space indentation
 indent_size = 4
 
-[*.{yml,zpt,pt,dtml,zcml}]
+[*.{yml,zpt,pt,dtml,zcml,html,xml}]
 # 2 space indentation
 indent_size = 2
 
-[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss,html}]  # Frontend development
+[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss}]
+# Frontend development
 # 2 space indentation
 indent_size = 2
 max_line_length = 80

.flake8

@@ -1,5 +1,5 @@
 # Generated from:
-# https://github.com/plone/meta/tree/master/config/default
+# https://github.com/plone/meta/tree/main/config/default
 # See the inline comments on how to expand/tweak this configuration file
 [flake8]
 doctests = 1

.github/workflows/meta.yml

@@ -1,5 +1,5 @@
 # Generated from:
-# https://github.com/plone/meta/tree/master/config/default
+# https://github.com/plone/meta/tree/main/config/default
 # See the inline comments on how to expand/tweak this configuration file
 name: Meta
 on:
@@ -34,6 +34,8 @@ jobs:
     uses: plone/meta/.github/workflows/dependencies.yml@main
   release_ready:
     uses: plone/meta/.github/workflows/release_ready.yml@main
+  circular:
+    uses: plone/meta/.github/workflows/circular.yml@main
 
 ##
 # To modify the list of default jobs being created add in .meta.toml:

.gitignore

@@ -1,5 +1,5 @@
 # Generated from:
-# https://github.com/plone/meta/tree/master/config/default
+# https://github.com/plone/meta/tree/main/config/default
 # See the inline comments on how to expand/tweak this configuration file
 # python related
 *.egg-info
@@ -35,6 +35,7 @@ lib64
 parts/
 pyvenv.cfg
 var/
+local.cfg
 
 # mxdev
 /instance/

.meta.toml

@@ -0,0 +1,16 @@
+# Generated from:
+# https://github.com/plone/meta/tree/main/config/default
+# See the inline comments on how to expand/tweak this configuration file
+[meta]
+template = "default"
+commit-id = "1c2155e4"
+
+[gitignore]
+extra_lines = """
+# ignore pipforest check
+forest.*
+
+# ignore testfiles
+test_*
+robot_*
+"""

.pre-commit-config.yaml

@@ -1,22 +1,22 @@
 # Generated from:
-# https://github.com/plone/meta/tree/master/config/default
+# https://github.com/plone/meta/tree/main/config/default
 # See the inline comments on how to expand/tweak this configuration file
 ci:
     autofix_prs: false
     autoupdate_schedule: monthly
 
 repos:
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.14.0
+    rev: v3.15.2
     hooks:
     -   id: pyupgrade
         args: [--py38-plus]
 -   repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
     -   id: isort
 -   repo: https://github.com/psf/black
-    rev: 23.9.1
+    rev: 24.3.0
     hooks:
     -   id: black
 -   repo: https://github.com/collective/zpretty
@@ -32,7 +32,7 @@ repos:
 #  """
 ##
 -   repo: https://github.com/PyCQA/flake8
-    rev: 6.1.0
+    rev: 7.0.0
     hooks:
     -   id: flake8
 
@@ -66,7 +66,7 @@ repos:
     hooks:
     -   id: pyroma
 -   repo: https://github.com/mgedmin/check-python-versions
-    rev: "0.21.3"
+    rev: "0.22.0"
     hooks:
     -   id: check-python-versions
         args: ['--only', 'setup.py,pyproject.toml']

dependabot.yml

@@ -0,0 +1,11 @@
+# Generated from:
+# https://github.com/plone/meta/tree/main/config/default
+# See the inline comments on how to expand/tweak this configuration file
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"

pyproject.toml

@@ -1,5 +1,5 @@
 # Generated from:
-# https://github.com/plone/meta/tree/master/config/default
+# https://github.com/plone/meta/tree/main/config/default
 # See the inline comments on how to expand/tweak this configuration file
 [build-system]
 requires = ["setuptools>=68.2"]
@@ -35,8 +35,8 @@ target-version = ["py38"]
 ##
 
 [tool.codespell]
-ignore-words-list = "discreet,foo,bar"
-skip = "*.po,*.min.js,*.min.js.map,*.min.css.map,*.svg,yarn.lock,*.json,*/tiles.xml"
+ignore-words-list = "discreet,"
+skip = "*.po,"
 ##
 # Add extra configuration options in .meta.toml:
 #  [pyproject]
@@ -97,20 +97,27 @@ python-dateutil = ['dateutil']
 [tool.check-manifest]
 ignore = [
     ".editorconfig",
+    ".flake8",
     ".meta.toml",
     ".pre-commit-config.yaml",
-    "tox.ini",
-    ".flake8",
+    "dependabot.yml",
     "mx.ini",
+    "tox.ini",
 
 ]
+
 ##
 # Add extra configuration options in .meta.toml:
 #  [pyproject]
 #  check_manifest_ignores = """
 #      "*.map.js",
 #      "*.pyc",
 #  """
+#  check_manifest_extra_lines = """
+#  ignore-bad-ideas = [
+#      "some/test/file/PKG-INFO",
+#  ]
+#  """
 ##
 
 

src/collective/tiles/carousel/__init__.py

@@ -1,4 +1,5 @@
 """Init and utils."""
+
 from zope.i18nmessageid import MessageFactory
 
 

src/collective/tiles/carousel/tests/test_setup.py

@@ -1,4 +1,5 @@
 """Setup tests for this package."""
+
 from collective.tiles.carousel.testing import (
     COLLECTIVE_TILES_CAROUSEL_INTEGRATION_TESTING,
 )

src/collective/tiles/carousel/tile.py

@@ -282,9 +282,7 @@ def items(self):
         query = self.query
         if query:
             items.update(
-                OrderedDict.fromkeys(
-                    [x.getObject() for x in self.catalog(**query)]
-                )
+                OrderedDict.fromkeys([x.getObject() for x in self.catalog(**query)])
             )
 
         result = []

src/collective/tiles/carousel/utils.py

@@ -11,7 +11,9 @@ def parse_query_from_data(data, context=None):
     query = data.get("query", {}) or {}
     try:
         parsed = queryparser.parseAndModifyFormquery(
-            context, query, data.get("sort_on"),
+            context,
+            query,
+            data.get("sort_on"),
             "desc" if data.get("sort_reversed", False) else "asc",
         )
     except KeyError:

tox.ini

@@ -1,5 +1,5 @@
 # Generated from:
-# https://github.com/plone/meta/tree/master/config/default
+# https://github.com/plone/meta/tree/main/config/default
 # See the inline comments on how to expand/tweak this configuration file
 [tox]
 # We need 4.4.0 for constrain_package_deps.
@@ -71,7 +71,7 @@ description = check if the package defines all its dependencies
 skip_install = true
 deps =
     build
-    z3c.dependencychecker==2.11
+    z3c.dependencychecker==2.14.3
 commands =
     python -m build --sdist
     dependencychecker
@@ -109,7 +109,7 @@ set_env =
 deps =
     zope.testrunner
     -c https://dist.plone.org/release/6.0-dev/constraints.txt
-    
+
 ##
 # Specify additional deps in .meta.toml:
 #  [tox]
@@ -153,12 +153,13 @@ deps =
     coverage
     zope.testrunner
     -c https://dist.plone.org/release/6.0-dev/constraints.txt
-    
+
 commands =
     rfbrowser init
     coverage run --branch --source collective.tiles.carousel {envbindir}/zope-testrunner --quiet --all --test-path={toxinidir}/src -s collective.tiles.carousel {posargs}
     coverage report -m --format markdown
     coverage xml
+    coverage html
 extras =
     test
 
@@ -170,7 +171,7 @@ deps =
     twine
     build
     -c https://dist.plone.org/release/6.0-dev/constraints.txt
-    
+
 commands =
     python -m build --sdist
     twine check dist/*
@@ -179,6 +180,9 @@ commands =
 description = ensure there are no cyclic dependencies
 use_develop = true
 skip_install = false
+# Here we must always constrain the package deps to what is already installed,
+# otherwise we simply get the latest from PyPI, which may not work.
+constrain_package_deps = true
 set_env =
 
 ##
@@ -194,7 +198,7 @@ deps =
     pipdeptree
     pipforester
     -c https://dist.plone.org/release/6.0-dev/constraints.txt
-    
+
 commands =
     # Generate the full dependency tree
     sh -c 'pipdeptree -j > forest.json'