Merge pull request #65 from MC-kit/devel

Devel

Author: dvp2015

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mapstp"
-version = "0.3.5"
+version = "0.3.6"
 description = "Transfers meta information from STP to MCNP"
 authors = ["dvp <[email protected]>"]
 homepage = "https://github.com/MC-kit/map-stp"

src/mapstp/cli/runner.py

@@ -172,9 +172,8 @@ def mapstp(
             joined_paths = join_paths(paths, separator)
             merge_paths(_output, joined_paths, path_info, _mcnp, used_materials_text)
     if excel:
-        start_cell_number = start_cell_number or (
-            find_first_cell_number(mcnp) if mcnp else 1
-        )
+        if not start_cell_number:
+            start_cell_number = find_first_cell_number(mcnp) if mcnp else 1
         _excel = Path(excel)
         can_override(_excel, override)
         create_excel(_excel, paths, path_info, separator, start_cell_number)

src/mapstp/materials_index.py

@@ -40,6 +40,7 @@ def load_materials_index(materials_index: str = None) -> pd.DataFrame:
         sheet_name=0,  # Use the first sheet, regardless of its name.
         usecols=["mnemonic", "number", "eff.density, g/cm3"],
         converters={"number": int, "eff.density, g/cm3": float},
+        engine="openpyxl",
     )
     materials = materials.loc[materials["mnemonic"].notnull()]
     materials.rename(columns={"eff.density, g/cm3": "density"}, inplace=True)

tools/clear-prev-dist-info.py

@@ -3,40 +3,84 @@
 
 This fixes https://github.com/python-poetry/poetry/issues/4526.
 Should be fixed in poetry 1.2, but it's not available yet.
-Run this if test_package() fails on pytest run.
-
+Run this if test_package() fails on pytest run
+(mckit of wrong version is found on python site).
 """
-import platform
+
+from typing import Optional, TypeVar
+
 import shutil
-import sys
+import site
+import subprocess
 
 from pathlib import Path
 
+import tomli
 
-def get_packages_dir() -> Path:
-    """Define packages location depending on system."""
-    system = platform.system()
-    if system == "Windows":
-        site_packages = Path("Lib", "site-packages")
-    else:
-        python = f"python{sys.version_info.major}.{sys.version_info.minor}"
-        site_packages = Path("lib", python, "site-packages")
-    result = Path(sys.prefix, site_packages)
-    if not result.is_dir():
-        raise ValueError(
-            f"Cannot find site package for system {system} in folder {result}"
+PathLike = TypeVar("PathLike", str, Path)
+
+
+def search_upwards_for_file(filename: PathLike) -> Optional[Path]:
+    """Search upward from the current directory for a `filename`.
+
+    Args:
+        filename: the file name to look for if available.
+
+    Returns:
+        Path: the location of the first file found or None, if none was found
+    """
+    d = Path.cwd()
+    root = Path(d.root)
+
+    while d != root:
+        attempt = d / filename
+        if attempt.exists():
+            return attempt
+        d = d.parent
+
+    return None
+
+
+def get_project_name() -> str:
+    """Find project name, which is prefix for info distributions.
+
+    Returns:
+        str: the name of package specified in pyproject.toml
+
+    Raises:
+        EnvironmentError: if file pyproject.toml is not found.
+    """
+    pyproject_path = search_upwards_for_file("pyproject.toml")
+    if pyproject_path is None:
+        raise EnvironmentError(
+            "Illegal directory: cannot find file pyproject.toml "
+            f"from current directory: {Path.cwd()}"
         )
-    return result
+    pyproject = tomli.loads(pyproject_path.read_text())
+    name = pyproject["tool"]["poetry"]["name"].replace("-", "_")
+    print(f"Package {name} is found in {pyproject_path.absolute()}")
+    return name
+
+
+def clear_previous_distributions_info() -> None:
+    """Remove all dist-info folders from previous installations."""
+    packages_dir = Path(site.getsitepackages()[0])
+    name = get_project_name()
+    dists = list(packages_dir.glob(f"{name}-*.dist-info"))
+    if dists:
+        for dist in dists:
+            print("Removing distribution", dist)
+            shutil.rmtree(dist)
+    else:
+        print("Nothing to remove for package", name)
 
 
-def clear_mapstp_info_dists() -> None:
-    """Remove all mapstp dist-info folders."""
-    packages_dir = get_packages_dir()
-    dists = list(packages_dir.glob("mapstp-*.dist-info"))
-    for dist in dists:
-        shutil.rmtree(dist)
-    print("Run `poetry install` after running this script.")
+def run_poetry_install() -> None:
+    """Refresh installation of the package."""
+    print("Running `poetry install`.")
+    subprocess.run(["poetry", "install"])
 
 
 if __name__ == "__main__":
-    clear_mapstp_info_dists()
+    clear_previous_distributions_info()
+    run_poetry_install()