Skip to content
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
2 changes: 1 addition & 1 deletion deform/exception.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class ValidationFailure(Exception):
"""

def __init__(self, field, cstruct, error):
Exception.__init__(self)
super().__init__(field, cstruct, error)
Comment thread
sbrunner marked this conversation as resolved.
self.field = field
self.cstruct = cstruct
self.error = error
Expand Down
1 change: 0 additions & 1 deletion deform/i18n.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@

from translationstring import TranslationStringFactory


_ = TranslationStringFactory("deform")
1 change: 0 additions & 1 deletion deform/schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

from . import widget


default_widget_makers = {
colander.Mapping: widget.MappingWidget,
colander.Sequence: widget.SequenceWidget,
Expand Down
1 change: 0 additions & 1 deletion deform/template.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

from .exception import TemplateError


BOOLEAN_HTML_ATTRS = frozenset(
[
# List of Boolean attributes in HTML that should be rendered in
Expand Down
1 change: 0 additions & 1 deletion deform/widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
from .i18n import _
from .utils import text_


sequence_types = (
list,
tuple,
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools", "wheel"]
requires = ["setuptools<81.0.0", "wheel"]

[tool.black]
line-length = 79
Expand Down Expand Up @@ -37,7 +37,6 @@ include_trailing_comma = true
known_first_party = "deform"
known_pyramid = "colander,jinja2,plaster,pyramid,pyramid_layout,venusian,zope,transaction,pyramid_chameleon,Chameleon"
line_length = 79
lines_after_imports = 2
multi_line_output = 3
no_lines_before = "THIRDPARTY"
profile = "black"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ def readfile(name):
"peppercorn>=0.3", # rename operation type
"translationstring>=1.0", # add format mapping with %
"zope.deprecation",
"setuptools<81.0.0",
]
Comment thread
sbrunner marked this conversation as resolved.

lint_extras = [
Expand Down Expand Up @@ -82,7 +83,6 @@ def readfile(name):
long_description=README + "\n\n" + CHANGES,
classifiers=[
"Intended Audience :: Developers",
"License :: Repoze Public License",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.10",
Expand Down
8 changes: 6 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,15 @@ setenv =
commands =
python --version
pytest {posargs:}
deps =
setuptools<81.0.0

[testenv:py311-cover]
commands =
python --version
pytest --cov {posargs:}
deps =
setuptools<81.0.0
Comment thread
sbrunner marked this conversation as resolved.

[testenv:lint]
commands =
Expand All @@ -28,7 +32,7 @@ commands =
black --check --diff deform setup.py
# XXX -r reports now warnings too so we fail
python setup.py check -s -m
rstcheck README.rst CHANGES.txt
rstcheck README.rst CHANGES.txt
check-manifest
extras =
lint
Expand Down Expand Up @@ -88,5 +92,5 @@ commands =
# build wheel from sdist
pip wheel -v --no-deps --no-index --no-build-isolation --wheel-dir {toxinidir}/dist --find-links {toxinidir}/dist deform
deps =
setuptools
setuptools<81.0.0
wheel
Loading