moducomp 0.7.18__tar.gz → 0.7.19__tar.gz

{moducomp-0.7.18 → moducomp-0.7.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: moducomp
-Version: 0.7.18
+Version: 0.7.19
 Summary: moducomp: metabolic module completeness and complementarity for microbiomes.
 Keywords: bioinformatics,microbiome,metabolic,kegg,genomics
 Author-email: "Juan C. Villada" <jvillada@lbl.gov>

{moducomp-0.7.18 → moducomp-0.7.19}/moducomp/__init__.py

@@ -2,7 +2,7 @@
 moducomp: metabolic module completeness and complementarity for microbiomes.
 """
 
-__version__ = "0.7.18"
+__version__ = "0.7.19"
 __author__ = "Juan C. Villada"
 __email__ = "jvillada@lbl.gov"
 __title__ = "moducomp"

{moducomp-0.7.18 → moducomp-0.7.19}/moducomp/moducomp.py

@@ -419,16 +419,38 @@ def _set_configured_eggnog_dir(path: Path, logger: Optional[logging.Logger] = No
 
 
 def _find_eggnog_downloader() -> Optional[str]:
-    for name in ("download_eggnog_data.py", "download_eggnog_data"):
-        path = shutil.which(name)
-        if path:
+    names = ("download_eggnog_data.py", "download_eggnog_data")
+    candidate_dirs = []
+    try:
+        candidate_dirs.append(Path(sys.executable).resolve().parent)
+    except Exception:
+        pass
+    candidate_dirs.extend(
+        [
+            Path(sys.prefix) / "bin",
+            Path(sys.exec_prefix) / "bin",
+        ]
+    )
+    for path_entry in os.environ.get("PATH", "").split(os.pathsep):
+        if path_entry:
+            candidate_dirs.append(Path(path_entry))
+
+    seen = set()
+    for directory in candidate_dirs:
+        if not directory or str(directory) in seen:
+            continue
+        seen.add(str(directory))
+        for name in names:
+            candidate = directory / name
+            if not candidate.is_file():
+                continue
             try:
-                wrapper_text = Path(path).read_text(encoding="utf-8", errors="ignore")
+                wrapper_text = candidate.read_text(encoding="utf-8", errors="ignore")
             except OSError:
                 wrapper_text = ""
             if "moducomp.moducomp" in wrapper_text:
                 continue
-            return path
+            return str(candidate)
     return None
 
 def run_subprocess_with_logging(
@@ -3872,7 +3894,7 @@ def setup(
             emit_error(message, logger)
             raise typer.Exit(1)
 
-        cmd = [downloader, "--data_dir", str(target_dir)]
+        cmd = [sys.executable, downloader, "--data_dir", str(target_dir)]
         if yes:
             cmd.append("-y")
         if force:

{moducomp-0.7.18 → moducomp-0.7.19}/recipe.yaml

@@ -1,5 +1,5 @@
 context:
-  version: 0.7.18
+  version: 0.7.19
 
 package:
   name: moducomp
@@ -7,7 +7,7 @@ package:
 
 source:
 - url: https://pypi.org/packages/source/m/moducomp/moducomp-${{ version }}.tar.gz
-  sha256: c2780812e19805007dbb85edb7fe5ca6e2d7f971c13114e5eb9ab9780cc48a28
+  sha256: 36c60b962923deef8fffb20eca0753df378cfe95a1b9148184a569096deac217
 
 build:
   script: