Skip to content

fix a premature optimization, and remove further dead wood #1540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stonebig merged 1 commit into from
Apr 11, 2025
Merged

fix a premature optimization, and remove further dead wood #1540

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 2 additions & 27 deletions winpython/wppm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@ def do_pip_action(self, actions: list[str] = None, install_options: list[str] =
my_actions = actions or []
executing = str(Path(self.target).parent / "scripts" / "env.bat")
if Path(executing).is_file():
complement = [r"&&", "cd", "/D", self.target, r"&&", utils.get_python_executable(self.target)]
complement = [r"&&", "cd", "/D", self.target, r"&&", utils.get_python_executable(self.target), "-m", "pip"]
else:
executing = utils.get_python_executable(self.target)
complement = ["-m", "pip"]
complement = ["-m", "pip"]
try:
fname = utils.do_script(this_script=None, python_exe=executing, verbose=self.verbose, install_options=complement + my_actions + my_list)
except RuntimeError as e:
Expand Down Expand Up @@ -195,32 +195,7 @@ def patch_standard_packages(self, package_name="", to_movable=True):
"'check_updates_on_startup': True,",
"'check_updates_on_startup': False,",
)
# workaround bad installers
if package_name.lower() == "numba":
self.create_pybat(["numba"])
else:
self.create_pybat(package_name.lower())


def create_pybat(self, names="", contents=r"""@echo off
..\python "%~dpn0" %*""",
):
"""Create launcher batch script when missing"""

scriptpy = Path(self.target) / "Scripts" # std Scripts of python
os.makedirs(scriptpy, exist_ok=True)
if not list(names) == names:
my_list = [f for f in os.listdir(scriptpy) if "." not in f and f.startswith(names)]
else:
my_list = names
for name in my_list:
if scriptpy.is_dir() and (scriptpy / name).is_file():
if (
not (scriptpy / (name + ".exe")).is_file()
and not (scriptpy / (name + ".bat")).is_file()
):
with open(scriptpy / (name + ".bat"), "w") as fd:
fd.write(contents)

def handle_specific_packages(self, package):
"""Packages requiring additional configuration"""
Expand Down