Skip to content

Commit

Permalink
Merge pull request #35 from plone/config-with-default-template-99f0bf32
Browse files Browse the repository at this point in the history
Config with default template
  • Loading branch information
mauritsvanrees authored Jun 8, 2023
2 parents dd274ce + 8024bf1 commit 29c4189
Show file tree
Hide file tree
Showing 10 changed files with 267 additions and 19 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_
# """
##
11 changes: 1 addition & 10 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 @@ -14,10 +12,3 @@ ignore =
E203,
# black takes care of spaces after commas
E231,

[check-manifest]
ignore =
.editorconfig
.meta.toml
.pre-commit-config.yaml
tox.ini
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
52 changes: 50 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,50 @@
*.py?
plone.resource.egg-info/
# 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_
# """
##
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 = "2a4ba395"
commit-id = "c73a9bf7"

[pre_commit]
zpretty_extra_lines = """
exclude: test.html
"""
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 @@ -23,6 +24,14 @@ repos:
hooks:
- id: zpretty
exclude: test.html

##
# 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 @@ -33,6 +42,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 @@ -41,3 +58,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/047ec50d.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update configuration files.
[plone devs]
51 changes: 50 additions & 1 deletion 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,15 @@ 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 = [
Expand Down Expand Up @@ -82,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_
# """
##
8 changes: 7 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from pathlib import Path
from setuptools import find_packages
from setuptools import setup

Expand All @@ -9,11 +10,16 @@
"plone.testing",
]

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

setup(
name="plone.resource",
version=version,
description="Static files for Plone",
long_description=(open("README.rst").read() + "\n" + open("CHANGES.rst").read()),
long_description=long_description,
long_description_content_type="text/x-rst",
classifiers=[
"Development Status :: 5 - Production/Stable",
"Framework :: Plone",
Expand Down
Loading

0 comments on commit 29c4189

Please sign in to comment.