Merge pull request #99 from plone/config-with-default-template-f81c1b30

Config with default template
plone · Mar 7, 2023 · 6182d47 · 6182d47
2 parents f81c1b3 + 75c72b4
commit 6182d47
Show file tree

Hide file tree

Showing 27 changed files with 356 additions and 254 deletions.
diff --git a/.meta.toml b/.meta.toml
@@ -2,7 +2,7 @@
 # https://github.com/plone/meta/tree/master/config/default
 [meta]
 template = "default"
-commit-id = "78307cdf"
+commit-id = "13d8d6c0"
 
 [dependencies]
 mappings = [

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -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.1
+    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.1.0
+    hooks:
+    -   id: black
+-   repo: https://github.com/collective/zpretty
+    rev: 3.0.2
+    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.2
+    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
diff --git a/news/13d8d6c0.internal b/news/13d8d6c0.internal
@@ -0,0 +1,2 @@
+Update configuration files.
+[plone devs]
diff --git a/plone/schemaeditor/browser/configure.zcml b/plone/schemaeditor/browser/configure.zcml
@@ -1,9 +1,10 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser"
-    i18n_domain="plone">
+    i18n_domain="plone"
+    >
 
-    <include package=".field"/>
-    <include package=".schema" />
+  <include package=".field" />
+  <include package=".schema" />
 
 </configure>
diff --git a/plone/schemaeditor/browser/field/configure.zcml b/plone/schemaeditor/browser/field/configure.zcml
@@ -1,42 +1,42 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
-    xmlns:five="http://namespaces.zope.org/five"
     xmlns:browser="http://namespaces.zope.org/browser"
-    i18n_domain="plone">
+    xmlns:five="http://namespaces.zope.org/five"
+    i18n_domain="plone"
+    >
 
-    <browser:page
-        name="edit"
-        for="...interfaces.IFieldContext"
-        class=".edit.EditView"
-        permission="plone.schemaeditor.ManageSchemata" />
+  <browser:page
+      name="edit"
+      for="...interfaces.IFieldContext"
+      class=".edit.EditView"
+      permission="plone.schemaeditor.ManageSchemata"
+      />
 
-    <adapter
-        factory=".edit.FieldTitleAdapter" />
-    <adapter
-        factory=".edit.FieldDataManager" />
+  <adapter factory=".edit.FieldTitleAdapter" />
+  <adapter factory=".edit.FieldDataManager" />
 
-    <browser:page
-        name="order"
-        for="...interfaces.IFieldContext"
-        class=".order.FieldOrderView"
-        attribute="move"
-        permission="plone.schemaeditor.ManageSchemata"
-        />
+  <browser:page
+      name="order"
+      for="...interfaces.IFieldContext"
+      class=".order.FieldOrderView"
+      attribute="move"
+      permission="plone.schemaeditor.ManageSchemata"
+      />
 
-    <browser:page
-        name="delete"
-        for="...interfaces.IFieldContext"
-        class=".order.FieldOrderView"
-        attribute="delete"
-        permission="plone.schemaeditor.ManageSchemata"
-        />
+  <browser:page
+      name="delete"
+      for="...interfaces.IFieldContext"
+      class=".order.FieldOrderView"
+      attribute="delete"
+      permission="plone.schemaeditor.ManageSchemata"
+      />
 
-    <browser:page
-        name="changefieldset"
-        for="...interfaces.IFieldContext"
-        class=".fieldset.ChangeFieldsetView"
-        attribute="change"
-        permission="plone.schemaeditor.ManageSchemata"
-        />
+  <browser:page
+      name="changefieldset"
+      for="...interfaces.IFieldContext"
+      class=".fieldset.ChangeFieldsetView"
+      attribute="change"
+      permission="plone.schemaeditor.ManageSchemata"
+      />
 
 </configure>
diff --git a/plone/schemaeditor/browser/field/edit.pt b/plone/schemaeditor/browser/field/edit.pt
@@ -1,14 +1,18 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
+<html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
       lang="en"
-      i18n:domain="plone">
+      xml:lang="en"
+      i18n:domain="plone"
+>
 
-<body>
-    <h1 class="documentFirstHeading" tal:content="view/label"></h1>
+  <body>
+    <h1 class="documentFirstHeading"
+        tal:content="view/label"
+    ></h1>
     <div id="content">
-        <tal:block tal:replace="structure view/contents|view/render"/>
+      <tal:block tal:replace="structure view/contents|view/render" />
     </div>
-</body>
+  </body>
 </html>
diff --git a/plone/schemaeditor/browser/field/edit.py b/plone/schemaeditor/browser/field/edit.py
@@ -67,7 +67,6 @@ def __get__(self, inst, cls=None):
 
 @implementer(IFieldProxy)
 class FieldProxy:
-
     __providedBy__ = FieldProxySpecification()
 
     def __init__(self, context):

diff --git a/plone/schemaeditor/browser/schema/add.pt b/plone/schemaeditor/browser/schema/add.pt
@@ -1,14 +1,18 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
+<html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
       lang="en"
-      i18n:domain="plone">
+      xml:lang="en"
+      i18n:domain="plone"
+>
 
-<body>
-    <h1 class="documentFirstHeading" tal:content="view/label"></h1>
+  <body>
+    <h1 class="documentFirstHeading"
+        tal:content="view/label"
+    ></h1>
     <div id="content">
-        <tal:block tal:replace="structure view/contents|view/render"/>
+      <tal:block tal:replace="structure view/contents|view/render" />
     </div>
-</body>
+  </body>
 </html>
diff --git a/plone/schemaeditor/browser/schema/add_field.py b/plone/schemaeditor/browser/schema/add_field.py
@@ -22,7 +22,6 @@
 
 
 class FieldAddForm(AutoExtensibleForm, form.AddForm):
-
     fields = field.Fields(interfaces.INewField)
     label = _("Add new field")
     id = "add-field-form"

diff --git a/plone/schemaeditor/browser/schema/add_fieldset.py b/plone/schemaeditor/browser/schema/add_fieldset.py
@@ -16,7 +16,6 @@
 
 
 class FieldsetAddForm(form.AddForm):
-
     fields = field.Fields(INewFieldset)
     label = _("Add new fieldset")
     id = "add-fieldset-form"

diff --git a/plone/schemaeditor/browser/schema/configure.zcml b/plone/schemaeditor/browser/schema/configure.zcml
@@ -1,34 +1,36 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
-    xmlns:five="http://namespaces.zope.org/five"
     xmlns:browser="http://namespaces.zope.org/browser"
-    i18n_domain="plone">
+    xmlns:five="http://namespaces.zope.org/five"
+    i18n_domain="plone"
+    >
 
   <browser:page
       name="edit"
       for="plone.schemaeditor.interfaces.ISchemaContext"
       class=".listing.SchemaListingPage"
-      permission="plone.schemaeditor.ManageSchemata" />
+      permission="plone.schemaeditor.ManageSchemata"
+      />
 
   <browser:page
-    name="add-field"
-    for="plone.schemaeditor.interfaces.ISchemaContext"
-    class=".add_field.FieldAddFormPage"
-    permission="plone.schemaeditor.ManageSchemata"
-    />
+      name="add-field"
+      for="plone.schemaeditor.interfaces.ISchemaContext"
+      class=".add_field.FieldAddFormPage"
+      permission="plone.schemaeditor.ManageSchemata"
+      />
 
   <browser:page
-    name="add-fieldset"
-    for="plone.schemaeditor.interfaces.ISchemaContext"
-    class=".add_fieldset.FieldsetAddFormPage"
-    permission="plone.schemaeditor.ManageSchemata"
-    />
+      name="add-fieldset"
+      for="plone.schemaeditor.interfaces.ISchemaContext"
+      class=".add_fieldset.FieldsetAddFormPage"
+      permission="plone.schemaeditor.ManageSchemata"
+      />
 
   <browser:page
-    name="delete-fieldset"
-    for="plone.schemaeditor.interfaces.ISchemaContext"
-    class=".delete_fieldset.DeleteFieldset"
-    permission="plone.schemaeditor.ManageSchemata"
-    />
+      name="delete-fieldset"
+      for="plone.schemaeditor.interfaces.ISchemaContext"
+      class=".delete_fieldset.DeleteFieldset"
+      permission="plone.schemaeditor.ManageSchemata"
+      />
 
 </configure>
diff --git a/plone/schemaeditor/browser/schema/listing.py b/plone/schemaeditor/browser/schema/listing.py
@@ -23,7 +23,6 @@
 
 @implementer(IEditForm)
 class SchemaListing(AutoExtensibleForm, form.Form):
-
     ignoreContext = True
     ignoreRequest = True
     showEmptyGroups = True