From 1be5f8dffecfde7ae5dd0ef658f7a7dc4496b3fe Mon Sep 17 00:00:00 2001
From: Adrien Ferrand <ferrand.ad@gmail.com>
Date: Mon, 4 Nov 2019 22:41:41 +0100
Subject: [PATCH] Independent pywin32 dependency definition in setup.py and
 construct.py

---
 setup.py                       | 6 +-----
 tools/strip_hashes.py          | 1 +
 windows-installer/construct.py | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/setup.py b/setup.py
index 484a31a79..0f3bcf7f4 100644
--- a/setup.py
+++ b/setup.py
@@ -54,16 +54,12 @@ install_requires = [
     'zope.interface',
 ]
 
-# Load minimal pywin32 version from the Windows installer builder
-windows_installer = os.path.join(here, 'windows-installer', 'construct.py')
-pywin32_version_search = re.search(r'PYWIN32_VERSION = (\d+)', read_file(windows_installer))
-pywin32_req = 'pywin32>={0}'.format(pywin32_version_search.group(1))
-
 # Add pywin32 on Windows platforms to handle low-level system calls.
 # This dependency needs to be added using environment markers to avoid its installation on Linux.
 # However environment markers are supported only with setuptools >= 36.2.
 # So this dependency is not added for old Linux distributions with old setuptools,
 # in order to allow these systems to build certbot from sources.
+pywin32_req = 'pywin32>=225'  # do not forget to edit pywin32 dependency accordingly in windows-installer/construct.py
 if StrictVersion(setuptools_version) >= StrictVersion('36.2'):
     install_requires.append(pywin32_req + " ; sys_platform == 'win32'")
 elif 'bdist_wheel' in sys.argv[1:]:
diff --git a/tools/strip_hashes.py b/tools/strip_hashes.py
index 12d7c0d30..988e72eb8 100755
--- a/tools/strip_hashes.py
+++ b/tools/strip_hashes.py
@@ -30,6 +30,7 @@ def main(*paths):
 
     Hashes are removed from returned entries.
     """
+
     deps = []
     if paths:
         for path in paths:
diff --git a/windows-installer/construct.py b/windows-installer/construct.py
index 63961c52a..94ce1fa4d 100644
--- a/windows-installer/construct.py
+++ b/windows-installer/construct.py
@@ -11,7 +11,7 @@ import time
 
 PYTHON_VERSION = (3, 7, 4)
 PYTHON_BITNESS = 32
-PYWIN32_VERSION = 225
+PYWIN32_VERSION = 225  # do not forget to edit pywin32 dependency accordingly in setup.py
 
 
 def main():