Setup: don't use dependency before it's installed
This commit is contained in:
parent
6c1023a88c
commit
11873e059a
7
setup.py
7
setup.py
|
@ -11,8 +11,6 @@ from collections.abc import Iterable
|
||||||
from hashlib import sha3_512
|
from hashlib import sha3_512
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
import setuptools
|
|
||||||
import setuptools.command.build
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
import ModuleUpdate
|
import ModuleUpdate
|
||||||
|
@ -41,12 +39,15 @@ except pkg_resources.ResolutionError:
|
||||||
subprocess.call([sys.executable, '-m', 'pip', 'install', requirement, '--upgrade'])
|
subprocess.call([sys.executable, '-m', 'pip', 'install', requirement, '--upgrade'])
|
||||||
import cx_Freeze
|
import cx_Freeze
|
||||||
|
|
||||||
|
# .build only exists if cx-Freeze is the right version, so we have to update/install that first before this line
|
||||||
|
import setuptools.command.build
|
||||||
|
|
||||||
if os.path.exists("X:/pw.txt"):
|
if os.path.exists("X:/pw.txt"):
|
||||||
print("Using signtool")
|
print("Using signtool")
|
||||||
with open("X:/pw.txt", encoding="utf-8-sig") as f:
|
with open("X:/pw.txt", encoding="utf-8-sig") as f:
|
||||||
pw = f.read()
|
pw = f.read()
|
||||||
signtool = r'signtool sign /f X:/_SITS_Zertifikat_.pfx /p "' + pw + r'" /fd sha256 /tr http://timestamp.digicert.com/ '
|
signtool = r'signtool sign /f X:/_SITS_Zertifikat_.pfx /p "' + pw + \
|
||||||
|
r'" /fd sha256 /tr http://timestamp.digicert.com/ '
|
||||||
else:
|
else:
|
||||||
signtool = None
|
signtool = None
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue