Skip to content

Commit 162ea9e

Browse files
gforcadagforcada
authored
Merge pull request #28 from collective/config-with-default-template-2.0.1.dev0
Config with default template 2.0.1.dev0
2 parents bd6a4de + 469689c commit 162ea9e

File tree

21 files changed

+703
-93
lines changed

21 files changed

+703
-93
lines changed

‎.editorconfig‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Generated from:
2+
# https://github.com/plone/meta/tree/main/src/plone/meta/default
3+
# See the inline comments on how to expand/tweak this configuration file
4+
#
5+
# EditorConfig Configuration file, for more details see:
6+
# http://EditorConfig.org
7+
# EditorConfig is a convention description, that could be interpreted
8+
# by multiple editors to enforce common coding conventions for specific
9+
# file types
10+
11+
# top-most EditorConfig file:
12+
# Will ignore other EditorConfig files in Home directory or upper tree level.
13+
root = true
14+
15+
16+
[*]
17+
# Default settings for all files.
18+
# Unix-style newlines with a newline ending every file
19+
end_of_line = lf
20+
insert_final_newline = true
21+
trim_trailing_whitespace = true
22+
# Set default charset
23+
charset = utf-8
24+
# Indent style default
25+
indent_style = space
26+
# Max Line Length - a hard line wrap, should be disabled
27+
max_line_length = off
28+
29+
[*.{py,cfg,ini}]
30+
# 4 space indentation
31+
indent_size = 4
32+
33+
[*.{yml,zpt,pt,dtml,zcml,html,xml}]
34+
# 2 space indentation
35+
indent_size = 2
36+
37+
[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss}]
38+
# Frontend development
39+
# 2 space indentation
40+
indent_size = 2
41+
max_line_length = 80
42+
43+
[{Makefile,.gitmodules}]
44+
# Tab indentation (no size specified, but view as 4 spaces)
45+
indent_style = tab
46+
indent_size = unset
47+
tab_width = unset
48+
49+
50+
##
51+
# Add extra configuration options in .meta.toml:
52+
# [editorconfig]
53+
# extra_lines = """
54+
# _your own configuration lines_
55+
# """
56+
##

‎.flake8‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Generated from:
2+
# https://github.com/plone/meta/tree/main/src/plone/meta/default
3+
# See the inline comments on how to expand/tweak this configuration file
4+
[flake8]
5+
doctests = 1
6+
ignore =
7+
# black takes care of line length
8+
E501,
9+
# black takes care of where to break lines
10+
W503,
11+
# black takes care of spaces within slicing (list[:])
12+
E203,
13+
# black takes care of spaces after commas
14+
E231,
15+
16+
##
17+
# Add extra configuration options in .meta.toml:
18+
# [flake8]
19+
# extra_lines = """
20+
# _your own configuration lines_
21+
# """
22+
##

‎.github/dependabot.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Generated from:
2+
# https://github.com/plone/meta/tree/main/src/plone/meta/default
3+
# See the inline comments on how to expand/tweak this configuration file
4+
version: 2
5+
updates:
6+
7+
- package-ecosystem: "github-actions"
8+
directory: "/"
9+
schedule:
10+
# Check for updates to GitHub Actions every week
11+
interval: "weekly"

