Skip to content

Commit

Permalink
Merge pull request #127 from plone/config-with-default-template-924f379b
Browse files Browse the repository at this point in the history
Config with default template

[ci skip]
  • Loading branch information
mauritsvanrees authored Jun 8, 2023
2 parents 94d670f + d71efa5 commit 54a485e
Show file tree
Hide file tree
Showing 9 changed files with 316 additions and 50 deletions.
14 changes: 14 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 @@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
74 changes: 49 additions & 25 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,26 +1,50 @@
/develop-eggs
/eggs
/fake-eggs
/bin
/parts
/downloads
/var
/build
/dist
/local.cfg
/*.egg-info
/.installed.cfg
# 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
/.Python
/include
/lib
/.project
/.pydevproject
/.mr.developer.cfg
/src/plone*
/src/collective*
*.mo
docs/Makefile
docs/make.bat
docs/doctrees
docs/html
*.pyo

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

# venv / buildout related
bin/
develop-eggs/
eggs/
.eggs/
etc/
.installed.cfg
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_
# """
##
8 changes: 7 additions & 1 deletion .meta.toml
Original file line number Diff line number Diff line change
@@ -1,5 +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 = "a533099d"
commit-id = "dd37b9f9"

[pyproject]
dependencies_mappings = [
"'Products.ZCatalog' = ['Products.ZCTextIndex']",
]
26 changes: 26 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 @@ -32,6 +33,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 +49,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/dd37b9f9.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update configuration files.
[plone devs]
87 changes: 79 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -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 @@ -42,22 +43,92 @@ profile = "plone"
[tool.black]
target-version = ["py38"]

[tool.codespell]
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']
'Products.ZCatalog' = ['Products.ZCTextIndex']

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

0 comments on commit 54a485e

Please sign in to comment.