Skip to content

Commit

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

[ci-skip]
  • Loading branch information
jensens authored Oct 4, 2023
2 parents 98bc4e7 + c629ab0 commit 9f35a4b
Show file tree
Hide file tree
Showing 97 changed files with 2,610 additions and 4,115 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_
# """
##
22 changes: 22 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
# See the inline comments on how to expand/tweak this configuration file
[flake8]
doctests = 1
ignore =
# black takes care of line length
E501,
# black takes care of where to break lines
W503,
# black takes care of spaces within slicing (list[:])
E203,
# black takes care of spaces after commas
E231,

##
# Add extra configuration options in .meta.toml:
# [flake8]
# extra_lines = """
# _your own configuration lines_
# """
##
62 changes: 62 additions & 0 deletions .github/workflows/meta.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# 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@main
test:
uses: plone/meta/.github/workflows/test.yml@main
with:
os-packages: 'wv'
coverage:
uses: plone/meta/.github/workflows/coverage.yml@main
with:
os-packages: 'wv'
dependencies:
uses: plone/meta/.github/workflows/dependencies.yml@main
release_ready:
uses: plone/meta/.github/workflows/release_ready.yml@main
circular:
uses: plone/meta/.github/workflows/circular.yml@main

##
# To modify the list of default jobs being created add in .meta.toml:
# [githb]
# jobs = [
# "qa",
# "test",
# "coverage",
# "dependencies",
# "release_ready",
# "circular",
# ]
##

##
# To request that some OS level dependencies get installed
# when running tests/coverage jobs, add in .meta.toml:
# [githb]
# os_dependencies = "git libxml2 libxslt"
##


##
# Specify additional jobs in .meta.toml:
# [github]
# extra_lines = """
# another:
# uses: org/repo/.github/workflows/file.yml@main
# """
##
56 changes: 49 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,51 @@
*.pyc
# 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
bin
lib
include
parts
eggs
develop-eggs
*.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
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_
# """
##
6 changes: 0 additions & 6 deletions .isort.cfg

This file was deleted.

24 changes: 24 additions & 0 deletions .meta.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# 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 = "5444602e"

[pyproject]
dependencies_mappings = [
"Pillow = ['PIL']",
]
dependencies_ignores = "['com.sun.star', 'pythoncom', 'pywintypes', 'textile', 'uno', 'unohelper', 'win32api', 'win32com']"
codespell_ignores = "transforme,nin,"

[pre_commit]
zpretty_extra_lines = """
exclude: tests/.*.html
"""
extra_lines = """
exclude: www/.*.zpt
"""

[github]
os_dependencies = "wv"
86 changes: 86 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
# 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

repos:
- repo: https://github.com/asottile/pyupgrade
rev: v3.4.0
hooks:
- id: pyupgrade
args: [--py38-plus]
- repo: https://github.com/pycqa/isort
rev: 5.12.0
hooks:
- id: isort
- repo: https://github.com/psf/black
rev: 23.3.0
hooks:
- id: black
- repo: https://github.com/collective/zpretty
rev: 3.1.0a2
hooks:
- id: zpretty
exclude: tests/.*.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:
- id: flake8

##
# Add extra configuration options in .meta.toml:
# [pre_commit]
# flake8_extra_lines = """
# _your own configuration lines_
# """
##
- repo: https://github.com/codespell-project/codespell
rev: v2.2.4
hooks:
- 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:
- id: check-manifest
- repo: https://github.com/regebro/pyroma
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
exclude: www/.*.zpt

##
# Add extra configuration options in .meta.toml:
# [pre_commit]
# extra_lines = """
# _your own configuration lines_
# """
##
22 changes: 11 additions & 11 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ Bug fixes:

Breaking changes:

- Fix and migrate safe_html filter completly into Plone registry and sync settings with TinyMCE.
- Fix and migrate safe_html filter completely into Plone registry and sync settings with TinyMCE.
Also some unused options in controlpanel where removed, like stripped_combinations and class_blacklist.
[MrTango]

Expand Down Expand Up @@ -352,7 +352,7 @@ Fixes:
transform
[gotcha]

- Handle charrefs & entityrefs in data and attributes equaly (unchanged)
- Handle charrefs & entityrefs in data and attributes equally (unchanged)
if converting to safe_html
[tom_gross]

Expand Down Expand Up @@ -668,7 +668,7 @@ http://plone.org/products/plone/security/advisories/CVE-2011-1949
Archetypes 1.4.2 (used for Plone 2.5.2) of PortalTransforms is then the 1.5
final.
We dont need increasing of release numbers because of Plone 3.0,
Archetypes 1.5, ... if theres no change in the dependen product, like
Archetypes 1.5, ... if there's no change in the dependen product, like
this one.
[jensens]

Expand Down Expand Up @@ -737,7 +737,7 @@ http://plone.org/products/plone/security/advisories/CVE-2011-1949
[csenger] [dreamcatcher]

* Removed CoUnInitialize call. According to Mark Hammond: The
right thing to do is call that function, although almost noone
right thing to do is call that function, although almost no one
does (including pywin32 itself, which does CoInitialize the main
thread) and I've never heard of problem caused by this
omission.
Expand Down Expand Up @@ -791,7 +791,7 @@ http://plone.org/products/plone/security/advisories/CVE-2011-1949
1.3.5-final02 - 2005-07-17
--------------------------

* changed version to stick to appropiate Archetypes Version.
* changed version to stick to appropriate Archetypes Version.
[yenzenz]

1.3.5-final - 2005-07-06
Expand Down Expand Up @@ -840,18 +840,18 @@ http://plone.org/products/plone/security/advisories/CVE-2011-1949
[tiran]

* Fixed [ 1121812 ] fix PortalTransforms unregisterTransformation()
unregisterTransformation() misses to remove from the zodb the persistance
wrapper added to the trasformation
unregisterTransformation() misses to remove from the zodb the persistence
wrapper added to the transformation
[dan_t]

* Fixed [ 1118739 ] popentransform does not work on windows
[duncanb]

* Fixed [ 1122175 ] extra indnt sytax error in office_uno.py
* Fixed [ 1122175 ] extra indnt syntax error in office_uno.py
[ryuuguu]

* fixed bug with some transformers' temp filename: it tried to use original
filename which is encoded in utf8 and may contrain invalid charset for my
filename which is encoded in utf8 and may constrain invalid charset for my
Windows server. Just use filename as: unknown.suffix
[panjunyong]

Expand All @@ -866,7 +866,7 @@ http://plone.org/products/plone/security/advisories/CVE-2011-1949

* Fixed [ 1041637 ] RichWidget: STX level should be set to 3 instead 1. The
structured text transform is now using the zope.conf option or has an
optional level paramenter in the convert method.
optional level parameter in the convert method.
[tiran]

* Added win32api.GetShortPathName to libtransforms/commandtransform
Expand Down Expand Up @@ -937,7 +937,7 @@ http://plone.org/products/plone/security/advisories/CVE-2011-1949
* cache.py: Added purgeCache, fixed has cache test.
[tiran]

* Fixed non critical typo in error message: Unvalid -> Invalid
* Fixed non critical typo in error message
[tiran]

1.3.0-3 - 2004-08-06
Expand Down
Loading

0 comments on commit 9f35a4b

Please sign in to comment.