Skip to content

Commit

Permalink
Installers: Add flag to prevent downloading assets
Browse files Browse the repository at this point in the history
  • Loading branch information
dalthviz committed Jun 13, 2022
1 parent e63df48 commit 1cc1164
Showing 1 changed file with 24 additions and 9 deletions.
33 changes: 24 additions & 9 deletions installers/Windows/installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ def unzip_file(filename, target_directory):

def run(python_version, bitness, repo_root, entrypoint, package, icon_path,
license_path, extra_packages=None, conda_path=None, suffix=None,
template=None):
template=None, download_assets=True):
"""
Run the installer generation.
Expand All @@ -329,12 +329,13 @@ def run(python_version, bitness, repo_root, entrypoint, package, icon_path,
(locking the dependencies set in setup.py) is generated and pynsist runned.
"""
try:
print("Setting up assets from", ASSETS_URL)
print("Downloading assets from ", ASSETS_URL)
filename = download_file(ASSETS_URL, 'installers/Windows/assets')
if download_assets:
print("Setting up assets from", ASSETS_URL)
print("Downloading assets from ", ASSETS_URL)
filename = download_file(ASSETS_URL, 'installers/Windows/assets')

print("Unzipping assets to", 'installers/Windows/assets')
unzip_file(filename, 'installers/Windows/assets')
print("Unzipping assets to", 'installers/Windows/assets')
unzip_file(filename, 'installers/Windows/assets')

with tempfile.TemporaryDirectory(
prefix="installer-pynsist-") as work_dir:
Expand Down Expand Up @@ -490,14 +491,27 @@ def run(python_version, bitness, repo_root, entrypoint, package, icon_path,
parser.add_argument(
'-t', '--template',
help='Path to .nsi template for the installer')
parser.add_argument(
'-da', '--download_assets',
dest='download_assets', action='store_true',
help='Download assets from ASSETS_URL environment '''
'''variable when running''')
parser.add_argument(
'-no-da', '--no_download_assets',
dest='download_assets', action='store_false',
help='''Prevent downloading assets from ASSETS_URL environment '''
'''variable when running''')
parser.set_defaults(download_assets=True)

args = parser.parse_args()
from operator import attrgetter
(python_version, bitness, setup_py_path, entrypoint, package, icon_path,
license_path, extra_packages, conda_path, suffix, template) = attrgetter(
license_path, extra_packages, conda_path, suffix, template,
download_assets) = attrgetter(
'python_version', 'bitness', 'setup_py_path',
'entrypoint', 'package', 'icon_path', 'license_path',
'extra_packages', 'conda_path', 'suffix', 'template')(args)
'extra_packages', 'conda_path', 'suffix', 'template',
'download_assets')(args)

if not setup_py_path.endswith("setup.py"):
sys.exit("Invalid path to setup.py:", setup_py_path)
Expand All @@ -512,4 +526,5 @@ def run(python_version, bitness, repo_root, entrypoint, package, icon_path,

run(python_version, bitness, repo_root, entrypoint,
package, icon_file, license_file, extra_packages=extra_packages,
conda_path=conda_path, suffix=suffix, template=template)
conda_path=conda_path, suffix=suffix, template=template,
download_assets=download_assets)

0 comments on commit 1cc1164

Please sign in to comment.