Skip to content

Commit

Permalink
Configuring with plone/meta, remove setup.cfg
Browse files Browse the repository at this point in the history
  • Loading branch information
mauritsvanrees committed Jun 2, 2023
1 parent 53836bd commit 14e2d36
Show file tree
Hide file tree
Showing 9 changed files with 174 additions and 42 deletions.
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
# See the inline comments on how to expand/tweak this configuration file
#
# EditorConfig Configuration file, for more details see:
# http://EditorConfig.org
Expand Down Expand Up @@ -37,3 +38,12 @@ indent_size = 2
indent_style = tab
indent_size = unset
tab_width = unset


##
# Add extra configuration options in .meta.toml:
# [editorconfig]
# extra_lines = """
# _your own configuration lines_
# """
##
14 changes: 1 addition & 13 deletions setup.cfg → .flake8
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
# See the inline comments on how to expand/tweak this configuration file
[flake8]
doctests = 1
ignore =
Expand All @@ -11,16 +12,3 @@ ignore =
E203,
# black takes care of spaces after commas
E231,

[check-manifest]
ignore =
.editorconfig
.meta.toml
.pre-commit-config.yaml
tox.ini
.tox
constraints-mxdev.txt
instance.yaml
Makefile
mx.ini
requirements-mxdev.txt
1 change: 1 addition & 0 deletions .github/workflows/meta.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
# See the inline comments on how to expand/tweak this configuration file
name: Meta
on:
push:
Expand Down
50 changes: 40 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,19 +1,49 @@
*~
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
# See the inline comments on how to expand/tweak this configuration file
# python related
*.egg-info
*.mo
*.pyc
.installed.cfg
*.pyo

# tools related
build/
.coverage
coverage.xml
dist/
docs/_build
__pycache__/
.tox
.vscode/

# venv / buildout related
bin/
develop-eggs/
downloads/
eggs/
include/
instance/
.eggs/
etc/
.installed.cfg
lib/
lib64
.mr.developer.cfg
parts/
pyvenv.cfg
var/
# Tox
.tox