‎.github/workflows/meta.yml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Generated from:
2+
# https://github.com/plone/meta/tree/main/src/plone/meta/default
3+
# See the inline comments on how to expand/tweak this configuration file
4+
name: Meta
5+
on:
6+
push:
7+
branches:
8+
- master
9+
- main
10+
pull_request:
11+
branches:
12+
- master
13+
- main
14+
workflow_dispatch:
15+
16+
##
17+
# To set environment variables for all jobs, add in .meta.toml:
18+
# [github]
19+
# env = """
20+
# debug: 1
21+
# image-name: 'org/image'
22+
# image-tag: 'latest'
23+
# """
24+
##
25+
26+
jobs:
27+
qa:
28+
uses: plone/meta/.github/workflows/[email protected]
29+
dependencies:
30+
uses: plone/meta/.github/workflows/[email protected]
31+
release_ready:
32+
uses: plone/meta/.github/workflows/[email protected]
33+
circular:
34+
uses: plone/meta/.github/workflows/[email protected]
35+
36+
##
37+
# To modify the list of default jobs being created add in .meta.toml:
38+
# [github]
39+
# jobs = [
40+
# "qa",
41+
# "coverage",
42+
# "dependencies",
43+
# "release_ready",
44+
# "circular",
45+
# ]
46+
##
47+
48+
##
49+
# To request that some OS level dependencies get installed
50+
# when running tests/coverage jobs, add in .meta.toml:
51+
# [github]
52+
# os_dependencies = "git libxml2 libxslt"
53+
##
54+
55+
56+
##
57+
# Specify additional jobs in .meta.toml:
58+
# [github]
59+
# extra_lines = """
60+
# another:
61+
# uses: org/repo/.github/workflows/file.yml@main
62+
# """
63+
##

‎.gitignore‎

