Merge pull request #15 from plone/config-with-default-template-3ea02c34

Config with default template

.editorconfig

@@ -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
@@ -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_
+#  """
+##

setup.cfg → .flake8

@@ -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 =
@@ -15,9 +13,10 @@ ignore =
     # black takes care of spaces after commas
     E231,
 
-[check-manifest]
-ignore =
-    .editorconfig
-    .meta.toml
-    tox.ini
-    lint-requirements.txt
+##
+# Add extra configuration options in .meta.toml:
+#  [flake8]
+#  extra_lines = """
+#  _your own configuration lines_
+#  """
+##

.github/workflows/meta.yml

@@ -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@main
+  test:
+    uses: plone/meta/.github/workflows/test.yml@main
+  coverage:
+    uses: plone/meta/.github/workflows/coverage.yml@main
+  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

.gitignore

@@ -1,13 +1,51 @@
-*.py[co]
-/borg.localrole.egg-info/
-*.mo
-build
-dist
-.project
-.pydevproject
-.settings
+# 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
-/bin
-/develop-eggs
-/parts
-*.bak
+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_
+#  """
+##

.meta.toml

@@ -1,10 +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 = "68486a87"
-
-[dependencies]
-mappings = [
-    "Zope = ['Products.PageTemplates', 'ZPublisher', ]",
-    ]
+commit-id = "cfffba8c"

.pre-commit-config.yaml

@@ -0,0 +1,84 @@
+# 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
+
+##
+# 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
+
+##
+# Add extra configuration options in .meta.toml:
+#  [pre_commit]
+#  extra_lines = """
+#  _your own configuration lines_
+#  """
+##

borg/localrole/setuphandlers.py

@@ -2,7 +2,6 @@
 
 
 def importVarious(context):
-
     if context.readDataFile("borg.localrole_various.txt") is None:
         return
 

borg/localrole/tests.py

@@ -7,7 +7,6 @@
 
 import borg.localrole
 import doctest
-import re
 import unittest
 
 

borg/localrole/zmi/WorkspaceLocalRoleManagerForm.pt

@@ -1,33 +1,50 @@
 <h1 tal:replace="structure here/manage_page_header">Header</h1>
 
-<h2 tal:define="form_title string:Add Workspace Local Role Manager"
-      tal:replace="structure here/manage_form_title">Form Title</h2>
+<h2 tal:define="
+      form_title string:Add Workspace Local Role Manager;
+    "
+    tal:replace="structure here/manage_form_title"
+>Form Title</h2>
 
-  <p class="form-help">
+<p class="form-help"
+   i18n:ignore="true"
+>
   Install a Workspace local role manager. This plugin will enable
   workspaces to provide the correct local rules for users assigned
   to that workspace.
-  </p>
+</p>
 
-<form action="manage_addWorkspaceLocalRoleManager" method="POST">
+<form action="manage_addWorkspaceLocalRoleManager"
+      method="POST"
+>
   <table>
     <tr>
-      <td class="form-label">Id</td>
-      <td><input type="text" name="id"/></td>
+      <td class="form-label"
+          i18n:ignore="true"
+      >Id</td>
+      <td><input name="id"
+               type="text"
+        /></td>
     </tr>
     <tr>
-      <td class="form-label">Title</td>
-      <td><input type="text" name="Title"/></td>
+      <td class="form-label"
+          i18n:ignore="true"
+      >Title</td>
+      <td><input name="Title"
+               type="text"
+        /></td>
     </tr>
     <tr>
       <td colspan="2">
         <div class="form-element">
-          <input type="submit" value="Add local role manager"/>
+          <input type="submit"
+                 value="Add local role manager"
+                 i18n:ignore-attributes="value"
+          />
         </div>
       </td>
     </tr>
   </table>
 </form>
 
 <h1 tal:replace="structure here/manage_page_footer">Footer</h1>
-

news/cfffba8c.internal

@@ -0,0 +1,2 @@
+Update configuration files.
+[plone devs]