Skip to content

Commit

Permalink
pre-commit
Browse files Browse the repository at this point in the history
  • Loading branch information
jaimergp committed Nov 11, 2024
1 parent 094bb5e commit d14279c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion constructor/jinja.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os

from jinja2 import BaseLoader, Environment, FileSystemLoader, TemplateError, StrictUndefined
from jinja2 import BaseLoader, Environment, FileSystemLoader, StrictUndefined, TemplateError

from . import __version__
from .exceptions import UnableToParse
Expand Down
2 changes: 1 addition & 1 deletion constructor/osxpkg.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
from . import preconda
from .conda_interface import conda_context
from .construct import ns_platform, parse
from .jinja import render_template
from .imaging import write_images
from .jinja import render_template
from .signing import CodeSign
from .utils import (
add_condarc,
Expand Down
4 changes: 2 additions & 2 deletions constructor/winexe.py
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,8 @@ def make_nsi(
variables['SETUP_ENVS'] = '\n '.join(setup_envs_commands(info, dir_path))
variables['WRITE_CONDARC'] = '\n '.join(add_condarc(info))
variables['SIZE'] = str(approx_pkgs_size_kb)
variables['UNINSTALL_NAME'] = info.get('uninstall_name',
variables['UNINSTALL_NAME'] = info.get(
'uninstall_name',
'${NAME} ${VERSION} (Python ${PYVERSION} ${ARCH})'
)
variables['UNINSTALL_MENUS'] = '\n '.join(uninstall_menus_commands(info))
Expand All @@ -374,7 +375,6 @@ def make_nsi(
variables['LICENSEFILENAME'] = basename(info.get('license_file', 'placeholder_license.txt'))
variables['NO_RCS_ARG'] = info.get('_ignore_condarcs_arg', '')


data = render_template(read_nsi_tmpl(info), **variables)
if info['_platform'].startswith("win") and sys.platform != 'win32':
# Branding /TRIM commannd is unsupported on non win platform
Expand Down
4 changes: 2 additions & 2 deletions tests/test_header.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def test_osxpkg_scripts_shellcheck(arch, check_path_spaces, script):
processed = render_template(
data,
arch=arch,
check_path_spaces= check_path_spaces,
check_path_spaces=check_path_spaces,
pkg_name_lower="example",
installer_name="Example",
installer_version="1.2.3",
Expand Down Expand Up @@ -144,7 +144,7 @@ def test_template_shellcheck(
"installer_version": "1.2.3",
"installer_platform": "linux-64",
"installer_md5": "a0098a2c837f4cf50180cfc0a041b2af",
"script_env_variables": "", # TODO: Fill this in with actual value
"script_env_variables": "", # TODO: Fill this in with actual value
"default_prefix": "/opt/Example",
"license": "Some text",
"total_installation_size_kb": "1024",
Expand Down

0 comments on commit d14279c

Please sign in to comment.