Use req files in pkg\windows for setup

This commit is contained in:
twangboy 2017-04-27 09:47:46 -06:00
parent 92003e2776
commit 57d5f781f4
2 changed files with 6 additions and 11 deletions

View File

@ -1,10 +0,0 @@
backports-abc
backports.ssl-match-hostname
certifi
psutil
python-dateutil
pywin32
pyzmq
six
timelib
WMI

View File

@ -120,9 +120,14 @@ SALT_VERSION = os.path.join(os.path.abspath(SETUP_DIRNAME), 'salt', 'version.py'
SALT_VERSION_HARDCODED = os.path.join(os.path.abspath(SETUP_DIRNAME), 'salt', '_version.py')
SALT_SYSPATHS_HARDCODED = os.path.join(os.path.abspath(SETUP_DIRNAME), 'salt', '_syspaths.py')
SALT_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'requirements', 'base.txt')
SALT_WINDOWS_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'requirements', 'windows.txt')
SALT_ZEROMQ_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'requirements', 'zeromq.txt')
SALT_RAET_REQS = os.path.join(os.path.abspath(SETUP_DIRNAME), 'requirements', 'raet.txt')
if IS_PY3:
SALT_WINDOWS_REQS = os.path.join(
os.path.abspath(SETUP_DIRNAME), 'pkg', 'windows', 'req_3.txt')
else:
SALT_WINDOWS_REQS = os.path.join(
os.path.abspath(SETUP_DIRNAME), 'pkg', 'windows', 'req_3.txt')
# Salt SSH Packaging Detection
PACKAGED_FOR_SALT_SSH_FILE = os.path.join(os.path.abspath(SETUP_DIRNAME), '.salt-ssh-package')