Skip to content

Commit 80bb58c

Browse files
authored
Fix build (#536)
* Fix linting error * Fix format * Don't use latest version of setuptools
1 parent 11444a6 commit 80bb58c

File tree

8 files changed

+9
-10
lines changed

8 files changed

+9
-10
lines changed

deform/exception.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ValidationFailure(Exception):
2525
"""
2626

2727
def __init__(self, field, cstruct, error):
28-
Exception.__init__(self)
28+
super().__init__(field, cstruct, error)
2929
self.field = field
3030
self.cstruct = cstruct
3131
self.error = error

deform/i18n.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22

33
from translationstring import TranslationStringFactory
44

5-
65
_ = TranslationStringFactory("deform")

deform/schema.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
from . import widget
1010

11-
1211
default_widget_makers = {
1312
colander.Mapping: widget.MappingWidget,
1413
colander.Sequence: widget.SequenceWidget,

deform/template.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
from .exception import TemplateError
1111

12-
1312
BOOLEAN_HTML_ATTRS = frozenset(
1413
[
1514
# List of Boolean attributes in HTML that should be rendered in

deform/widget.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
from .i18n import _
2323
from .utils import text_
2424

25-
2625
sequence_types = (
2726
list,
2827
tuple,

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["setuptools", "wheel"]
2+
requires = ["setuptools<81.0.0", "wheel"]
33

44
[tool.black]
55
line-length = 79
@@ -37,7 +37,6 @@ include_trailing_comma = true
3737
known_first_party = "deform"
3838
known_pyramid = "colander,jinja2,plaster,pyramid,pyramid_layout,venusian,zope,transaction,pyramid_chameleon,Chameleon"
3939
line_length = 79
40-
lines_after_imports = 2
4140
multi_line_output = 3
4241
no_lines_before = "THIRDPARTY"
4342
profile = "black"

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ def readfile(name):
3131
"peppercorn>=0.3", # rename operation type
3232
"translationstring>=1.0", # add format mapping with %
3333
"zope.deprecation",
34+
"setuptools<81.0.0",
3435
]
3536

3637
lint_extras = [
@@ -82,7 +83,6 @@ def readfile(name):
8283
long_description=README + "\n\n" + CHANGES,
8384
classifiers=[
8485
"Intended Audience :: Developers",
85-
"License :: Repoze Public License",
8686
"Programming Language :: Python",
8787
"Programming Language :: Python :: 3",
8888
"Programming Language :: Python :: 3.10",

tox.ini

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,15 @@ setenv =
1313
commands =
1414
python --version
1515
pytest {posargs:}
16+
deps =
17+
setuptools<81.0.0
1618

1719
[testenv:py311-cover]
1820
commands =
1921
python --version
2022
pytest --cov {posargs:}
23+
deps =
24+
setuptools<81.0.0
2125

2226
[testenv:lint]
2327
commands =
@@ -28,7 +32,7 @@ commands =
2832
black --check --diff deform setup.py
2933
# XXX -r reports now warnings too so we fail
3034
python setup.py check -s -m
31-
rstcheck README.rst CHANGES.txt
35+
rstcheck README.rst CHANGES.txt
3236
check-manifest
3337
extras =
3438
lint
@@ -88,5 +92,5 @@ commands =
8892
# build wheel from sdist
8993
pip wheel -v --no-deps --no-index --no-build-isolation --wheel-dir {toxinidir}/dist --find-links {toxinidir}/dist deform
9094
deps =
91-
setuptools
95+
setuptools<81.0.0
9296
wheel

0 commit comments

Comments
 (0)