hmd-cli-python 0.2.115__py3-none-any.whl → 0.2.116__py3-none-any.whl

hmd_cli_python/hmd_cli_python.py

@@ -2,6 +2,7 @@ import os
 from pathlib import Path
 import configparser
 import shutil
+import toml
 from typing import Any, Dict, List
 from urllib.parse import urlparse, urlunparse
 
@@ -13,6 +14,11 @@ from hmd_cli_tools.build_tools import build_dir
 from hmd_cli_tools.hmd_cli_tools import get_cloud_region, get_session
 
 
+def is_uv_installed() -> bool:
+    """Check if uv is installed and available in PATH."""
+    return shutil.which("uv") is not None
+
+
 def publish(repo_name: str):
     with build_dir(repo_name):
         with cd("./src/python"):
@@ -62,6 +68,10 @@ def compile_requirements():
             "hmd-*",
         ]
 
+        # Add --uv flag only if uv is installed
+        if is_uv_installed():
+            command.insert(-2, "--uv")  # Insert before "-c"
+
         compiled_deps, stderr, exitcode = shell.exec_cmd(command)
         if exitcode != 0:
             raise Exception(f"Error evaluating dependencies. ({stderr.decode()})")
@@ -182,6 +192,52 @@ def login(
     with open(pip_conf_name, "w") as pc:
         pip_config.write(pc)
 
+    # Configure uv with extra-index-url in HMD_HOME
+    hmd_home = os.environ.get("HMD_HOME")
+    if hmd_home:
+        uv_config_dir = Path(hmd_home) / ".config"
+        uv_config_dir.mkdir(parents=True, exist_ok=True)
+        uv_config_path = uv_config_dir / "uv.toml"
+
+        # Build uv index configuration
+        uv_config = {}
+        if uv_config_path.exists():
+            with open(uv_config_path, "r") as f:
+                uv_config = toml.load(f)
+
+        # Create index entries for each registry
+        uv_indexes = []
+        for registry, config in registries.items():
+            registry_type = config.get("type", None)
+            url_parts = urlparse(config["url"])
+
+            if registry_type == "codeartifact":
+                token = fetch_codeartifact_token(
+                    hmd_region,
+                    profile,
+                    config["domain"],
+                    config["account"],
+                    config["repository"],
+                )
+                url_parts = url_parts._replace(
+                    netloc=f"aws:{token}@{url_parts.hostname}"
+                )
+            else:
+                username = config["username"]
+                password = config["password"]
+                url_parts = url_parts._replace(
+                    netloc=f"{username}:{password}@{url_parts.hostname}"
+                )
+
+            uv_indexes.append({"name": registry, "url": urlunparse(url_parts)})
+
+        # Update uv config with indexes
+        uv_config["index"] = uv_indexes
+
+        # Write uv config
+        with open(uv_config_path, "w") as f:
+            toml.dump(uv_config, f)
+
     if len(twine_urls) > 0:
         if not os.path.exists(Path.home() / ".pypirc"):
             with open(Path.home() / ".pypirc", "w") as twine:
@@ -204,8 +260,10 @@ def build(
     version = get_version()
     if os.name == "nt":
         py_cmd = "python"
+        venv_python = ".venv\\Scripts\\python.exe"
     else:
         py_cmd = "python3"
+        venv_python = ".venv/bin/python"
 
     repo_dir = os.getcwd()
     with build_dir(repo_name):
@@ -224,17 +282,93 @@ def build(
             if compiled_deps:
                 update_setup_py(compiled_deps)
 
-            if os.path.exists("test"):
-                shell.exec_cmd2(["pip3", "install", "--force-reinstall", "-e", "."])
+            # Check for both "test" and "tests" directories
+            test_dir_exists = os.path.exists("test") or os.path.exists("tests")
+
+            if test_dir_exists:
+                use_uv = is_uv_installed()
+
+                if use_uv:
+                    # Create virtual environment using uv
+                    print("Creating virtual environment with uv...")
+                    exitcode = shell.exec_cmd2(["uv", "venv"])
+                    if exitcode != 0:
+                        raise Exception("Error creating virtual environment with uv.")
+
+                    # Install the local package in editable mode using uv with --python flag
+                    print("Installing testing packages in virtual environment...")
+                    exitcode = shell.exec_cmd2(
+                        [
+                            "uv",
+                            "pip",
+                            "install",
+                            "--python",
+                            venv_python,
+                            "--upgrade",
+                            "pip",
+                            "pytest",
+                            "pytest-cov",
+                        ]
+                    )
+                    if exitcode != 0:
+                        raise Exception(
+                            "Error installing testing packages in virtual environment."
+                        )
+
+                    print("Installing local package in virtual environment...")
+                    exitcode = shell.exec_cmd2(
+                        ["uv", "pip", "install", "--python", venv_python, "-e", "."]
+                    )
+                    if exitcode != 0:
+                        raise Exception(
+                            "Error installing local package in virtual environment."
+                        )
+                else:
+                    # Create virtual environment using standard venv
+                    print("Creating virtual environment...")
+                    exitcode = shell.exec_cmd2([py_cmd, "-m", "venv", ".venv"])
+                    if exitcode != 0:
+                        raise Exception("Error creating virtual environment.")
+
+                    # Install testing packages using standard pip
+                    print("Installing testing packages in virtual environment...")
+                    exitcode = shell.exec_cmd2(
+                        [
+                            venv_python,
+                            "-m",
+                            "pip",
+                            "install",
+                            "--upgrade",
+                            "pip",
+                            "pytest",
+                            "pytest-cov",
+                        ]
+                    )
+                    if exitcode != 0:
+                        raise Exception(
+                            "Error installing testing packages in virtual environment."
+                        )
+
+                    print("Installing local package in virtual environment...")
+                    exitcode = shell.exec_cmd2(
+                        [venv_python, "-m", "pip", "install", "-e", "."]
+                    )
+                    if exitcode != 0:
+                        raise Exception(
+                            "Error installing local package in virtual environment."
+                        )
+
+                # Run pytest using the virtual environment's Python
                 packages = find_packages()
 
-                command = [py_cmd, "-m", "pytest"]
+                command = [venv_python, "-m", "pytest"]
                 for pkg in packages:
                     command += ["--cov", pkg]
 
                 command += ["--cov-report", "term"]
                 command += ["--cov-report", "html:coverage"]
 
+                print("Running tests...")
                 exitcode = shell.exec_cmd2(command)
 
                 if exitcode != 0:

{hmd_cli_python-0.2.115.dist-info → hmd_cli_python-0.2.116.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hmd-cli-python
-Version: 0.2.115
+Version: 0.2.116
 Summary: Implementation for python cli command
 Author: Jim Majure
 Author-email: jim.majure@hmdlabs.io
@@ -24,7 +24,7 @@ Requires-Dist: docutils==0.21.2
 Requires-Dist: durationpy==0.10
 Requires-Dist: google-auth==2.9.1
 Requires-Dist: hmd-cli-app~=1.2.616
-Requires-Dist: hmd-cli-tools~=1.2.242
+Requires-Dist: hmd-cli-tools~=1.2.243
 Requires-Dist: id==1.5.0
 Requires-Dist: idna==3.10
 Requires-Dist: importlib-metadata==8.7.0
@@ -71,6 +71,7 @@ Requires-Dist: rsa==4.8
 Requires-Dist: s3transfer==0.11.2
 Requires-Dist: secretstorage==3.3.3
 Requires-Dist: six==1.16.0
+Requires-Dist: toml==0.10.2
 Requires-Dist: tomli==2.2.1
 Requires-Dist: toposort==1.10
 Requires-Dist: twine==6.1.0

hmd_cli_python-0.2.116.dist-info/RECORD

@@ -0,0 +1,7 @@
+hmd_cli_python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+hmd_cli_python/controller.py,sha256=GOi6QDDC0d42eG6ohwWifCYlgkFzoFzIwzjPrW1jqiM,3675
+hmd_cli_python/hmd_cli_python.py,sha256=qAKd8Z3m2GhLzdnSNInVAdOTqBOvEJ-konrYC4QGZp8,14632
+hmd_cli_python-0.2.116.dist-info/METADATA,sha256=nAsIlEHY4niIGjsgsvsjOK0VSMp4B_bcPhyBEr6Cg2I,2641
+hmd_cli_python-0.2.116.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+hmd_cli_python-0.2.116.dist-info/top_level.txt,sha256=i2ZCGVJeOkzYWeWmczts0Y8Yv2QsTWcueX0_qWGbs7M,15
+hmd_cli_python-0.2.116.dist-info/RECORD,,

hmd_cli_python-0.2.115.dist-info/RECORD

@@ -1,7 +0,0 @@
-hmd_cli_python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hmd_cli_python/controller.py,sha256=GOi6QDDC0d42eG6ohwWifCYlgkFzoFzIwzjPrW1jqiM,3675
-hmd_cli_python/hmd_cli_python.py,sha256=6crcYGArjGZXSGpIImDfOBTUC_6y8SCFaBSyACWctNk,9276
-hmd_cli_python-0.2.115.dist-info/METADATA,sha256=vyJtzqdz7ThWDeY61mE7v3f8IAyCi5OuXkiMh3VRYjc,2613
-hmd_cli_python-0.2.115.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-hmd_cli_python-0.2.115.dist-info/top_level.txt,sha256=i2ZCGVJeOkzYWeWmczts0Y8Yv2QsTWcueX0_qWGbs7M,15
-hmd_cli_python-0.2.115.dist-info/RECORD,,