Skip to content

Commit

Permalink
Merge pull request #400 from twisted/vendor-multipart-for-now
Browse files Browse the repository at this point in the history
vendor multipart until defnull/multipart#53 is addressed
  • Loading branch information
twm committed Sep 19, 2024
2 parents ca3966f + 4aa1ee8 commit 9cedb08
Show file tree
Hide file tree
Showing 7 changed files with 578 additions and 5 deletions.
3 changes: 3 additions & 0 deletions changelog.d/399.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
treq has vendored its dependency on the ``multipart`` library to avoid import
conflicts with ``python-multipart``; it should now be installable alongside
that library.
6 changes: 6 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,9 @@ module = [
disallow_untyped_defs = false
check_untyped_defs = false
ignore_missing_imports = true

[[tool.mypy.overrides]]
module = [
"treq._multipart",
]
disallow_untyped_defs = false
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
"Twisted[tls] >= 22.10.0", # For #11635
"attrs",
"typing_extensions >= 3.10.0",
"multipart",
],
extras_require={
"dev": [
Expand Down
Loading

0 comments on commit 9cedb08

Please sign in to comment.