From c2f0f840eeebbdcec1e647d3fdaffa320939e24d Mon Sep 17 00:00:00 2001 From: gforcada Date: Tue, 30 Jul 2024 16:32:02 +0200 Subject: [PATCH] [fc] Repository: diazo Branch: refs/heads/master Date: 2024-07-30T16:27:42+02:00 Author: Maurits van Rees (mauritsvanrees) Commit: https://github.com/plone/diazo/commit/b40b22d0d595e4b0dbcbfdedda9ab77974ec4639 Remove setuptools fossils. See https://github.com/zopefoundation/meta/issues/260 Files changed: A news/72.bugfix M setup.py Repository: diazo Branch: refs/heads/master Date: 2024-07-30T16:32:02+02:00 Author: Gil Forcada Codinachs (gforcada) Commit: https://github.com/plone/diazo/commit/fb162cbf83cd7dd70eb667febc335aece977cc1b Merge pull request #89 from plone/setuptools-fossils Remove setuptools fossils. Files changed: A news/72.bugfix M setup.py --- last_commit.txt | 68 +++++++++++++------------------------------------ 1 file changed, 17 insertions(+), 51 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index f11bdccf44..149e09c1a7 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,70 +1,36 @@ -Repository: plone.memoize +Repository: diazo Branch: refs/heads/master -Date: 2024-07-01T20:47:32Z -Author: pre-commit-ci[bot] (pre-commit-ci[bot]) <66853113+pre-commit-ci[bot]@users.noreply.github.com> -Commit: https://github.com/plone/plone.memoize/commit/3e8211e25b9967bd6145756d9fc3cfd1a8323e78 +Date: 2024-07-30T16:27:42+02:00 +Author: Maurits van Rees (mauritsvanrees) +Commit: https://github.com/plone/diazo/commit/b40b22d0d595e4b0dbcbfdedda9ab77974ec4639 -[pre-commit.ci] pre-commit autoupdate +Remove setuptools fossils. -updates: -- [github.com/asottile/pyupgrade: v3.15.2 → v3.16.0](https://github.com/asottile/pyupgrade/compare/v3.15.2...v3.16.0) -- [github.com/PyCQA/flake8: 7.0.0 → 7.1.0](https://github.com/PyCQA/flake8/compare/7.0.0...7.1.0) -- [github.com/codespell-project/codespell: v2.2.6 → v2.3.0](https://github.com/codespell-project/codespell/compare/v2.2.6...v2.3.0) +See https://github.com/zopefoundation/meta/issues/260 Files changed: -M .pre-commit-config.yaml +A news/72.bugfix +M setup.py -b'diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml\nindex d94dcda..adbfab1 100644\n--- a/.pre-commit-config.yaml\n+++ b/.pre-commit-config.yaml\n@@ -7,7 +7,7 @@ ci:\n \n repos:\n - repo: https://github.com/asottile/pyupgrade\n- rev: v3.15.2\n+ rev: v3.16.0\n hooks:\n - id: pyupgrade\n args: [--py38-plus]\n@@ -32,11 +32,11 @@ repos:\n # """\n ##\n - repo: https://github.com/PyCQA/flake8\n- rev: 7.0.0\n+ rev: 7.1.0\n hooks:\n - id: flake8\n - repo: https://github.com/codespell-project/codespell\n- rev: v2.2.6\n+ rev: v2.3.0\n hooks:\n - id: codespell\n additional_dependencies:\n' +b'diff --git a/news/72.bugfix b/news/72.bugfix\nnew file mode 100644\nindex 0000000..f3dd874\n--- /dev/null\n+++ b/news/72.bugfix\n@@ -0,0 +1,2 @@\n+Remove setuptools fossils.\n+[maurits]\ndiff --git a/setup.py b/setup.py\nindex 6b82895..a7df4e8 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -57,8 +57,6 @@\n "cssselect",\n ],\n extras_require=extras_require,\n- test_suite="diazo.tests.alltests",\n- tests_require=extras_require["test"],\n entry_points="""\n [console_scripts]\n diazocompiler = diazo.compiler:main\n' -Repository: plone.memoize +Repository: diazo Branch: refs/heads/master -Date: 2024-07-02T06:55:32+02:00 +Date: 2024-07-30T16:32:02+02:00 Author: Gil Forcada Codinachs (gforcada) -Commit: https://github.com/plone/plone.memoize/commit/ef61dd64fa33f3e84f9b067ee44048ef01c558cc +Commit: https://github.com/plone/diazo/commit/fb162cbf83cd7dd70eb667febc335aece977cc1b -Configuring with plone/meta +Merge pull request #89 from plone/setuptools-fossils -Files changed: -A dependabot.yml -M .editorconfig -M .flake8 -M .github/workflows/meta.yml -M .gitignore -M .meta.toml -M .pre-commit-config.yaml -M pyproject.toml -M tox.ini -D .github/workflows/tests.yml - -b'diff --git a/.editorconfig b/.editorconfig\nindex 919b411..5b3c112 100644\n--- a/.editorconfig\n+++ b/.editorconfig\n@@ -1,5 +1,5 @@\n # Generated from:\n-# https://github.com/plone/meta/tree/master/config/default\n+# https://github.com/plone/meta/tree/main/config/default\n # See the inline comments on how to expand/tweak this configuration file\n #\n # EditorConfig Configuration file, for more details see:\n@@ -13,7 +13,8 @@\n root = true\n \n \n-[*] # For All Files\n+[*]\n+# Default settings for all files.\n # Unix-style newlines with a newline ending every file\n end_of_line = lf\n insert_final_newline = true\n@@ -29,13 +30,15 @@ max_line_length = off\n # 4 space indentation\n indent_size = 4\n \n-[*.{yml,zpt,pt,dtml,zcml}]\n+[*.{yml,zpt,pt,dtml,zcml,html,xml}]\n # 2 space indentation\n indent_size = 2\n \n-[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss,html}] # Frontend development\n+[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss}]\n+# Frontend development\n # 2 space indentation\n indent_size = 2\n+max_line_length = 80\n \n [{Makefile,.gitmodules}]\n # Tab indentation (no size specified, but view as 4 spaces)\ndiff --git a/.flake8 b/.flake8\nindex 7ef4f64..38918f4 100644\n--- a/.flake8\n+++ b/.flake8\n@@ -1,5 +1,5 @@\n # Generated from:\n-# https://github.com/plone/meta/tree/master/config/default\n+# https://github.com/plone/meta/tree/main/config/default\n # See the inline comments on how to expand/tweak this configuration file\n [flake8]\n doctests = 1\ndiff --git a/.github/workflows/meta.yml b/.github/workflows/meta.yml\nindex 4748f0f..ebb4cd0 100644\n--- a/.github/workflows/meta.yml\n+++ b/.github/workflows/meta.yml\n@@ -1,5 +1,5 @@\n # Generated from:\n-# https://github.com/plone/meta/tree/master/config/default\n+# https://github.com/plone/meta/tree/main/config/default\n # See the inline comments on how to expand/tweak this configuration file\n name: Meta\n on:\n@@ -13,16 +13,66 @@ on:\n - main\n workflow_dispatch:\n \n+##\n+# To set environment variables for all jobs, add in .meta.toml:\n+# [github]\n+# env = """\n+# debug: 1\n+# image-name: \'org/image\'\n+# image-tag: \'latest\'\n+# """\n+##\n+\n jobs:\n qa:\n- uses: plone/meta/.github/workflows/qa.yml@master\n+ uses: plone/meta/.github/workflows/qa.yml@main\n test:\n- uses: plone/meta/.github/workflows/test.yml@master\n+ uses: plone/meta/.github/workflows/test.yml@main\n+ with:\n+\n+ py-versions: \'["3.12", "3.11", "3.10", "3.9", "3.8"]\'\n coverage:\n- uses: plone/meta/.github/workflows/coverage.yml@master\n+ uses: plone/meta/.github/workflows/coverage.yml@main\n dependencies:\n- uses: plone/meta/.github/workflows/dependencies.yml@master\n- release-ready:\n- uses: plone/meta/.github/workflows/release_ready.yml@master\n+ uses: plone/meta/.github/workflows/dependencies.yml@main\n+ release_ready:\n+ uses: plone/meta/.github/workflows/release_ready.yml@main\n circular:\n- uses: plone/meta/.github/workflows/circular.yml@master\n+ uses: plone/meta/.github/workflows/circular.yml@main\n+\n+##\n+# To modify the list of default jobs being created add in .meta.toml:\n+# [github]\n+# jobs = [\n+# "qa",\n+# "test",\n+# "coverage",\n+# "dependencies",\n+# "release_ready",\n+# "circular",\n+# ]\n+##\n+\n+##\n+# To request that some OS level dependencies get installed\n+# when running tests/coverage jobs, add in .meta.toml:\n+# [github]\n+# os_dependencies = "git libxml2 libxslt"\n+##\n+\n+##\n+# To test against a specific matrix of python versions\n+# when running tests jobs, add in .meta.toml:\n+# [github]\n+# py_versions = "[\'3.12\', \'3.11\']"\n+##\n+\n+\n+##\n+# Specify additional jobs in .meta.toml:\n+# [github]\n+# extra_lines = """\n+# another:\n+# uses: org/repo/.github/workflows/file.yml@main\n+# """\n+##\ndiff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml\ndeleted file mode 100644\nindex 8c1d5bf..0000000\n--- a/.github/workflows/tests.yml\n+++ /dev/null\n@@ -1,28 +0,0 @@\n-name: tests\n-\n-on:\n- push:\n- branches: [ master ]\n- pull_request:\n- # Allow to run this workflow manually from the Actions tab\n- workflow_dispatch:\n-jobs:\n- build:\n- strategy:\n- fail-fast: false\n- matrix:\n- python_version: ["3.8", "3.9", "3.10", "3.11", "pypy3.9"]\n- runs-on: ubuntu-latest\n- name: ${{ matrix.python_version }}\n- steps:\n- - uses: actions/checkout@v3\n- - name: Set up Python\n- uses: actions/setup-python@v4\n- with:\n- python-version: ${{ matrix.python_version }}\n- - name: Install dependencies\n- run: |\n- python -m pip install --upgrade pip\n- pip install tox tox-gh-actions\n- - name: Test\n- run: python -m tox\ndiff --git a/.gitignore b/.gitignore\nindex 0690a90..486392f 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -1,14 +1,18 @@\n # Generated from:\n-# https://github.com/plone/meta/tree/master/config/default\n+# https://github.com/plone/meta/tree/main/config/default\n # See the inline comments on how to expand/tweak this configuration file\n # python related\n *.egg-info\n *.pyc\n *.pyo\n \n+# translation related\n+*.mo\n+\n # tools related\n build/\n .coverage\n+.*project\n coverage.xml\n dist/\n docs/_build\n@@ -24,12 +28,14 @@ eggs/\n .eggs/\n etc/\n .installed.cfg\n+include/\n lib/\n lib64\n .mr.developer.cfg\n parts/\n pyvenv.cfg\n var/\n+local.cfg\n \n # mxdev\n /instance/\ndiff --git a/.meta.toml b/.meta.toml\nindex 5bbcede..11e08bb 100644\n--- a/.meta.toml\n+++ b/.meta.toml\n@@ -1,28 +1,13 @@\n # Generated from:\n-# https://github.com/plone/meta/tree/master/config/default\n+# https://github.com/plone/meta/tree/main/config/default\n # See the inline comments on how to expand/tweak this configuration file\n [meta]\n template = "default"\n-commit-id = "237ff4c8"\n+commit-id = "4b86f8f1"\n \n [pyproject]\n dependencies_ignores = "[\'zope.testing\']"\n+codespell_ignores = "whit"\n \n-[tox]\n-envlist_lines = """\n- py38,\n- py39,\n- py310,\n- py311,\n- pypy,\n- pypy3,\n-"""\n-config_lines = """\n-[gh-actions]\n-python =\n- 3.8: py38\n- 3.9: py39\n- 3.10: py310\n- 3.11: py311\n- pypy3.9: pypy3\n-"""\n+[github]\n+py_versions = "[\\"3.12\\", \\"3.11\\", \\"3.10\\", \\"3.9\\", \\"3.8\\"]"\ndiff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml\nindex adbfab1..3479cc2 100644\n--- a/.pre-commit-config.yaml\n+++ b/.pre-commit-config.yaml\n@@ -1,5 +1,5 @@\n # Generated from:\n-# https://github.com/plone/meta/tree/master/config/default\n+# https://github.com/plone/meta/tree/main/config/default\n # See the inline comments on how to expand/tweak this configuration file\n ci:\n autofix_prs: false\n@@ -35,6 +35,14 @@ repos:\n rev: 7.1.0\n hooks:\n - id: flake8\n+\n+##\n+# Add extra configuration options in .meta.toml:\n+# [pre_commit]\n+# flake8_extra_lines = """\n+# _your own configuration lines_\n+# """\n+##\n - repo: https://github.com/codespell-project/codespell\n rev: v2.3.0\n hooks:\n@@ -67,6 +75,16 @@ repos:\n hooks:\n - id: i18ndude\n \n+\n+##\n+# Add extra configuration options in .meta.toml:\n+# [pre_commit]\n+# i18ndude_extra_lines = """\n+# _your own configuration lines_\n+# """\n+##\n+\n+\n ##\n # Add extra configuration options in .meta.toml:\n # [pre_commit]\ndiff --git a/dependabot.yml b/dependabot.yml\nnew file mode 100644\nindex 0000000..bbd3ab0\n--- /dev/null\n+++ b/dependabot.yml\n@@ -0,0 +1,11 @@\n+# Generated from:\n+# https://github.com/plone/meta/tree/main/config/default\n+# See the inline comments on how to expand/tweak this configuration file\n+version: 2\n+updates:\n+\n+ - package-ecosystem: "github-actions"\n+ directory: "/"\n+ schedule:\n+ # Check for updates to GitHub Actions every week\n+ interval: "weekly"\ndiff --git a/pyproject.toml b/pyproject.toml\nindex 2d36ca2..aa51acb 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -1,6 +1,9 @@\n # Generated from:\n-# https://github.com/plone/meta/tree/master/config/default\n+# https://github.com/plone/meta/tree/main/config/default\n # See the inline comments on how to expand/tweak this configuration file\n+[build-system]\n+requires = ["setuptools>=68.2"]\n+\n [tool.towncrier]\n directory = "news/"\n filename = "CHANGES.rst"\n@@ -37,14 +40,38 @@ directory = "tests"\n name = "Tests"\n showcontent = true\n \n+##\n+# Add extra configuration options in .meta.toml:\n+# [pyproject]\n+# towncrier_extra_lines = """\n+# extra_configuration\n+# """\n+##\n+\n [tool.isort]\n profile = "plone"\n \n+##\n+# Add extra configuration options in .meta.toml:\n+# [pyproject]\n+# isort_extra_lines = """\n+# extra_configuration\n+# """\n+##\n+\n [tool.black]\n target-version = ["py38"]\n \n+##\n+# Add extra configuration options in .meta.toml:\n+# [pyproject]\n+# black_extra_lines = """\n+# extra_configuration\n+# """\n+##\n+\n [tool.codespell]\n-ignore-words-list = "discreet,"\n+ignore-words-list = "discreet,assertin,whit"\n skip = "*.po,"\n ##\n # Add extra configuration options in .meta.toml:\n@@ -102,19 +129,20 @@ ignore-packages = [\'zope.testing\']\n # "gitpython = [\'git\']",\n # "pygithub = [\'github\']",\n # ]\n-# """\n ##\n \n [tool.check-manifest]\n ignore = [\n ".editorconfig",\n+ ".flake8",\n ".meta.toml",\n ".pre-commit-config.yaml",\n- "tox.ini",\n- ".flake8",\n+ "dependabot.yml",\n "mx.ini",\n+ "tox.ini",\n \n ]\n+\n ##\n # Add extra configuration options in .meta.toml:\n # [pyproject]\n@@ -122,6 +150,11 @@ ignore = [\n # "*.map.js",\n # "*.pyc",\n # """\n+# check_manifest_extra_lines = """\n+# ignore-bad-ideas = [\n+# "some/test/file/PKG-INFO",\n+# ]\n+# """\n ##\n \n \ndiff --git a/tox.ini b/tox.ini\nindex b93b84d..7a0bbf3 100644\n--- a/tox.ini\n+++ b/tox.ini\n@@ -1,5 +1,5 @@\n # Generated from:\n-# https://github.com/plone/meta/tree/master/config/default\n+# https://github.com/plone/meta/tree/main/config/default\n # See the inline comments on how to expand/tweak this configuration file\n [tox]\n # We need 4.4.0 for constrain_package_deps.\n@@ -8,20 +8,7 @@ envlist =\n lint\n test\n dependencies\n- py38,\n- py39,\n- py310,\n- py311,\n- pypy,\n- pypy3,\n-\n-[gh-actions]\n-python =\n- 3.8: py38\n- 3.9: py39\n- 3.10: py310\n- 3.11: py311\n- pypy3.9: pypy3\n+\n \n ##\n # Add extra configuration options in .meta.toml:\n@@ -35,13 +22,30 @@ python =\n ##\n \n [testenv]\n-deps =\n- zope.testrunner\n- -c https://dist.plone.org/release/6.0-dev/constraints.txt\n-commands = zope-testrunner --test-path=. {posargs:-vc}\n-extras = test\n+skip_install = true\n allowlist_externals =\n- sh\n+ echo\n+ false\n+# Make sure typos like `tox -e formaat` are caught instead of silently doing nothing.\n+# See https://github.com/tox-dev/tox/issues/2858.\n+commands =\n+ echo "Unrecognized environment name {envname}"\n+ false\n+\n+##\n+# Add extra configuration options in .meta.toml:\n+# [tox]\n+# testenv_options = """\n+# basepython = /usr/bin/python3.8\n+# """\n+##\n+\n+[testenv:init]\n+description = Prepare environment\n+skip_install = true\n+commands =\n+ echo "Initial setup complete"\n+\n \n [testenv:format]\n description = automatically reformat code\n@@ -67,9 +71,9 @@ description = check if the package defines all its dependencies\n skip_install = true\n deps =\n build\n- z3c.dependencychecker==2.11\n+ z3c.dependencychecker==2.14.3\n commands =\n- python -m build --sdist --no-isolation\n+ python -m build --sdist\n dependencychecker\n \n [testenv:dependencies-graph]\n@@ -88,10 +92,33 @@ description = run the distribution tests\n use_develop = true\n skip_install = false\n constrain_package_deps = true\n-set_env = ROBOT_BROWSER=headlesschrome\n+set_env =\n+ ROBOT_BROWSER=headlesschrome\n+\n+##\n+# Specify extra test environment variables in .meta.toml:\n+# [tox]\n+# test_environment_variables = """\n+# PIP_EXTRA_INDEX_URL=https://my-pypi.my-server.com/\n+# """\n+#\n+# Set constrain_package_deps .meta.toml:\n+# [tox]\n+# constrain_package_deps = "false"\n+##\n deps =\n zope.testrunner\n -c https://dist.plone.org/release/6.0-dev/constraints.txt\n+\n+##\n+# Specify additional deps in .meta.toml:\n+# [tox]\n+# test_deps_additional = "-esources/plonegovbr.portal_base[test]"\n+#\n+# Specify a custom constraints file in .meta.toml:\n+# [tox]\n+# constraints_file = "https://my-server.com/constraints.txt"\n+##\n commands =\n zope-testrunner --all --test-path={toxinidir} -s plone.memoize {posargs}\n extras =\n@@ -111,14 +138,26 @@ description = get a test coverage report\n use_develop = true\n skip_install = false\n constrain_package_deps = true\n-set_env = ROBOT_BROWSER=headlesschrome\n+set_env =\n+ ROBOT_BROWSER=headlesschrome\n+\n+##\n+# Specify extra test environment variables in .meta.toml:\n+# [tox]\n+# test_environment_variables = """\n+# PIP_EXTRA_INDEX_URL=https://my-pypi.my-server.com/\n+# """\n+##\n deps =\n coverage\n zope.testrunner\n -c https://dist.plone.org/release/6.0-dev/constraints.txt\n+\n commands =\n- coverage run --source plone.memoize {envbindir}/zope-testrunner --quiet --all --test-path={toxinidir} -s plone.memoize {posargs}\n+ coverage run --branch --source plone.memoize {envbindir}/zope-testrunner --quiet --all --test-path={toxinidir} -s plone.memoize {posargs}\n coverage report -m --format markdown\n+ coverage xml\n+ coverage html\n extras =\n test\n \n@@ -131,24 +170,38 @@ deps =\n build\n towncrier\n -c https://dist.plone.org/release/6.0-dev/constraints.txt\n+\n commands =\n # fake version to not have to install the package\n # we build the change log as news entries might break\n # the README that is displayed on PyPI\n towncrier build --version=100.0.0 --yes\n- python -m build --sdist --no-isolation\n+ python -m build --sdist\n twine check dist/*\n \n [testenv:circular]\n description = ensure there are no cyclic dependencies\n use_develop = true\n skip_install = false\n+# Here we must always constrain the package deps to what is already installed,\n+# otherwise we simply get the latest from PyPI, which may not work.\n+constrain_package_deps = true\n+set_env =\n+\n+##\n+# Specify extra test environment variables in .meta.toml:\n+# [tox]\n+# test_environment_variables = """\n+# PIP_EXTRA_INDEX_URL=https://my-pypi.my-server.com/\n+# """\n+##\n allowlist_externals =\n sh\n deps =\n pipdeptree\n pipforester\n -c https://dist.plone.org/release/6.0-dev/constraints.txt\n+\n commands =\n # Generate the full dependency tree\n sh -c \'pipdeptree -j > forest.json\'\n@@ -162,6 +215,6 @@ commands =\n # Add extra configuration options in .meta.toml:\n # [tox]\n # extra_lines = """\n-# my_other_environment\n+# _your own configuration lines_\n # """\n ##\n' - -Repository: plone.memoize - - -Branch: refs/heads/master -Date: 2024-07-30T16:18:37+02:00 -Author: Maurits van Rees (mauritsvanrees) -Commit: https://github.com/plone/plone.memoize/commit/0c89d75b64c0751fd13d4b339c11ae3002f557c4 - -Merge pull request #47 from plone/pre-commit-ci-update-config - -[pre-commit.ci] pre-commit autoupdate +Remove setuptools fossils. Files changed: -A dependabot.yml -M .editorconfig -M .flake8 -M .github/workflows/meta.yml -M .gitignore -M .meta.toml -M .pre-commit-config.yaml -M pyproject.toml -M tox.ini -D .github/workflows/tests.yml +A news/72.bugfix +M setup.py -b'diff --git a/.editorconfig b/.editorconfig\nindex 919b411..5b3c112 100644\n--- a/.editorconfig\n+++ b/.editorconfig\n@@ -1,5 +1,5 @@\n # Generated from:\n-# https://github.com/plone/meta/tree/master/config/default\n+# https://github.com/plone/meta/tree/main/config/default\n # See the inline comments on how to expand/tweak this configuration file\n #\n # EditorConfig Configuration file, for more details see:\n@@ -13,7 +13,8 @@\n root = true\n \n \n-[*] # For All Files\n+[*]\n+# Default settings for all files.\n # Unix-style newlines with a newline ending every file\n end_of_line = lf\n insert_final_newline = true\n@@ -29,13 +30,15 @@ max_line_length = off\n # 4 space indentation\n indent_size = 4\n \n-[*.{yml,zpt,pt,dtml,zcml}]\n+[*.{yml,zpt,pt,dtml,zcml,html,xml}]\n # 2 space indentation\n indent_size = 2\n \n-[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss,html}] # Frontend development\n+[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss}]\n+# Frontend development\n # 2 space indentation\n indent_size = 2\n+max_line_length = 80\n \n [{Makefile,.gitmodules}]\n # Tab indentation (no size specified, but view as 4 spaces)\ndiff --git a/.flake8 b/.flake8\nindex 7ef4f64..38918f4 100644\n--- a/.flake8\n+++ b/.flake8\n@@ -1,5 +1,5 @@\n # Generated from:\n-# https://github.com/plone/meta/tree/master/config/default\n+# https://github.com/plone/meta/tree/main/config/default\n # See the inline comments on how to expand/tweak this configuration file\n [flake8]\n doctests = 1\ndiff --git a/.github/workflows/meta.yml b/.github/workflows/meta.yml\nindex 4748f0f..ebb4cd0 100644\n--- a/.github/workflows/meta.yml\n+++ b/.github/workflows/meta.yml\n@@ -1,5 +1,5 @@\n # Generated from:\n-# https://github.com/plone/meta/tree/master/config/default\n+# https://github.com/plone/meta/tree/main/config/default\n # See the inline comments on how to expand/tweak this configuration file\n name: Meta\n on:\n@@ -13,16 +13,66 @@ on:\n - main\n workflow_dispatch:\n \n+##\n+# To set environment variables for all jobs, add in .meta.toml:\n+# [github]\n+# env = """\n+# debug: 1\n+# image-name: \'org/image\'\n+# image-tag: \'latest\'\n+# """\n+##\n+\n jobs:\n qa:\n- uses: plone/meta/.github/workflows/qa.yml@master\n+ uses: plone/meta/.github/workflows/qa.yml@main\n test:\n- uses: plone/meta/.github/workflows/test.yml@master\n+ uses: plone/meta/.github/workflows/test.yml@main\n+ with:\n+\n+ py-versions: \'["3.12", "3.11", "3.10", "3.9", "3.8"]\'\n coverage:\n- uses: plone/meta/.github/workflows/coverage.yml@master\n+ uses: plone/meta/.github/workflows/coverage.yml@main\n dependencies:\n- uses: plone/meta/.github/workflows/dependencies.yml@master\n- release-ready:\n- uses: plone/meta/.github/workflows/release_ready.yml@master\n+ uses: plone/meta/.github/workflows/dependencies.yml@main\n+ release_ready:\n+ uses: plone/meta/.github/workflows/release_ready.yml@main\n circular:\n- uses: plone/meta/.github/workflows/circular.yml@master\n+ uses: plone/meta/.github/workflows/circular.yml@main\n+\n+##\n+# To modify the list of default jobs being created add in .meta.toml:\n+# [github]\n+# jobs = [\n+# "qa",\n+# "test",\n+# "coverage",\n+# "dependencies",\n+# "release_ready",\n+# "circular",\n+# ]\n+##\n+\n+##\n+# To request that some OS level dependencies get installed\n+# when running tests/coverage jobs, add in .meta.toml:\n+# [github]\n+# os_dependencies = "git libxml2 libxslt"\n+##\n+\n+##\n+# To test against a specific matrix of python versions\n+# when running tests jobs, add in .meta.toml:\n+# [github]\n+# py_versions = "[\'3.12\', \'3.11\']"\n+##\n+\n+\n+##\n+# Specify additional jobs in .meta.toml:\n+# [github]\n+# extra_lines = """\n+# another:\n+# uses: org/repo/.github/workflows/file.yml@main\n+# """\n+##\ndiff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml\ndeleted file mode 100644\nindex 8c1d5bf..0000000\n--- a/.github/workflows/tests.yml\n+++ /dev/null\n@@ -1,28 +0,0 @@\n-name: tests\n-\n-on:\n- push:\n- branches: [ master ]\n- pull_request:\n- # Allow to run this workflow manually from the Actions tab\n- workflow_dispatch:\n-jobs:\n- build:\n- strategy:\n- fail-fast: false\n- matrix:\n- python_version: ["3.8", "3.9", "3.10", "3.11", "pypy3.9"]\n- runs-on: ubuntu-latest\n- name: ${{ matrix.python_version }}\n- steps:\n- - uses: actions/checkout@v3\n- - name: Set up Python\n- uses: actions/setup-python@v4\n- with:\n- python-version: ${{ matrix.python_version }}\n- - name: Install dependencies\n- run: |\n- python -m pip install --upgrade pip\n- pip install tox tox-gh-actions\n- - name: Test\n- run: python -m tox\ndiff --git a/.gitignore b/.gitignore\nindex 0690a90..486392f 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -1,14 +1,18 @@\n # Generated from:\n-# https://github.com/plone/meta/tree/master/config/default\n+# https://github.com/plone/meta/tree/main/config/default\n # See the inline comments on how to expand/tweak this configuration file\n # python related\n *.egg-info\n *.pyc\n *.pyo\n \n+# translation related\n+*.mo\n+\n # tools related\n build/\n .coverage\n+.*project\n coverage.xml\n dist/\n docs/_build\n@@ -24,12 +28,14 @@ eggs/\n .eggs/\n etc/\n .installed.cfg\n+include/\n lib/\n lib64\n .mr.developer.cfg\n parts/\n pyvenv.cfg\n var/\n+local.cfg\n \n # mxdev\n /instance/\ndiff --git a/.meta.toml b/.meta.toml\nindex 5bbcede..11e08bb 100644\n--- a/.meta.toml\n+++ b/.meta.toml\n@@ -1,28 +1,13 @@\n # Generated from:\n-# https://github.com/plone/meta/tree/master/config/default\n+# https://github.com/plone/meta/tree/main/config/default\n # See the inline comments on how to expand/tweak this configuration file\n [meta]\n template = "default"\n-commit-id = "237ff4c8"\n+commit-id = "4b86f8f1"\n \n [pyproject]\n dependencies_ignores = "[\'zope.testing\']"\n+codespell_ignores = "whit"\n \n-[tox]\n-envlist_lines = """\n- py38,\n- py39,\n- py310,\n- py311,\n- pypy,\n- pypy3,\n-"""\n-config_lines = """\n-[gh-actions]\n-python =\n- 3.8: py38\n- 3.9: py39\n- 3.10: py310\n- 3.11: py311\n- pypy3.9: pypy3\n-"""\n+[github]\n+py_versions = "[\\"3.12\\", \\"3.11\\", \\"3.10\\", \\"3.9\\", \\"3.8\\"]"\ndiff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml\nindex d94dcda..3479cc2 100644\n--- a/.pre-commit-config.yaml\n+++ b/.pre-commit-config.yaml\n@@ -1,5 +1,5 @@\n # Generated from:\n-# https://github.com/plone/meta/tree/master/config/default\n+# https://github.com/plone/meta/tree/main/config/default\n # See the inline comments on how to expand/tweak this configuration file\n ci:\n autofix_prs: false\n@@ -7,7 +7,7 @@ ci:\n \n repos:\n - repo: https://github.com/asottile/pyupgrade\n- rev: v3.15.2\n+ rev: v3.16.0\n hooks:\n - id: pyupgrade\n args: [--py38-plus]\n@@ -32,11 +32,19 @@ repos:\n # """\n ##\n - repo: https://github.com/PyCQA/flake8\n- rev: 7.0.0\n+ rev: 7.1.0\n hooks:\n - id: flake8\n+\n+##\n+# Add extra configuration options in .meta.toml:\n+# [pre_commit]\n+# flake8_extra_lines = """\n+# _your own configuration lines_\n+# """\n+##\n - repo: https://github.com/codespell-project/codespell\n- rev: v2.2.6\n+ rev: v2.3.0\n hooks:\n - id: codespell\n additional_dependencies:\n@@ -67,6 +75,16 @@ repos:\n hooks:\n - id: i18ndude\n \n+\n+##\n+# Add extra configuration options in .meta.toml:\n+# [pre_commit]\n+# i18ndude_extra_lines = """\n+# _your own configuration lines_\n+# """\n+##\n+\n+\n ##\n # Add extra configuration options in .meta.toml:\n # [pre_commit]\ndiff --git a/dependabot.yml b/dependabot.yml\nnew file mode 100644\nindex 0000000..bbd3ab0\n--- /dev/null\n+++ b/dependabot.yml\n@@ -0,0 +1,11 @@\n+# Generated from:\n+# https://github.com/plone/meta/tree/main/config/default\n+# See the inline comments on how to expand/tweak this configuration file\n+version: 2\n+updates:\n+\n+ - package-ecosystem: "github-actions"\n+ directory: "/"\n+ schedule:\n+ # Check for updates to GitHub Actions every week\n+ interval: "weekly"\ndiff --git a/pyproject.toml b/pyproject.toml\nindex 2d36ca2..aa51acb 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -1,6 +1,9 @@\n # Generated from:\n-# https://github.com/plone/meta/tree/master/config/default\n+# https://github.com/plone/meta/tree/main/config/default\n # See the inline comments on how to expand/tweak this configuration file\n+[build-system]\n+requires = ["setuptools>=68.2"]\n+\n [tool.towncrier]\n directory = "news/"\n filename = "CHANGES.rst"\n@@ -37,14 +40,38 @@ directory = "tests"\n name = "Tests"\n showcontent = true\n \n+##\n+# Add extra configuration options in .meta.toml:\n+# [pyproject]\n+# towncrier_extra_lines = """\n+# extra_configuration\n+# """\n+##\n+\n [tool.isort]\n profile = "plone"\n \n+##\n+# Add extra configuration options in .meta.toml:\n+# [pyproject]\n+# isort_extra_lines = """\n+# extra_configuration\n+# """\n+##\n+\n [tool.black]\n target-version = ["py38"]\n \n+##\n+# Add extra configuration options in .meta.toml:\n+# [pyproject]\n+# black_extra_lines = """\n+# extra_configuration\n+# """\n+##\n+\n [tool.codespell]\n-ignore-words-list = "discreet,"\n+ignore-words-list = "discreet,assertin,whit"\n skip = "*.po,"\n ##\n # Add extra configuration options in .meta.toml:\n@@ -102,19 +129,20 @@ ignore-packages = [\'zope.testing\']\n # "gitpython = [\'git\']",\n # "pygithub = [\'github\']",\n # ]\n-# """\n ##\n \n [tool.check-manifest]\n ignore = [\n ".editorconfig",\n+ ".flake8",\n ".meta.toml",\n ".pre-commit-config.yaml",\n- "tox.ini",\n- ".flake8",\n+ "dependabot.yml",\n "mx.ini",\n+ "tox.ini",\n \n ]\n+\n ##\n # Add extra configuration options in .meta.toml:\n # [pyproject]\n@@ -122,6 +150,11 @@ ignore = [\n # "*.map.js",\n # "*.pyc",\n # """\n+# check_manifest_extra_lines = """\n+# ignore-bad-ideas = [\n+# "some/test/file/PKG-INFO",\n+# ]\n+# """\n ##\n \n \ndiff --git a/tox.ini b/tox.ini\nindex b93b84d..7a0bbf3 100644\n--- a/tox.ini\n+++ b/tox.ini\n@@ -1,5 +1,5 @@\n # Generated from:\n-# https://github.com/plone/meta/tree/master/config/default\n+# https://github.com/plone/meta/tree/main/config/default\n # See the inline comments on how to expand/tweak this configuration file\n [tox]\n # We need 4.4.0 for constrain_package_deps.\n@@ -8,20 +8,7 @@ envlist =\n lint\n test\n dependencies\n- py38,\n- py39,\n- py310,\n- py311,\n- pypy,\n- pypy3,\n-\n-[gh-actions]\n-python =\n- 3.8: py38\n- 3.9: py39\n- 3.10: py310\n- 3.11: py311\n- pypy3.9: pypy3\n+\n \n ##\n # Add extra configuration options in .meta.toml:\n@@ -35,13 +22,30 @@ python =\n ##\n \n [testenv]\n-deps =\n- zope.testrunner\n- -c https://dist.plone.org/release/6.0-dev/constraints.txt\n-commands = zope-testrunner --test-path=. {posargs:-vc}\n-extras = test\n+skip_install = true\n allowlist_externals =\n- sh\n+ echo\n+ false\n+# Make sure typos like `tox -e formaat` are caught instead of silently doing nothing.\n+# See https://github.com/tox-dev/tox/issues/2858.\n+commands =\n+ echo "Unrecognized environment name {envname}"\n+ false\n+\n+##\n+# Add extra configuration options in .meta.toml:\n+# [tox]\n+# testenv_options = """\n+# basepython = /usr/bin/python3.8\n+# """\n+##\n+\n+[testenv:init]\n+description = Prepare environment\n+skip_install = true\n+commands =\n+ echo "Initial setup complete"\n+\n \n [testenv:format]\n description = automatically reformat code\n@@ -67,9 +71,9 @@ description = check if the package defines all its dependencies\n skip_install = true\n deps =\n build\n- z3c.dependencychecker==2.11\n+ z3c.dependencychecker==2.14.3\n commands =\n- python -m build --sdist --no-isolation\n+ python -m build --sdist\n dependencychecker\n \n [testenv:dependencies-graph]\n@@ -88,10 +92,33 @@ description = run the distribution tests\n use_develop = true\n skip_install = false\n constrain_package_deps = true\n-set_env = ROBOT_BROWSER=headlesschrome\n+set_env =\n+ ROBOT_BROWSER=headlesschrome\n+\n+##\n+# Specify extra test environment variables in .meta.toml:\n+# [tox]\n+# test_environment_variables = """\n+# PIP_EXTRA_INDEX_URL=https://my-pypi.my-server.com/\n+# """\n+#\n+# Set constrain_package_deps .meta.toml:\n+# [tox]\n+# constrain_package_deps = "false"\n+##\n deps =\n zope.testrunner\n -c https://dist.plone.org/release/6.0-dev/constraints.txt\n+\n+##\n+# Specify additional deps in .meta.toml:\n+# [tox]\n+# test_deps_additional = "-esources/plonegovbr.portal_base[test]"\n+#\n+# Specify a custom constraints file in .meta.toml:\n+# [tox]\n+# constraints_file = "https://my-server.com/constraints.txt"\n+##\n commands =\n zope-testrunner --all --test-path={toxinidir} -s plone.memoize {posargs}\n extras =\n@@ -111,14 +138,26 @@ description = get a test coverage report\n use_develop = true\n skip_install = false\n constrain_package_deps = true\n-set_env = ROBOT_BROWSER=headlesschrome\n+set_env =\n+ ROBOT_BROWSER=headlesschrome\n+\n+##\n+# Specify extra test environment variables in .meta.toml:\n+# [tox]\n+# test_environment_variables = """\n+# PIP_EXTRA_INDEX_URL=https://my-pypi.my-server.com/\n+# """\n+##\n deps =\n coverage\n zope.testrunner\n -c https://dist.plone.org/release/6.0-dev/constraints.txt\n+\n commands =\n- coverage run --source plone.memoize {envbindir}/zope-testrunner --quiet --all --test-path={toxinidir} -s plone.memoize {posargs}\n+ coverage run --branch --source plone.memoize {envbindir}/zope-testrunner --quiet --all --test-path={toxinidir} -s plone.memoize {posargs}\n coverage report -m --format markdown\n+ coverage xml\n+ coverage html\n extras =\n test\n \n@@ -131,24 +170,38 @@ deps =\n build\n towncrier\n -c https://dist.plone.org/release/6.0-dev/constraints.txt\n+\n commands =\n # fake version to not have to install the package\n # we build the change log as news entries might break\n # the README that is displayed on PyPI\n towncrier build --version=100.0.0 --yes\n- python -m build --sdist --no-isolation\n+ python -m build --sdist\n twine check dist/*\n \n [testenv:circular]\n description = ensure there are no cyclic dependencies\n use_develop = true\n skip_install = false\n+# Here we must always constrain the package deps to what is already installed,\n+# otherwise we simply get the latest from PyPI, which may not work.\n+constrain_package_deps = true\n+set_env =\n+\n+##\n+# Specify extra test environment variables in .meta.toml:\n+# [tox]\n+# test_environment_variables = """\n+# PIP_EXTRA_INDEX_URL=https://my-pypi.my-server.com/\n+# """\n+##\n allowlist_externals =\n sh\n deps =\n pipdeptree\n pipforester\n -c https://dist.plone.org/release/6.0-dev/constraints.txt\n+\n commands =\n # Generate the full dependency tree\n sh -c \'pipdeptree -j > forest.json\'\n@@ -162,6 +215,6 @@ commands =\n # Add extra configuration options in .meta.toml:\n # [tox]\n # extra_lines = """\n-# my_other_environment\n+# _your own configuration lines_\n # """\n ##\n' +b'diff --git a/news/72.bugfix b/news/72.bugfix\nnew file mode 100644\nindex 0000000..f3dd874\n--- /dev/null\n+++ b/news/72.bugfix\n@@ -0,0 +1,2 @@\n+Remove setuptools fossils.\n+[maurits]\ndiff --git a/setup.py b/setup.py\nindex 6b82895..a7df4e8 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -57,8 +57,6 @@\n "cssselect",\n ],\n extras_require=extras_require,\n- test_suite="diazo.tests.alltests",\n- tests_require=extras_require["test"],\n entry_points="""\n [console_scripts]\n diazocompiler = diazo.compiler:main\n'