浏览代码

Revert "Allow python-tk"

This reverts commit 18a9d95d0074db767098a5c28f0956d6b8e60fdd.
Kevin Heinicke 1 年之前
父节点
当前提交
6e9d53e3b8
共有 1 个文件被更改,包括 6 次插入18 次删除
  1. 6 18
      scripts/brew_pyenv_setup.py

+ 6 - 18
scripts/brew_pyenv_setup.py

@@ -17,12 +17,6 @@ from dataclasses import dataclass
 import logging
 
 
-logging.basicConfig(
-    level=logging.INFO,
-    format="{%(pathname)s:%(lineno)d} %(levelname)s - %(message)s",
-)
-
-
 @dataclass
 class Binary:
     executable: str
@@ -45,9 +39,7 @@ DIRS_TO_LINK = ["include", "lib", "share"]
 installed_brew_packages = subprocess.getoutput("brew list").split()
 brew_prefix = Path(subprocess.getoutput("brew --prefix")) / "opt"
 
-installed_versions = [
-    p for p in installed_brew_packages if "python@" in p or "python-tk@" in p
-]
+installed_versions = [p for p in installed_brew_packages if "python@" in p]
 
 logging.info(f"Will link following installed versions: {installed_versions}")
 
@@ -58,17 +50,13 @@ logging.info(f"Will add all necessary links to {pyenv_dir}")
 for pyversion in installed_versions:
     logging.info(f"Check dir for {pyversion}")
     _, version = pyversion.split("@")
-    if "-tk" in pyversion:
-        link_dir = pyenv_dir / f"{version}-tk"
-    else:
-        link_dir = pyenv_dir / version
-    link_dir.mkdir(exist_ok=True)
+    (pyenv_dir / version).mkdir(exist_ok=True)
     for binary in BINARIES_TO_LINK:
-        (link_dir / "bin").mkdir(exist_ok=True)
+        (pyenv_dir / version / "bin").mkdir(exist_ok=True)
         target = (
             brew_prefix / pyversion / "bin" / binary.executable.format(version=version)
         )
-        source = link_dir / "bin" / binary.executable.format(version=version)
+        source = pyenv_dir / version / "bin" / binary.executable.format(version=version)
         if source.is_file():
             if source.resolve() != target.resolve():
                 logging.warning(
@@ -78,7 +66,7 @@ for pyversion in installed_versions:
 
         source.symlink_to(target)
         for link in binary.links:
-            source = link_dir / "bin" / link
+            source = pyenv_dir / version / "bin" / link
             target = brew_prefix / pyversion / "libexec/bin" / link
             if source.is_symlink():
                 logging.warning(f"Link {target} -> {source} already exists. Skipping.")
@@ -87,7 +75,7 @@ for pyversion in installed_versions:
 
     for dir_ in DIRS_TO_LINK:
         target = brew_prefix / pyversion / dir_
-        source = link_dir / dir_
+        source = pyenv_dir / version / dir_
         if source.is_dir():
             if source.resolve() != target.resolve():
                 logging.warning(