Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update config with plone/meta #471

Merged
merged 2 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ __pycache__/
.tox
.vscode/
node_modules/
forest.dot
forest.json

# venv / buildout related
bin/
Expand Down
8 changes: 5 additions & 3 deletions .meta.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = """
Expand All @@ -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\"]"
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions mx.ini

This file was deleted.

2 changes: 2 additions & 0 deletions news/+meta.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update configuration files.
[plone devs]
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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']

##
Expand Down
1 change: 0 additions & 1 deletion requirements.txt

This file was deleted.

13 changes: 5 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down