From af6513c0cff953d4121bcb33ddc3643cdada7a60 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Fri, 17 Jan 2020 10:59:17 -0500 Subject: [PATCH 1/2] news fragment --- newsfragments/2392.removed | 1 + 1 file changed, 1 insertion(+) create mode 100644 newsfragments/2392.removed diff --git a/newsfragments/2392.removed b/newsfragments/2392.removed new file mode 100644 index 000000000..7343f600f --- /dev/null +++ b/newsfragments/2392.removed @@ -0,0 +1 @@ +The redundant "pypywin32" dependency has been removed. \ No newline at end of file From feb6c2f2fceae59908f66cac0651660cee956e5b Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Fri, 17 Jan 2020 10:59:23 -0500 Subject: [PATCH 2/2] depend on pywin32 instead --- setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index cedb6501a..ecd499e69 100644 --- a/setup.py +++ b/setup.py @@ -347,7 +347,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