Configuring with plone/meta

plone · Oct 10, 2024 · 2a5351a · 2a5351a
1 parent 1172d71
commit 2a5351a
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 44 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -13,8 +13,7 @@
 root = true
 
 
-[*]
-# Default settings for all files.
+[*]  # For All Files
 # Unix-style newlines with a newline ending every file
 end_of_line = lf
 insert_final_newline = true
@@ -30,12 +29,11 @@ max_line_length = off
 # 4 space indentation
 indent_size = 4
 
-[*.{yml,zpt,pt,dtml,zcml,html,xml}]
+[*.{yml,zpt,pt,dtml,zcml}]
 # 2 space indentation
 indent_size = 2
 
-[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss}]
-# Frontend development
+[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss,html}]  # Frontend development
 # 2 space indentation
 indent_size = 2
 max_line_length = 80

diff --git a/.github/workflows/meta.yml b/.github/workflows/meta.yml
@@ -34,8 +34,6 @@ 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:
@@ -57,13 +55,6 @@ jobs:
 # os_dependencies = "git libxml2 libxslt"
 ##
 
-##
-# To test against a specific matrix of python versions
-# when running tests jobs, add in .meta.toml:
-# [github]
-# py_versions = "['3.12', '3.11']"
-##
-
 
 ##
 # Specify additional jobs in .meta.toml:

diff --git a/.gitignore b/.gitignore
@@ -35,7 +35,6 @@ lib64
 parts/
 pyvenv.cfg
 var/
-local.cfg
 
 # mxdev
 /instance/

diff --git a/.meta.toml b/.meta.toml
@@ -3,15 +3,12 @@
 # See the inline comments on how to expand/tweak this configuration file
 [meta]
 template = "default"
-commit-id = "a89af8f2"
+commit-id = "f48dc61a"
 
 [pyproject]
 codespell_ignores = "ore,checkin"
 
 [github]
-# FIXME: Removed circular job, because of a circular dependency in Plone 6.0.
-# Fixed in Plone 6.1. Remove the "jobs" configuration when running circular job
-# with Plone 6.1.
 jobs = [
     "qa",
     "test",

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,16 +7,16 @@ ci:
 
 repos:
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.17.0
+    rev: v3.15.0
     hooks:
     -   id: pyupgrade
         args: [--py38-plus]
 -   repo: https://github.com/pycqa/isort
-    rev: 5.13.2
+    rev: 5.12.0
     hooks:
     -   id: isort
 -   repo: https://github.com/psf/black
-    rev: 24.8.0
+    rev: 23.11.0
     hooks:
     -   id: black
 -   repo: https://github.com/collective/zpretty
@@ -32,7 +32,7 @@ repos:
 #  """
 ##
 -   repo: https://github.com/PyCQA/flake8
-    rev: 7.1.1
+    rev: 6.1.0
     hooks:
     -   id: flake8
 
@@ -44,7 +44,7 @@ repos:
 #  """
 ##
 -   repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.2.6
     hooks:
     -   id: codespell
         additional_dependencies:
@@ -71,7 +71,7 @@ repos:
     -   id: check-python-versions
         args: ['--only', 'setup.py,pyproject.toml']
 -   repo: https://github.com/collective/i18ndude
-    rev: "6.2.1"
+    rev: "6.1.0"
     hooks:
     -   id: i18ndude
 

diff --git a/news/f48dc61a.internal b/news/f48dc61a.internal
@@ -0,0 +1,2 @@
+Update configuration files.
+[plone devs]
diff --git a/pyproject.toml b/pyproject.toml
@@ -71,7 +71,7 @@ target-version = ["py38"]
 ##
 
 [tool.codespell]
-ignore-words-list = "discreet,assertin,ore,checkin"
+ignore-words-list = "discreet,ore,checkin"
 skip = "*.po,"
 ##
 # Add extra configuration options in .meta.toml:
@@ -133,27 +133,20 @@ python-dateutil = ['dateutil']
 [tool.check-manifest]
 ignore = [
     ".editorconfig",
-    ".flake8",
     ".meta.toml",
     ".pre-commit-config.yaml",
-    "dependabot.yml",
-    "mx.ini",
     "tox.ini",
+    ".flake8",
+    "mx.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",
-#  ]
-#  """
 ##
 
 

diff --git a/tox.ini b/tox.ini
@@ -71,7 +71,7 @@ description = check if the package defines all its dependencies
 skip_install = true
 deps =
     build
-    z3c.dependencychecker==2.14.3
+    z3c.dependencychecker==2.11
 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]
@@ -152,12 +152,11 @@ deps =
     coverage
     zope.testrunner
     -c https://dist.plone.org/release/6.0-dev/constraints.txt
-
+    
 commands =
     coverage run --branch --source plone.app.iterate {envbindir}/zope-testrunner --quiet --all --test-path={toxinidir} -s plone.app.iterate {posargs}
     coverage report -m --format markdown
     coverage xml
-    coverage html
 extras =
     test
 
@@ -170,7 +169,7 @@ deps =
     build
     towncrier
     -c https://dist.plone.org/release/6.0-dev/constraints.txt
-
+    
 commands =
     # fake version to not have to install the package
     # we build the change log as news entries might break
@@ -183,9 +182,6 @@ 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 =
 
 ##
@@ -201,7 +197,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'