Skip to content

Commit

Permalink
Merge pull request #63 from plone/config-with-default-template-83ebccc0
Browse files Browse the repository at this point in the history
Config with default template
[ci-skip]
  • Loading branch information
jensens committed Jun 23, 2023
2 parents 83ebccc + de063bd commit e63ba77
Show file tree
Hide file tree
Showing 9 changed files with 322 additions and 41 deletions.
14 changes: 14 additions & 0 deletions .editorconfig
@@ -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 @@ -32,8 +33,21 @@ indent_size = 4
# 2 space indentation
indent_size = 2

[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss,html}] # Frontend development
# 2 space indentation
indent_size = 2

[{Makefile,.gitmodules}]
# Tab indentation (no size specified, but view as 4 spaces)
indent_style = tab
indent_size = unset
tab_width = unset


##
# Add extra configuration options in .meta.toml:
# [editorconfig]
# extra_lines = """
# _your own configuration lines_
# """
##
17 changes: 8 additions & 9 deletions setup.cfg → .flake8
@@ -1,8 +1,6 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
[bdist_wheel]
universal = 0

# See the inline comments on how to expand/tweak this configuration file
[flake8]
doctests = 1
ignore =
Expand All @@ -15,9 +13,10 @@ ignore =
# black takes care of spaces after commas
E231,

[check-manifest]
ignore =
.editorconfig
.meta.toml
.pre-commit-config.yaml
tox.ini
##
# Add extra configuration options in .meta.toml:
# [flake8]
# extra_lines = """
# _your own configuration lines_
# """
##
28 changes: 28 additions & 0 deletions .github/workflows/meta.yml
@@ -0,0 +1,28 @@
# 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:
branches:
- master
- main
pull_request:
branches:
- master
- main
workflow_dispatch:

jobs:
qa:
uses: plone/meta/.github/workflows/qa.yml@master
test:
uses: plone/meta/.github/workflows/test.yml@master
coverage:
uses: plone/meta/.github/workflows/coverage.yml@master
dependencies:
uses: plone/meta/.github/workflows/dependencies.yml@master
release-ready:
uses: plone/meta/.github/workflows/release_ready.yml@master
circular:
uses: plone/meta/.github/workflows/circular.yml@master
55 changes: 45 additions & 10 deletions .gitignore
@@ -1,16 +1,51 @@
# 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
*.pyc
*.pyo
build
dist
bin/
lib/
include/
parts/
.installed.cfg

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

# venv / buildout related
bin/
develop-eggs/
eggs/
local/
pip-selfcheck.json
.eggs/
etc/
.installed.cfg
include/
lib/
lib64
.mr.developer.cfg
parts/
pyvenv.cfg
var/

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


##
# Add extra configuration options in .meta.toml:
# [gitignore]
# extra_lines = """
# _your own configuration lines_
# """
##
10 changes: 4 additions & 6 deletions .meta.toml
@@ -1,13 +1,11 @@
# 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 = "993150bc"
commit-id = "7723aeaf"

[codespell]
additional-ignores = "discreet"

