Skip to content

Commit

Permalink
Merge pull request #10 from plone/config-with-default-template-8d2ada0e
Browse files Browse the repository at this point in the history
Config with default template

[ci-skip]
  • Loading branch information
gforcada committed Jun 16, 2023
2 parents 8d2ada0 + 466ecda commit 7473145
Show file tree
Hide file tree
Showing 10 changed files with 291 additions and 21 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
50 changes: 50 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# 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

# 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_
# """
##
3 changes: 2 additions & 1 deletion .meta.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
[meta]
template = "default"
commit-id = "2ed8f544"
commit-id = "237ff4c8"
34 changes: 34 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 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/237ff4c8.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update configuration files.
[plone devs]
54 changes: 52 additions & 2 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,6 +43,16 @@ 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
Expand All @@ -54,7 +65,7 @@ Zope = [
'AccessControl', 'Acquisition', 'AuthEncoding', 'beautifulsoup4', 'BTrees',
'cffi', 'Chameleon', 'DateTime', 'DocumentTemplate',
'MultiMapping', 'multipart', 'PasteDeploy', 'Persistence', 'persistent',
'pycparser', 'python-gettext', 'pytz', 'RestrictedPython', 'roman', 'six',
'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',
Expand All @@ -81,3 +92,42 @@ Zope = [
'Products.CMFCore', 'Products.CMFDynamicViewFTI',
]
python-dateutil = ['dateutil']

##
# 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_
# """
##
6 changes: 5 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
from pathlib import Path
from setuptools import find_packages
from setuptools import setup


version = "2.0.1.dev0"

long_description = open("README.rst").read() + "\n" + open("CHANGES.rst").read() + "\n"
long_description = (
f"{Path('README.rst').read_text()}\n{Path('CHANGES.rst').read_text()}"
)

setup(
name="plone.uuid",
version=version,
description="UUIDs for content items",
long_description=long_description,
long_description_content_type="text/x-rst",
# Get more strings from
# https://pypi.org/classifiers/
classifiers=[
Expand Down
Loading

0 comments on commit 7473145

Please sign in to comment.