Skip to content

Commit e4b4c00

Browse files
Force setuptools < 82.0.0
Docassemble depends on an older version of docxcompose, which needs still uses `pkg_resources`, removed in setuptools 82.0.0. Also runs black to pass CI.
1 parent ef0741f commit e4b4c00

3 files changed

Lines changed: 4 additions & 5 deletions

File tree

docassemble/EFSPIntegration/interview_logic.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,12 @@ def contact_fields_with_defaults(
177177
"field": person.attr_name("other_contact_method"),
178178
"input type": "area",
179179
"required": False,
180-
"help": word(
181-
"""
180+
"help": word("""
182181
If you do not have a phone number or email, provide
183182
specific contact instructions. For example, use a friend's phone number.
184183
But the friend must be someone you can rely on to give you a
185184
message.
186-
"""
187-
),
185+
"""),
188186
},
189187
]
190188
if is_admin or not can_check_efile:

docassemble/EFSPIntegration/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
docassemble.base==1.6.5
2+
setuptools<82.0.0
23
docassemble.webapp==1.6.5
34
docassemble.AssemblyLine>2.10.1
45
requests>2.25.1

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ GitHub = "https://github.com/SuffolkLITLab/docassemble-EFSPIntegration"
2222

2323
[build-system]
2424
requires = [
25-
"setuptools>=60",
25+
"setuptools>=60,<82.0.0",
2626
"setuptools-scm>=8.1"]
2727
build-backend = "setuptools.build_meta"
2828

0 commit comments

Comments
 (0)