Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 0 additions & 7 deletions make.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ class WinPythonDistributionBuilder:
Builds a WinPython distribution.
"""

JULIA_PATH_REL = r"\t\Julia\bin" # Relative path within WinPython dir
NODEJS_PATH_REL = r"\n" # Relative path within WinPython dir

def __init__(
Expand Down Expand Up @@ -226,11 +225,6 @@ def get_tool_path(rel_path):
path = self.winpy_dir / rel_path if self.winpy_dir else None
return path if path and (path.is_file() or path.is_dir()) else None

julia_path = get_tool_path(self.JULIA_PATH_REL)
if julia_path:
julia_version = utils.get_julia_version(str(julia_path))
installed_tools.append(("Julia", julia_version))

nodejs_path = get_tool_path(self.NODEJS_PATH_REL)
if nodejs_path:
node_version = utils.get_nodejs_version(str(nodejs_path))
Expand Down Expand Up @@ -309,7 +303,6 @@ def pre_path_entries(self) -> list[str]:
"DLLs",
"Scripts",
r"..\t",
r".." + self.JULIA_PATH_REL,
r".." + self.NODEJS_PATH_REL,
]

Expand Down
10 changes: 0 additions & 10 deletions winpython/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -260,16 +260,6 @@ def exec_run_cmd(args, path=None):
return process.stdout


def get_r_version(path):
"""Return version of the R installed in *path*"""
return exec_shell_cmd(r"dir ..\README.R*", path).splitlines()[-3].split("-")[-1]


def get_julia_version(path):
"""Return version of the Julia installed in *path*"""
return exec_shell_cmd("julia.exe -v", path).splitlines()[0].split(" ")[-1]


def get_nodejs_version(path):
"""Return version of the Nodejs installed in *path*"""
return exec_shell_cmd("node -v", path).splitlines()[0]
Expand Down