# mxdev
constraints-mxdev.txt
requirements-mxdev.txt
/instance/
/.make-sentinels/
/*-mxdev.txt
/reports/
/sources/
/venv/
.installed.txt


##
# Add extra configuration options in .meta.toml:
# [pre_commit]
# extra_lines = """
# _your own configuration lines_
# """
##
26 changes: 11 additions & 15 deletions .meta.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
# See the inline comments on how to expand/tweak this configuration file
[meta]
template = "default"
commit-id = "fb4615d7"
commit-id = "e08b1234"

[dependencies]
ignores = "['zope.dublincore']"

[setup]
check_manifest_ignore = """
.tox
constraints-mxdev.txt
instance.yaml
Makefile
mx.ini
requirements-mxdev.txt
[pyproject]
check_manifest_ignores = """
".tox",
"constraints-mxdev.txt",
"instance.yaml",
"Makefile",
"requirements-mxdev.txt",
"""

[codespell]
additional-ignores = "ordner"
codespell_ignores = "ordner"
dependencies_ignores = "['zope.dublincore']"
20 changes: 20 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
# See the inline comments on how to expand/tweak this configuration file
ci:
autofix_prs: false
autoupdate_schedule: monthly
Expand Down Expand Up @@ -33,6 +34,13 @@ repos:
additional_dependencies:
- tomli

##
# Add extra configuration options in .meta.toml:
# [pre_commit]
# codespell_extra_lines = """
# _your own configuration lines_
# """
##
- repo: https://github.com/mgedmin/check-manifest
rev: "0.49"
hooks:
Expand All @@ -46,3 +54,15 @@ repos:
hooks:
- id: check-python-versions
args: ['--only', 'setup.py,pyproject.toml']
- repo: https://github.com/collective/i18ndude
rev: "6.0.0"
hooks:
- id: i18ndude

##
# Add extra configuration options in .meta.toml:
# [pre_commit]
# extra_lines = """
# _your own configuration lines_
# """
##
2 changes: 2 additions & 0 deletions news/e08b1234.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update configuration files.
[plone devs]
51 changes: 51 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
# See the inline comments on how to expand/tweak this configuration file
[tool.towncrier]
directory = "news/"
filename = "CHANGES.md"
Expand Down Expand Up @@ -47,6 +48,12 @@ target-version = ["py38"]
[tool.codespell]
ignore-words-list = "discreet,ordner"
skip = "*.po,"
##
# Add extra configuration options in .meta.toml:
# [pyproject]
# codespell_ignores = "foo,bar"
# codespell_skip = "*.po,*.map,package-lock.json"
##

[tool.dependencychecker]
Zope = [
Expand Down Expand Up @@ -88,3 +95,47 @@ Zope = [
]
python-dateutil = ['dateutil']
ignore-packages = ['zope.dublincore']

##
# Add extra configuration options in .meta.toml:
# [pyproject]
# dependencies_ignores = "['zestreleaser.towncrier']"
# dependencies_mappings = [
# "gitpython = ['git']",
# "pygithub = ['github']",
# ]
# """
##

[tool.check-manifest]
ignore = [
".editorconfig",
".meta.toml",
".pre-commit-config.yaml",
"tox.ini",
".flake8",
"mx.ini",
".tox",
"constraints-mxdev.txt",
"instance.yaml",
"Makefile",
"requirements-mxdev.txt",

]
##
# Add extra configuration options in .meta.toml:
# [pyproject]
# check_manifest_ignores = """
# "*.map.js",
# "*.pyc",
# """
##


##
# Add extra configuration options in .meta.toml:
# [pyproject]
# extra_lines = """
# _your own configuration lines_
# """
##
42 changes: 38 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
# See the inline comments on how to expand/tweak this configuration file
[tox]
# We need 4.4.0 for constrain_package_deps.
min_version = 4.4.0
Expand All @@ -9,6 +10,27 @@ envlist =
dependencies


##
# Add extra configuration options in .meta.toml:
# [tox]
# envlist_lines = """
# my_other_environment
# """
# config_lines = """
# my_extra_top_level_tox_configuration_lines
# """
##

[testenv]
skip_install = true
allowlist_externals =
echo
false
# Make sure typos like `tox -e formaat` are caught instead of silently doing nothing.
# See https://github.com/tox-dev/tox/issues/2858.
commands =
echo "Unrecognized environment name {envname}"
false

[testenv:format]
description = automatically reformat code
Expand Down Expand Up @@ -40,7 +62,8 @@ commands =
dependencychecker

[testenv:dependencies-graph]
description = generate a graph out of the package's dependencies
description = generate a graph out of the dependencies of the package
skip_install = false
allowlist_externals =
sh
deps =
Expand All @@ -52,6 +75,7 @@ commands =
[testenv:test]
description = run the distribution tests
use_develop = true
skip_install = false
constrain_package_deps = true
set_env = ROBOT_BROWSER=headlesschrome
deps =
Expand All @@ -65,14 +89,15 @@ extras =
[testenv:coverage]
description = get a test coverage report
use_develop = true
skip_install = false
constrain_package_deps = true
set_env = ROBOT_BROWSER=headlesschrome
deps =
coverage
zope.testrunner
-c https://dist.plone.org/release/6.0-dev/constraints.txt
commands =
coverage run {envbindir}/zope-testrunner --quiet --all --test-path={toxinidir} -s plone.app.caching {posargs}
coverage run --source plone.app.caching {envbindir}/zope-testrunner --quiet --all --test-path={toxinidir} -s plone.app.caching {posargs}
coverage report -m --format markdown
extras =
test
Expand All @@ -93,10 +118,10 @@ commands =
python -m build --sdist --no-isolation
twine check dist/*

[testenv:circular]
description = ensure there are no cyclic dependencies
usedevelop = true
use_develop = true
skip_install = false
allowlist_externals =
sh
deps =
Expand All @@ -110,3 +135,12 @@ commands =
pipforester -i forest.json -o forest.dot --cycles
# Report if there are any circular dependencies, i.e. error if there are any
pipforester -i forest.json --check-cycles


##
# Add extra configuration options in .meta.toml:
# [tox]
# extra_lines = """
# my_other_environment
# """
##

0 comments on commit 14e2d36

Please sign in to comment.