Also include req_win.txt

This commit is contained in:
Pedro Algarvio 2020-02-08 19:11:21 +00:00
parent a204906c80
commit 7eef14952c
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF

View file

@ -101,6 +101,7 @@ SALT_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'requirements', 'base.t
SALT_CRYPTO_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'requirements', 'crypto.txt')
SALT_ZEROMQ_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'requirements', 'zeromq.txt')
SALT_WINDOWS_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'pkg', 'windows', 'req.txt')
SALT_WINDOWS_REQ_WIN = os.path.join(os.path.abspath(SETUP_DIRNAME), 'pkg', 'windows', 'req_win.txt')
SALT_LONG_DESCRIPTION_FILE = os.path.join(os.path.abspath(SETUP_DIRNAME), 'README.rst')
# Salt SSH Packaging Detection
@ -1026,7 +1027,8 @@ class SaltDistribution(distutils.dist.Distribution):
install_requires += _parse_requirements_file(SALT_ZEROMQ_REQS)
if IS_WINDOWS_PLATFORM:
install_requires = _parse_requirements_file(SALT_WINDOWS_REQS)
install_requires = _parse_requirements_file(SALT_WINDOWS_REQ_WIN)
install_requires += _parse_requirements_file(SALT_WINDOWS_REQS)
return install_requires
@property