Merge pull request #1252 from crwood/3966.unpin-charset-normalizer

Unpin charset-normalizer / (re-)fix PyInstaller builds

Re-fixes: ticket:3966
This commit is contained in:
Jean-Paul Calderone 2023-01-28 17:06:29 -05:00 committed by GitHub
commit 759974aecc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 8 deletions

View File

@ -1 +1 @@
Fix incompatibility with newer versions of the transitive charset_normalizer dependency when using PyInstaller.
Fix incompatibility with transitive dependency charset_normalizer >= 3 when using PyInstaller.

View File

@ -36,6 +36,7 @@ hidden_imports = [
'allmydata.stats',
'base64',
'cffi',
'charset_normalizer.md__mypyc',
'collections',
'commands',
'Crypto',

View File

@ -147,13 +147,6 @@ install_requires = [
# for pid-file support
"psutil",
"filelock",
# treq needs requests, requests needs charset_normalizer,
# charset_normalizer breaks PyInstaller
# (https://github.com/Ousret/charset_normalizer/issues/253). So work around
# this by using a lower version number. Once upstream issue is fixed, or
# requests drops charset_normalizer, this can go away.
"charset_normalizer < 3",
]
setup_requires = [