Merge pull request #685 from tahoe-lafs/2392.pywin32

Replace pypiwin32 with pywin32

Fixes: ticket:2392
This commit is contained in:
Jean-Paul Calderone 2020-01-20 14:09:32 -05:00 committed by GitHub
commit 5bd84895fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions

View File

@ -0,0 +1 @@
The redundant "pypywin32" dependency has been removed.

View File

@ -350,7 +350,10 @@ setup(name="tahoe-lafs", # also set in __init__.py
python_requires="<3.0",
install_requires=install_requires,
extras_require={
':sys_platform=="win32"': ["pypiwin32"],
# Duplicate the Twisted pywin32 dependency here. See
# https://tahoe-lafs.org/trac/tahoe-lafs/ticket/2392 for some
# discussion.
':sys_platform=="win32"': ["pywin32 != 226"],
':sys_platform!="win32" and sys_platform!="linux2"': ["watchdog"], # For magic-folder on "darwin" (macOS) and the BSDs
"test": [
# Pin a specific pyflakes so we don't have different folks