[dependencies]
mappings = [
[pyproject]
dependencies_mappings = [
"beautifulsoup4 = ['bs4']",
]
34 changes: 34 additions & 0 deletions .pre-commit-config.yaml
@@ -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 All @@ -22,6 +23,14 @@ repos:
rev: 3.1.0a2
hooks:
- id: zpretty

##
# Add extra configuration options in .meta.toml:
# [pre_commit]
# zpretty_extra_lines = """
# _your own configuration lines_
# """
##
- repo: https://github.com/PyCQA/flake8
rev: 6.0.0
hooks:
Expand All @@ -32,6 +41,14 @@ repos:
- id: codespell
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 @@ -40,3 +57,20 @@ repos:
rev: "4.2"
hooks:
- id: pyroma
- repo: https://github.com/mgedmin/check-python-versions
rev: "0.21.2"
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/7723aeaf.internal
@@ -0,0 +1,2 @@
Update configuration files.
[plone devs]
86 changes: 77 additions & 9 deletions pyproject.toml
@@ -1,8 +1,9 @@
# 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]
filename = "CHANGES.rst"
directory = "news/"
filename = "CHANGES.rst"
title_format = "{version} ({project_date})"
underlines = ["-", ""]

Expand Down Expand Up @@ -43,24 +44,91 @@ profile = "plone"
target-version = ["py38"]

[tool.codespell]
ignore-words-list = "discreet"
ignore-words-list = "discreet,"
skip = "*.po,"
##
# Add extra configuration options in .meta.toml:
# [pyproject]
# codespell_ignores = "foo,bar"
# codespell_skip = "*.po,*.map,package-lock.json"
##

[tool.dependencychecker]
Zope = [
# Zope own provided namespaces
'App', 'OFS', 'Products.Five', 'Products.OFSP', 'Products.PageTemplates',
'Products.SiteAccess', 'Shared', 'Testing', 'ZPublisher', 'ZTUtils',
'Zope2', 'webdav', 'zmi',
# ExtensionClass own provided namespaces
'ExtensionClass', 'ComputedAttribute', 'MethodObject',
# Zope dependencies
'Acquisition', 'DateTime', 'transaction', 'zExceptions', 'ZODB', 'zope.component',
'zope.configuration', 'zope.container', 'zope.deferredimport', 'zope.event',
'zope.exceptions', 'zope.globalrequest', 'zope.i18n', 'zope.i18nmessageid',
'zope.interface', 'zope.lifecycleevent', 'zope.location', 'zope.publisher',
'zope.schema', 'zope.security', 'zope.site', 'zope.traversing', 'AccessControl',
'AccessControl', 'Acquisition', 'AuthEncoding', 'beautifulsoup4', 'BTrees',
'cffi', 'Chameleon', 'DateTime', 'DocumentTemplate',
'MultiMapping', 'multipart', 'PasteDeploy', 'Persistence', 'persistent',
'pycparser', 'python-gettext', 'pytz', 'RestrictedPython', 'roman',
'soupsieve', 'transaction', 'waitress', 'WebOb', 'WebTest', 'WSGIProxy2',
'z3c.pt', 'zc.lockfile', 'ZConfig', 'zExceptions', 'ZODB', 'zodbpickle',
'zope.annotation', 'zope.browser', 'zope.browsermenu', 'zope.browserpage',
'zope.browserresource', 'zope.cachedescriptors', 'zope.component',
'zope.configuration', 'zope.container', 'zope.contentprovider',
'zope.contenttype', 'zope.datetime', 'zope.deferredimport',
'zope.deprecation', 'zope.dottedname', 'zope.event', 'zope.exceptions',
'zope.filerepresentation', 'zope.globalrequest', 'zope.hookable',
'zope.i18n', 'zope.i18nmessageid', 'zope.interface', 'zope.lifecycleevent',
'zope.location', 'zope.pagetemplate', 'zope.processlifetime', 'zope.proxy',
'zope.ptresource', 'zope.publisher', 'zope.schema', 'zope.security',
'zope.sequencesort', 'zope.site', 'zope.size', 'zope.structuredtext',
'zope.tal', 'zope.tales', 'zope.testbrowser', 'zope.testing',
'zope.traversing', 'zope.viewlet'
]
'Products.CMFCore' = [
'docutils', 'five.localsitemanager', 'Missing', 'Products.BTreeFolder2',
'Products.GenericSetup', 'Products.MailHost', 'Products.PythonScripts',
'Products.StandardCacheManagers', 'Products.ZCatalog', 'Record',
'zope.sendmail', 'Zope'
]
'plone.base' = [
'AccessControl', 'Products.BTreeFolder2', 'Products.CMFCore',
'Products.CMFDynamicViewFTI', 'zope.deprecation',
'plone.batching', 'plone.registry', 'plone.schema','plone.z3cform',
'Products.CMFCore', 'Products.CMFDynamicViewFTI',
]
python-dateutil = ['dateutil']
beautifulsoup4 = ['bs4']

##
# 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",

]
##
# 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_
# """
##

0 comments on commit e63ba77

Please sign in to comment.