Configuring with plone/meta (#51)

* Configuring with plone/meta * chore: fix dependencies * chore: ignore plone(.app).testing This is a shortcoming of `z3c.dependencychecker`, my guess is that the folder where tests are kept is named `testing` rather than `tests`.
plone · Feb 6, 2024 · f8dd6e3 · f8dd6e3
1 parent 97b7748
commit f8dd6e3
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 25 deletions.
diff --git a/.editorconfig b/.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:
@@ -29,11 +29,11 @@ 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

diff --git a/.flake8 b/.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

diff --git a/.github/workflows/meta.yml b/.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:

diff --git a/.gitignore b/.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
@@ -12,6 +12,7 @@
 # tools related
 build/
 .coverage
+.*project
 coverage.xml
 dist/
 docs/_build
@@ -34,6 +35,7 @@ lib64
 parts/
 pyvenv.cfg
 var/
+local.cfg
 
 # mxdev
 /instance/

diff --git a/.meta.toml b/.meta.toml
@@ -1,14 +1,14 @@
 # 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
 [meta]
 template = "default"
-commit-id = "25d2fa7f"
+commit-id = "6e36bcc4"
 
 [pyproject]
 codespell_skip = "*.min.js"
 codespell_ignores = "vew"
-dependencies_ignores = "['plone.volto', 'zestreleaser.towncrier', 'zest.releaser', 'pytest', 'pytest-cov', 'pytest-plone']"
+dependencies_ignores = "['plone.volto', 'zestreleaser.towncrier', 'zest.releaser', 'pytest', 'pytest-cov', 'pytest-plone', 'plone.testing', 'plone.app.testing']"
 dependencies_mappings = [
     "Plone = ['Products.CMFPlone', 'Products.CMFCore', 'Products.GenericSetup']",
     ]

diff --git a/.pre-commit-config.yaml b/.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.0
     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: 23.12.1
     hooks:
     -   id: black
 -   repo: https://github.com/collective/zpretty
@@ -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']

diff --git a/news/6e36bcc4.internal b/news/6e36bcc4.internal
@@ -0,0 +1,2 @@
+Update configuration files.
+[plone devs]
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,9 @@
 # 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"]
+
 [tool.towncrier]
 directory = "news/"
 filename = "CHANGES.md"
@@ -118,7 +121,7 @@ Zope = [
   'Products.CMFCore', 'Products.CMFDynamicViewFTI',
 ]
 python-dateutil = ['dateutil']
-ignore-packages = ['plone.volto', 'zestreleaser.towncrier', 'zest.releaser', 'pytest', 'pytest-cov', 'pytest-plone']
+ignore-packages = ['plone.volto', 'zestreleaser.towncrier', 'zest.releaser', 'pytest', 'pytest-cov', 'pytest-plone', 'plone.testing', 'plone.app.testing']
 Plone = ['Products.CMFPlone', 'Products.CMFCore', 'Products.GenericSetup']
 
 ##

diff --git a/setup.py b/setup.py
@@ -48,10 +48,20 @@
     zip_safe=False,
     install_requires=[
         "Plone",
+        "Zope",
         "setuptools",
-        "z3c.unconfigure",
-        "jsonschema",
         "collective.exportimport>=1.10",
+        "jsonschema",
+        "plone.api",
+        "plone.app.contentrules",
+        "plone.base",
+        "plone.dexterity",
+        "plone.i18n",
+        "plone.namedfile",
+        "plone.protect",
+        "plone.rest",
+        "plone.restapi",
+        "z3c.unconfigure",
     ],
     extras_require={
         "test": [
@@ -60,6 +70,7 @@
             "plone.volto",
             "plone.app.testing",
             "plone.restapi[test]",
+            "plone.testing",
             "pytest",
             "pytest-cov",
             "pytest-plone>=0.2.0",

diff --git a/tox.ini b/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.
@@ -32,6 +32,14 @@ commands =
     echo "Unrecognized environment name {envname}"
     false
 
+##
+# Add extra configuration options in .meta.toml:
+#  [tox]
+#  testenv_options = """
+#  basepython = /usr/bin/python3.8
+#  """
+##
+
 [testenv:init]
 description = Prepare environment
 skip_install = true
@@ -66,9 +74,9 @@ 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 --no-isolation
+    python -m build --sdist
     dependencychecker
 
 [testenv:dependencies-graph]
@@ -148,7 +156,7 @@ deps =
     pytest
     coverage
     -c constraints-mxdev.txt
-
+    
 commands =
     coverage run --source plone.distribution -m pytest  {posargs} --disable-warnings {toxinidir}/tests
     coverage report -m --format markdown
@@ -165,13 +173,13 @@ deps =
     build
     towncrier
     -c constraints-mxdev.txt
-
+    
 commands =
     # fake version to not have to install the package
     # we build the change log as news entries might break
     # the README that is displayed on PyPI
     towncrier build --version=100.0.0 --yes
-    python -m build --sdist --no-isolation
+    python -m build --sdist
     twine check dist/*
 
 [testenv:circular]
@@ -193,7 +201,7 @@ deps =
     pipdeptree
     pipforester
     -c constraints-mxdev.txt
-
+    
 commands =
     # Generate the full dependency tree
     sh -c 'pipdeptree -j > forest.json'