Skip to content

Commit

Permalink
Merge pull request #177 from collective/petschki-maintenance
Browse files Browse the repository at this point in the history
Package maintenance
  • Loading branch information
mauritsvanrees authored Jan 26, 2024
2 parents 645d118 + 2ed00df commit 7feeaee
Show file tree
Hide file tree
Showing 22 changed files with 963 additions and 1,113 deletions.
6 changes: 3 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
# https://github.com/plone/meta/tree/main/config/default
# See the inline comments on how to expand/tweak this configuration file
#
# EditorConfig Configuration file, for more details see:
Expand Down Expand Up @@ -29,11 +29,11 @@ max_line_length = off
# 4 space indentation
indent_size = 4

[*.{yml,zpt,pt,dtml,zcml}]
[*.{yml,zpt,pt,dtml,zcml,html,xml}]
# 2 space indentation
indent_size = 2

[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss,html}] # Frontend development
[*.{json,jsonl,js,jsx,ts,tsx,css,less,scss}] # Frontend development
# 2 space indentation
indent_size = 2
max_line_length = 80
Expand Down
2 changes: 1 addition & 1 deletion .flake8
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
# https://github.com/plone/meta/tree/main/config/default
# See the inline comments on how to expand/tweak this configuration file
[flake8]
doctests = 1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/meta.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
# https://github.com/plone/meta/tree/main/config/default
# See the inline comments on how to expand/tweak this configuration file
name: Meta
on:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
# https://github.com/plone/meta/tree/main/config/default
# See the inline comments on how to expand/tweak this configuration file
# python related
*.egg-info
Expand Down Expand Up @@ -35,6 +35,7 @@ lib64
parts/
pyvenv.cfg
var/
local.cfg

# mxdev
/instance/
Expand Down
4 changes: 2 additions & 2 deletions .meta.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
# https://github.com/plone/meta/tree/main/config/default
# See the inline comments on how to expand/tweak this configuration file
[meta]
template = "default"
commit-id = "8c30aa23"
commit-id = "5d3e918e"

[pyproject]
codespell_skip = "*.js,*.min.js,*.min.js.map,*.css.map,yarn.lock,robot_*,test_*"
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
# https://github.com/plone/meta/tree/main/config/default
# See the inline comments on how to expand/tweak this configuration file
ci:
autofix_prs: false
Expand All @@ -12,11 +12,11 @@ repos:
- id: pyupgrade
args: [--py38-plus]
- repo: https://github.com/pycqa/isort
rev: 5.12.0
rev: 5.13.2
hooks:
- id: isort
- repo: https://github.com/psf/black
rev: 23.10.1
rev: 23.12.1
hooks:
- id: black
- repo: https://github.com/collective/zpretty
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ PIP_PARAMS= --pre
##############################################################################
# targets and prerequisites
# target has to be one file, otherwise step gets executes for each file separate
PREPARE_PREREQUISITES=${PIP_REQUIREMENTS_IN_FILE} ${CONSTRAINTS_IN} mx.ini ${ADDONBASE}setup.cfg
PREPARE_PREREQUISITES=${PIP_REQUIREMENTS_IN_FILE} ${CONSTRAINTS_IN} mx.ini
PREPARE_TARGET=requirements-mxdev.txt
INSTALL_PREREQUSISTES=${PREPARE_TARGET}
INSTALL_TARGET=.installed.txt
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
"yarn": "^1.22.19"
},
"dependencies": {
"@patternslib/patternslib": "9.9.9",
"@plone/mockup": "5.1.6"
"@patternslib/patternslib": "9.9.10",
"@plone/mockup": "5.1.7"
},
"devDependencies": {
"@patternslib/dev": "^3.5.2"
"@patternslib/dev": "^3.5.3"
},
"scripts": {
"build": "NODE_ENV=production webpack --config webpack.config.js",
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
# https://github.com/plone/meta/tree/main/config/default
# See the inline comments on how to expand/tweak this configuration file
[build-system]
requires = ["setuptools>=68.2"]
Expand Down
1 change: 1 addition & 0 deletions src/collective/z3cform/datagridfield/autoform.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
Adds subform support for plone.autoform.
"""

from plone.autoform.interfaces import IAutoExtensibleForm
from z3c.form.error import MultipleErrorViewSnippet
from z3c.form.interfaces import IMultipleErrors
Expand Down
1 change: 1 addition & 0 deletions src/collective/z3cform/datagridfield/datagridfield.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Implementation of the widget
"""

from Acquisition import aq_parent
from collective.z3cform.datagridfield import _
from collective.z3cform.datagridfield.interfaces import IDataGridFieldWidget
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Demo of the widget
"""

from ..datagridfield import DataGridFieldObjectWidget
from ..datagridfield import DataGridFieldWidgetFactory
from z3c.form import button
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Demo of the widget
"""

from ..blockdatagridfield import BlockDataGridFieldWidgetFactory
from ..datagridfield import DataGridFieldWidgetFactory
from ..row import DictRow
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
# https://github.com/plone/meta/tree/main/config/default
# See the inline comments on how to expand/tweak this configuration file
[tox]
# We need 4.4.0 for constrain_package_deps.
Expand Down Expand Up @@ -71,7 +71,7 @@ description = check if the package defines all its dependencies
skip_install = true
deps =
build
z3c.dependencychecker==2.11
z3c.dependencychecker==2.14.3
commands =
python -m build --sdist
dependencychecker
Expand Down
Loading

0 comments on commit 7feeaee

Please sign in to comment.