Skip to content

Commit

Permalink
Merge pull request #34 from plone/config-with-default-template-41d55d4b
Browse files Browse the repository at this point in the history
Configuring for default
  • Loading branch information
gforcada authored Jan 24, 2023
2 parents 41d55d4 + 3d9afa3 commit 43ae50a
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .meta.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ additional-ignores = [

[meta]
template = "default"
commit-id = "6d382fce"
commit-id = "741efbc5"
1 change: 1 addition & 0 deletions lint-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
black==22.12.0
check-manifest==0.49
codespell==2.2.2
flake8==6.0.0
isort==5.11.4
Expand Down
2 changes: 2 additions & 0 deletions news/34.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update configuration for default Plone meta.
[maurits]
15 changes: 15 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,21 @@ directory = "bugfix"
name = "Bug fixes:"
showcontent = true

[[tool.towncrier.type]]
directory = "internal"
name = "Internal:"
showcontent = true

[[tool.towncrier.type]]
directory = "documentation"
name = "Documentation:"
showcontent = true

[[tool.towncrier.type]]
directory = "tests"
name = "Tests"
showcontent = true

[tool.isort]
profile = "plone"

Expand Down
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ ignore =
ignore =
.editorconfig
.meta.toml
tox.ini
conf.py
18 changes: 10 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ envlist =
lint

[testenv]
py_files = find plone -name "*.py"
rst_files = find plone -name "*.rst"
py_files = git ls-files "*.py"
text_files = git ls-files "*.rst" "*.md"
allowlist_externals =
sh

Expand All @@ -20,18 +20,20 @@ deps =
black
-c lint-requirements.txt
commands =
sh -c '{[testenv]py_files} | xargs pyupgrade --py38-plus *.py'
sh -c '{[testenv]py_files} | xargs isort *.py'
sh -c '{[testenv]py_files} | xargs black *.py'
sh -c '{[testenv]py_files} | xargs pyupgrade --py38-plus'
sh -c '{[testenv]py_files} | xargs isort'
sh -c '{[testenv]py_files} | xargs black'

[testenv:lint]
description = run linters that will help improve the code style
skip_install = true
deps =
flake8
codespell
check-manifest
-c lint-requirements.txt
commands =
sh -c '{[testenv]py_files} | xargs flake8 *.py'
sh -c '{[testenv]py_files} | xargs codespell *.py'
sh -c '{[testenv]rst_files} | xargs codespell *.rst'
sh -c '{[testenv]py_files} | xargs flake8'
sh -c '{[testenv]py_files} | xargs codespell'
sh -c '{[testenv]text_files} | xargs codespell'
check-manifest

0 comments on commit 43ae50a

Please sign in to comment.