Merge pull request #1487 from stonebig/master

stonebig · web-flow · commit bba942e81790 · 2025-03-02T10:28:10.000+01:00
remove Julia detection from build
diff --git a/make.py b/make.py
@@ -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__(
@@ -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))
@@ -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,
         ]
 
diff --git a/winpython/utils.py b/winpython/utils.py
@@ -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]
