Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Config with default template 4eba7476 #3776

Draft
wants to merge 22 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 15 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
39 changes: 39 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
#
# EditorConfig Configuration file, for more details see:
# http://EditorConfig.org
# EditorConfig is a convention description, that could be interpreted
# by multiple editors to enforce common coding conventions for specific
# file types

# top-most EditorConfig file:
# Will ignore other EditorConfig files in Home directory or upper tree level.
root = true


[*] # For All Files
# Unix-style newlines with a newline ending every file
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
# Set default charset
charset = utf-8
# Indent style default
indent_style = space
# Max Line Length - a hard line wrap, should be disabled
max_line_length = off

[*.{py,cfg,ini}]
# 4 space indentation
indent_size = 4

[*.{yml,zpt,pt,dtml,zcml}]
# 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
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/Bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The best reproductions are in plain Plone installations without addons or at lea

### What I did:

<!-- Please a reproducable description, including preconditions. -->
<!-- Please a reproducible description, including preconditions. -->

### What I expect to happen:

Expand Down
5 changes: 5 additions & 0 deletions .meta.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
[meta]
template = "default"
commit-id = "2a5f5557"
42 changes: 42 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
ci:
autofix_prs: false
autoupdate_schedule: monthly

repos:
- repo: https://github.com/asottile/pyupgrade
rev: v3.3.2
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.0.4
hooks:
- id: zpretty
- repo: https://github.com/PyCQA/flake8
rev: 6.0.0
hooks:
- id: flake8
- repo: https://github.com/codespell-project/codespell
rev: v2.2.4
hooks:
- id: codespell
additional_dependencies:
- tomli
- 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
12 changes: 6 additions & 6 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,11 @@
[rohnsha0] (#3600)
- Fix visual issue with long action name in @@actions-controlpanel.
[petschki] (#3601)
- Fixed an error where Main Template (line: 42) referenced plone.com istead of plone.org
- Fixed an error where Main Template (line: 42) referenced plone.com instead of plone.org
[rohnsha0] (#3605)
- In traversal.py remove a Zope 4 BBB code, add a comment about bundle traverser and apply black.isort on the file.
[jensens] (#3609)
- Supress warning of intentional deprecated import for BBB.
- Suppress warning of intentional deprecated import for BBB.
[jensens] (#3610)
- Use plone.base and reduce deprecation warnings.
In utils remove functions already moved to plone.base and add deferred import with message.
Expand Down Expand Up @@ -308,7 +308,7 @@
### Breaking changes:


- Remove Archtypes specific ``isIDAutoGenerated`` helper.
- Remove Archetypes specific ``isIDAutoGenerated`` helper.
This was dead code not used anywhere in Plone 6.
[jensens] (#3487)
- ``PloneFolder`` was once used with early Archetypes.
Expand Down Expand Up @@ -478,7 +478,7 @@
[pbauer] (#3463)
- Add missing i18n:translate tags
[erral] (#3467)
- Remove obsolte combine_bundles and related code.
- Remove obsolete combine_bundles and related code.
[pbauer] (#3468)
- Enhanced folder_contents robot tests
[petschki] (#3478)
Expand Down Expand Up @@ -544,7 +544,7 @@
- Fix #3323DX-Site-Root: ZMI Nav-Tree is no longer expandable.
[jensens] (#3323)
- Fixes #3337:
Remove dead code that wont work in Py 3 anyway if called (cmp).
Remove dead code that won't work in Py 3 anyway if called (cmp).
[jensens] (#3337)
- Remove DYNAMIC_CONTENT from translation files
[erral] (#3342)
Expand Down Expand Up @@ -648,7 +648,7 @@


- Custom date format strings from registry can be in the ``${}`` format as in the locales files.
If theres a day or month name used, this will be translated.
If there's a day or month name used, this will be translated.
For bbb the classic strftime ``%`` strings are still behaving like before.
[jensens] (#3084)
- Add icon resolver to return url or tag for given icon.
Expand Down
1 change: 0 additions & 1 deletion Products/CMFPlone/ActionsTool.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@


class ActionsTool(PloneBaseTool, BaseTool):

meta_type = "Plone Actions Tool"
toolicon = "skins/plone_images/confirm_icon.png"

Expand Down
Loading