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 #121

Merged
merged 9 commits into from
Mar 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
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
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 = "a533099d"
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.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
4 changes: 2 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ New features:
- Refactor addition of criteria to stick inside ``INavigationRoot`` in querybuilder.
Added a simple ``IQueryModifier`` interfaces expecting a query and returning a query.
Iterates over all sorted utilities providing such an interfaces and calls it right before the query is parsed.
Code to add the ``INavigationRoot`` stickyness was moved to such a query modifier.
Code to add the ``INavigationRoot`` stickiness was moved to such a query modifier.
[jensens]

Bug fixes:
Expand Down Expand Up @@ -547,7 +547,7 @@ Fixes:
results not wrapped as an IContentListing.
[davisagli]

* Declare all dependencies in setup.py to resolve a dependeny problem in
* Declare all dependencies in setup.py to resolve a dependency problem in
test setups, where the Plone stack isn't fully loaded.
[thet]

Expand Down
2 changes: 2 additions & 0 deletions news/a533099d.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update configuration files.
[plone devs]
81 changes: 41 additions & 40 deletions plone/app/querystring/configure.zcml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<configure
xmlns="http://namespaces.zope.org/zope"
xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
xmlns:browser="http://namespaces.zope.org/browser"
i18n_domain="plone">
xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
i18n_domain="plone"
>

<include file="profiles.zcml" />
<include file="upgrades.zcml" />
Expand All @@ -12,55 +13,55 @@
<include package=".indexmodifiers" />

<adapter
for="plone.registry.interfaces.IRegistry"
factory=".registryreader.QuerystringRegistryReader"
/>
factory=".registryreader.QuerystringRegistryReader"
for="plone.registry.interfaces.IRegistry"
/>

<adapter
for="plone.registry.interfaces.IRegistry
zope.publisher.interfaces.http.IHTTPRequest"
factory=".registryreader.QuerystringRegistryReader"
/>
factory=".registryreader.QuerystringRegistryReader"
for="plone.registry.interfaces.IRegistry
zope.publisher.interfaces.http.IHTTPRequest"
/>

<browser:page
name="display_query_results"
class=".querybuilder.ContentListingView"
permission="zope2.View"
for="*"
template="results.pt"
/>
name="display_query_results"
for="*"
class=".querybuilder.ContentListingView"
template="results.pt"
permission="zope2.View"
/>

<browser:page
name="querybuilderresults"
class=".querybuilder.QueryBuilder"
permission="zope2.View"
for="*"
/>
name="querybuilderresults"
for="*"
class=".querybuilder.QueryBuilder"
permission="zope2.View"
/>

<browser:page
name="querybuilder_html_results"
class=".querybuilder.QueryBuilder"
permission="zope2.View"
attribute="html_results"
for="*"
/>
name="querybuilder_html_results"
for="*"
class=".querybuilder.QueryBuilder"
attribute="html_results"
permission="zope2.View"
/>

<browser:page
name="querybuildernumberofresults"
class=".querybuilder.QueryBuilder"
permission="zope2.View"
for="*"
attribute="number_of_results"
/>
name="querybuildernumberofresults"
for="*"
class=".querybuilder.QueryBuilder"
attribute="number_of_results"
permission="zope2.View"
/>

<browser:page
name="querybuilderjsonconfig"
class=".querybuilder.RegistryConfiguration"
permission="zope2.View"
for="*"
/>
name="querybuilderjsonconfig"
for="*"
class=".querybuilder.RegistryConfiguration"
permission="zope2.View"
/>
<utility
component=".querymodifiers.modify_query_to_enforce_navigation_root"
name="1000"
/>
name="1000"
component=".querymodifiers.modify_query_to_enforce_navigation_root"
/>
</configure>
83 changes: 42 additions & 41 deletions plone/app/querystring/indexmodifiers/configure.zcml
Original file line number Diff line number Diff line change
@@ -1,46 +1,47 @@
<configure
xmlns="http://namespaces.zope.org/zope"
i18n_domain="plone">
i18n_domain="plone"
>

<utility
factory=".query_index_modifiers.Subject"
provides="..interfaces.IParsedQueryIndexModifier"
name="Subject"
/>
<utility
factory=".query_index_modifiers.Date"
provides="..interfaces.IParsedQueryIndexModifier"
name="Date"
/>
<utility
factory=".query_index_modifiers.created"
provides="..interfaces.IParsedQueryIndexModifier"
name="created"
/>
<utility
factory=".query_index_modifiers.effective"
provides="..interfaces.IParsedQueryIndexModifier"
name="effective"
/>
<utility
factory=".query_index_modifiers.end"
provides="..interfaces.IParsedQueryIndexModifier"
name="end"
/>
<utility
factory=".query_index_modifiers.expires"
provides="..interfaces.IParsedQueryIndexModifier"
name="expires"
/>
<utility
factory=".query_index_modifiers.modified"
provides="..interfaces.IParsedQueryIndexModifier"
name="modified"
/>
<utility
factory=".query_index_modifiers.start"
provides="..interfaces.IParsedQueryIndexModifier"
name="start"
/>
<utility
factory=".query_index_modifiers.Subject"
provides="..interfaces.IParsedQueryIndexModifier"
name="Subject"
/>
<utility
factory=".query_index_modifiers.Date"
provides="..interfaces.IParsedQueryIndexModifier"
name="Date"
/>
<utility
factory=".query_index_modifiers.created"
provides="..interfaces.IParsedQueryIndexModifier"
name="created"
/>
<utility
factory=".query_index_modifiers.effective"
provides="..interfaces.IParsedQueryIndexModifier"
name="effective"
/>
<utility
factory=".query_index_modifiers.end"
provides="..interfaces.IParsedQueryIndexModifier"
name="end"
/>
<utility
factory=".query_index_modifiers.expires"
provides="..interfaces.IParsedQueryIndexModifier"
name="expires"
/>
<utility
factory=".query_index_modifiers.modified"
provides="..interfaces.IParsedQueryIndexModifier"
name="modified"
/>
<utility
factory=".query_index_modifiers.start"
provides="..interfaces.IParsedQueryIndexModifier"
name="start"
/>

</configure>
Loading