Lines changed: 55 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,58 @@
1+
# Generated from:
2+
# https://github.com/plone/meta/tree/main/src/plone/meta/default
3+
# See the inline comments on how to expand/tweak this configuration file
4+
# python related
15
*.egg-info
26
*.pyc
7+
*.pyo
8+
9+
# translation related
310
*.mo
4-
*.swp
5-
.DS_Store
6-
__pycache__
7-
*.idea
11+
12+
# tools related
13+
build/
14+
.coverage
15+
.*project
16+
coverage.xml
17+
dist/
18+
docs/_build
19+
__pycache__/
20+
.tox
21+
.vscode/
22+
node_modules/
23+
forest.dot
24+
forest.json
25+
26+
# venv / buildout related
27+
bin/
28+
develop-eggs/
29+
eggs/
30+
.eggs/
31+
etc/
32+
.installed.cfg
33+
include/
34+
lib/
35+
lib64
36+
.mr.developer.cfg
37+
parts/
38+
pyvenv.cfg
39+
var/
40+
local.cfg
41+
42+
# mxdev
43+
/instance/
44+
/.make-sentinels/
45+
/*-mxdev.txt
46+
/reports/
47+
/sources/
48+
/venv/
49+
.installed.txt
50+
51+
52+
##
53+
# Add extra configuration options in .meta.toml:
54+
# [gitignore]
55+
# extra_lines = """
56+
# _your own configuration lines_
57+
# """
58+
##

‎.meta.toml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Generated from:
2+
# https://github.com/plone/meta/tree/main/src/plone/meta/default
3+
# See the inline comments on how to expand/tweak this configuration file
4+
[meta]
5+
template = "default"
6+
commit-id = "2.2.3.dev0"
7+
8+
[github]
9+
jobs = [
10+
"qa",
11+
"dependencies",
12+
"release_ready",
13+
"circular",
14+
]

‎.pre-commit-config.yaml‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
# Generated from:
2+
# https://github.com/plone/meta/tree/main/src/plone/meta/default
3+
# See the inline comments on how to expand/tweak this configuration file
4+
ci:
5+
autofix_prs: false
6+
autoupdate_schedule: monthly
7+
8+
repos:
9+
- repo: https://github.com/asottile/pyupgrade
10+
rev: v3.21.0
11+
hooks:
12+
- id: pyupgrade
13+
args: [--py38-plus]
14+
- repo: https://github.com/pycqa/isort
15+
rev: 7.0.0
16+
hooks:
17+
- id: isort
18+
- repo: https://github.com/psf/black-pre-commit-mirror
19+
rev: 25.9.0
20+
hooks:
21+
- id: black
22+
- repo: https://github.com/collective/zpretty
23+
rev: 3.1.1
24+
hooks:
25+
- id: zpretty
26+
27+
##
28+
# Add extra configuration options in .meta.toml:
29+
# [pre_commit]
30+
# zpretty_extra_lines = """
31+
# _your own configuration lines_
32+
# """
33+
##
34+
- repo: https://github.com/PyCQA/flake8
35+
rev: 7.3.0
36+
hooks:
37+
- id: flake8
38+
39+
##
40+
# Add extra configuration options in .meta.toml:
41+
# [pre_commit]
42+
# flake8_extra_lines = """
43+
# _your own configuration lines_
44+
# """
45+
##
46+
- repo: https://github.com/codespell-project/codespell
47+
rev: v2.4.1
48+
hooks:
49+
- id: codespell
50+
additional_dependencies:
51+
- tomli
52+
53+
##
54+
# Add extra configuration options in .meta.toml:
55+
# [pre_commit]
56+
# codespell_extra_lines = """
57+
# _your own configuration lines_
58+
# """
59+
##
60+
- repo: https://github.com/mgedmin/check-manifest
61+
rev: "0.51"
62+
hooks:
63+
- id: check-manifest
64+
- repo: https://github.com/regebro/pyroma
65+
rev: "5.0"
66+
hooks:
67+
- id: pyroma
68+
- repo: https://github.com/mgedmin/check-python-versions
69+
rev: "0.23.0"
70+
hooks:
71+
- id: check-python-versions
72+
args: ['--only', 'setup.py,pyproject.toml']
73+
- repo: https://github.com/collective/i18ndude
74+
rev: "6.2.1"
75+
hooks:
76+
- id: i18ndude
77+
78+
79+
##
80+
# Add extra configuration options in .meta.toml:
81+
# [pre_commit]
82+
# i18ndude_extra_lines = """
83+
# _your own configuration lines_
84+
# """
85+
##
86+
87+
88+
##
89+
# Add extra configuration options in .meta.toml:
90+
# [pre_commit]
91+
# extra_lines = """
92+
# _your own configuration lines_
93+
# """
94+
##

‎CHANGES.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Changelog
2424
0.3.0 (2022-10-06)
2525
------------------
2626

27-
- Add enviroment var to disable sentry integration. [krissik]
27+
- Add environment var to disable sentry integration. [krissik]
2828

2929

3030
0.2.6 (2022-07-28)
@@ -35,7 +35,7 @@ Changelog
3535
0.2.5 (2022/07/26)
3636
------------------
3737

38-
- Add optional environment parameter for Sentry integrations ("SENTRY_INTEGRATIONS", comma seperated list)
38+
- Add optional environment parameter for Sentry integrations ("SENTRY_INTEGRATIONS", comma separated list)
3939
[2silver]
4040
- Ensure all exceptions which should be ignored are actually ignored before sending them.
4141
[thomasmassmann]

‎MANIFEST.in‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
global-exclude *pyc
2-
include *.cfg *.rst *.in *.txt *.md
1+
include *.rst *.txt *.md
2+
graft docs *
3+
graft src
34

5+
global-exclude *pyc
6+
recursive-exclude news *
47
recursive exclude __pycache__ *.pyc
5-
recursive-include docs *
6-
recursive-include collective *

‎README.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ environment variable `SENTRY_PROJECT`. This allows you introduce an additional
3333
tag for filtering, if needed.
3434

3535

36-
Set `SENTRY_ENVIRONMENT` to differentiate between environments e.g. staging vs production
36+
Set `SENTRY_ENVIRONMENT` to differentiate between environments e.g. staging vs production
3737
(https://docs.sentry.io/enriching-error-data/environments/)
3838

3939
Set `SENTRY_RELEASE` to sent release information to sentry. (https://docs.sentry.io/workflow/releases/)
4040

41-
Set ´SENTRY_INTEGRATIONS` (comma seperated) for different Integrations. (https://docs.sentry.io/platforms/python/configuration/integrations/)
41+
Set `SENTRY_INTEGRATIONS` (comma separated) for different Integrations. (https://docs.sentry.io/platforms/python/configuration/integrations/)
4242

4343
Optional activation
4444
---------------------

0 commit comments

Comments
 (0)