diff --git a/.github/workflows/meta.yml b/.github/workflows/meta.yml index c9848bcb..6d378e21 100644 --- a/.github/workflows/meta.yml +++ b/.github/workflows/meta.yml @@ -28,6 +28,9 @@ jobs: uses: plone/meta/.github/workflows/qa.yml@main test: uses: plone/meta/.github/workflows/test.yml@main + with: + + py-versions: '["3.10","3.11","3.12"]' coverage: uses: plone/meta/.github/workflows/coverage.yml@main dependencies: diff --git a/.gitignore b/.gitignore index 0673be7a..4ffaa406 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,8 @@ __pycache__/ .tox .vscode/ node_modules/ +forest.dot +forest.json # venv / buildout related bin/ diff --git a/.meta.toml b/.meta.toml index db6e11c0..dd10d959 100644 --- a/.meta.toml +++ b/.meta.toml @@ -3,7 +3,7 @@ # See the inline comments on how to expand/tweak this configuration file [meta] template = "default" -commit-id = "a89af8f2" +commit-id = "4cf2df11" [gitignore] extra_lines = """ @@ -19,5 +19,7 @@ codespell_ignores = "pres" dependencies_ignores = "['Products.LinguaPlone']" [tox] -use_mxdev = true -constrain_package_deps = "true" +constraints_file = "https://dist.plone.org/release/6.1-dev/constraints.txt" + +[github] +py_versions = "[\"3.10\",\"3.11\",\"3.12\"]" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f70417dc..14603265 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,7 +16,7 @@ repos: hooks: - id: isort - repo: https://github.com/psf/black - rev: 24.10.0 + rev: 24.8.0 hooks: - id: black - repo: https://github.com/collective/zpretty diff --git a/mx.ini b/mx.ini deleted file mode 100644 index 1853395d..00000000 --- a/mx.ini +++ /dev/null @@ -1,4 +0,0 @@ -[settings] -ignores = - plone.app.multilingual -main-package = -e .[test] diff --git a/news/+meta.internal b/news/+meta.internal new file mode 100644 index 00000000..c08f5399 --- /dev/null +++ b/news/+meta.internal @@ -0,0 +1,2 @@ +Update configuration files. +[plone devs] diff --git a/pyproject.toml b/pyproject.toml index b224fc63..762cf44b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -119,6 +119,7 @@ Zope = [ 'Products.CMFCore', 'Products.CMFDynamicViewFTI', ] python-dateutil = ['dateutil'] +pytest-plone = ['pytest', 'zope.pytestlayer', 'plone.testing', 'plone.app.testing'] ignore-packages = ['Products.LinguaPlone'] ## diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 00e902ab..00000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ --c https://dist.plone.org/release/6.1-dev/constraints.txt diff --git a/tox.ini b/tox.ini index 347e6f3e..c7ff6348 100644 --- a/tox.ini +++ b/tox.ini @@ -43,11 +43,8 @@ commands = [testenv:init] description = Prepare environment skip_install = true -deps = - mxdev commands = - mxdev -c mx.ini - echo "Initial setup for mxdev" + echo "Initial setup complete" [testenv:format] @@ -111,7 +108,7 @@ set_env = ## deps = zope.testrunner - -c constraints-mxdev.txt + -c https://dist.plone.org/release/6.1-dev/constraints.txt ## # Specify additional deps in .meta.toml: @@ -155,7 +152,7 @@ set_env = deps = coverage zope.testrunner - -c constraints-mxdev.txt + -c https://dist.plone.org/release/6.1-dev/constraints.txt commands = rfbrowser init @@ -174,7 +171,7 @@ deps = twine build towncrier - -c constraints-mxdev.txt + -c https://dist.plone.org/release/6.1-dev/constraints.txt commands = # fake version to not have to install the package @@ -205,7 +202,7 @@ allowlist_externals = deps = pipdeptree pipforester - -c constraints-mxdev.txt + -c https://dist.plone.org/release/6.1-dev/constraints.txt commands = # Generate the full dependency tree