qbraid-cli 0.8.5a0__tar.gz → 0.8.5a1__tar.gz

{qbraid_cli-0.8.5a0 → qbraid_cli-0.8.5a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qbraid-cli
-Version: 0.8.5a0
+Version: 0.8.5a1
 Summary: Command Line Interface for interacting with all parts of the qBraid platform.
 Author-email: qBraid Development Team <contact@qbraid.com>
 License: Proprietary

{qbraid_cli-0.8.5a0 → qbraid_cli-0.8.5a1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qbraid-cli"
-version = "0.8.5-alpha"
+version = "0.8.5a1"
 description = "Command Line Interface for interacting with all parts of the qBraid platform."
 readme = "README.md"
 authors = [{ name = "qBraid Development Team", email = "contact@qbraid.com" }]

{qbraid_cli-0.8.5a0 → qbraid_cli-0.8.5a1}/qbraid_cli/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.dev1+gbba28a4'
-__version_tuple__ = version_tuple = (0, 1, 'dev1', 'gbba28a4')
+__version__ = version = '0.1.dev1+g1ab987a.d20240820'
+__version_tuple__ = version_tuple = (0, 1, 'dev1', 'g1ab987a.d20240820')

{qbraid_cli-0.8.5a0 → qbraid_cli-0.8.5a1}/qbraid_cli/admin/app.py

@@ -3,10 +3,8 @@
 
 """
 Module defining commands in the 'qbraid admin' namespace.
-"""
-
-from typing import List
 
+"""
 import typer
 
 from qbraid_cli.admin.buildlogs import buildlogs_app
@@ -21,7 +19,7 @@ admin_app.add_typer(buildlogs_app, name="buildlogs")
 
 @admin_app.command(name="headers")
 def admin_headers(
-    src_paths: List[str] = typer.Argument(
+    src_paths: list[str] = typer.Argument(
         ..., help="Source file or directory paths to verify.", callback=validate_paths_exist
     ),
     header_type: str = typer.Option(
@@ -31,7 +29,7 @@ def admin_headers(
         help="Type of header to use ('default' or 'gpl').",
         callback=validate_header_type,
     ),
-    skip_files: List[str] = typer.Option(
+    skip_files: list[str] = typer.Option(
         [], "--skip", "-s", help="Files to skip during verification.", callback=validate_paths_exist
     ),
     fix: bool = typer.Option(

{qbraid_cli-0.8.5a0 → qbraid_cli-0.8.5a1}/qbraid_cli/admin/headers.py

@@ -6,7 +6,7 @@ Script to verify qBraid copyright file headers
 
 """
 import os
-from typing import List, Optional
+from typing import Optional
 
 import typer
 from rich.console import Console
@@ -37,9 +37,9 @@ HEADER_TYPES = {
 
 
 def check_and_fix_headers(
-    src_paths: List[str],
+    src_paths: list[str],
     header_type: str = "default",
-    skip_files: Optional[List[str]] = None,
+    skip_files: Optional[list[str]] = None,
     fix: bool = False,
 ) -> None:
     """Script to add or verify qBraid copyright file headers"""

{qbraid_cli-0.8.5a0 → qbraid_cli-0.8.5a1}/qbraid_cli/admin/validation.py

@@ -7,7 +7,6 @@ Module for validating command arguments for qBraid admin commands.
 """
 
 import os
-from typing import List
 
 import typer
 
@@ -21,7 +20,7 @@ def validate_header_type(value: str) -> str:
     return validate_item(value, header_types, "Header type")
 
 
-def validate_paths_exist(paths: List[str]) -> List[str]:
+def validate_paths_exist(paths: list[str]) -> list[str]:
     """Verifies that each path in the provided list exists."""
     non_existent_paths = [path for path in paths if not os.path.exists(path)]
     if non_existent_paths:

{qbraid_cli-0.8.5a0 → qbraid_cli-0.8.5a1}/qbraid_cli/configure/actions.py

@@ -9,7 +9,7 @@ Module defining actions invoked by 'qbraid configure' command(s).
 import configparser
 import re
 from copy import deepcopy
-from typing import Dict, Optional
+from typing import Optional
 
 import typer
 from qbraid_core.config import (
@@ -53,7 +53,7 @@ def prompt_for_config(
     config: configparser.ConfigParser,
     section: str,
     key: str,
-    default_values: Optional[Dict[str, str]] = None,
+    default_values: Optional[dict[str, str]] = None,
 ) -> str:
     """Prompt the user for a configuration setting, showing the current value as default."""
     default_values = default_values or {}

{qbraid_cli-0.8.5a0 → qbraid_cli-0.8.5a1}/qbraid_cli/devices/app.py

@@ -6,7 +6,7 @@ Module defining commands in the 'qbraid devices' namespace.
 
 """
 
-from typing import Any, Callable, Optional, Tuple
+from typing import Any, Callable, Optional
 
 import typer
 from rich.console import Console
@@ -42,14 +42,14 @@ def devices_list(  # pylint: disable=too-many-branches
     if provider:
         filters["provider"] = provider
 
-    def import_devices() -> Tuple[Any, Callable]:
+    def import_devices() -> tuple[Any, Callable]:
         from qbraid_core.services.quantum import QuantumClient, process_device_data
 
         client = QuantumClient()
 
         return client, process_device_data
 
-    result: Tuple[Callable, Callable] = run_progress_task(import_devices)
+    result: tuple[Callable, Callable] = run_progress_task(import_devices)
     client, process_device_data = result
     raw_data = client.search_devices(filters)
     device_data, msg = process_device_data(raw_data)

{qbraid_cli-0.8.5a0 → qbraid_cli-0.8.5a1}/qbraid_cli/envs/app.py

@@ -10,7 +10,7 @@ import shutil
 import subprocess
 import sys
 from pathlib import Path
-from typing import TYPE_CHECKING, Optional, Tuple
+from typing import TYPE_CHECKING, Optional
 
 import typer
 from rich.console import Console
@@ -41,14 +41,14 @@ def envs_create(  # pylint: disable=too-many-statements
     """Create a new qBraid environment."""
     env_description = description or ""
 
-    def create_environment(*args, **kwargs) -> "Tuple[dict, EMC]":
+    def create_environment(*args, **kwargs) -> "tuple[dict, EMC]":
         """Create a qBraid environment."""
         from qbraid_core.services.environments.client import EnvironmentManagerClient
 
         client = EnvironmentManagerClient()
         return client.create_environment(*args, **kwargs), client
 
-    def gather_local_data() -> Tuple[Path, str]:
+    def gather_local_data() -> tuple[Path, str]:
         """Gather environment data and return the slug."""
         from qbraid_core.services.environments import get_default_envs_paths
 
@@ -155,7 +155,7 @@ def envs_remove(
         emc = EnvironmentManagerClient()
         emc.delete_environment(slug)
 
-    def gather_local_data(env_name: str) -> Tuple[Path, str]:
+    def gather_local_data(env_name: str) -> tuple[Path, str]:
         """Get environment path and slug from name (alias)."""
         installed, aliases = installed_envs_data()
         for alias, slug in aliases.items():

{qbraid_cli-0.8.5a0 → qbraid_cli-0.8.5a1}/qbraid_cli/handlers.py

@@ -10,7 +10,7 @@ and executing operations with progress tracking within the qBraid CLI.
 import os
 import traceback
 from pathlib import Path
-from typing import Any, Callable, List, Optional, Union
+from typing import Any, Callable, Optional, Union
 
 import typer
 from rich.console import Console
@@ -136,13 +136,13 @@ def run_progress_task(
             return handle_error(message=custom_message)
 
 
-def _format_list_items(items: List[str]) -> str:
+def _format_list_items(items: list[str]) -> str:
     """
     Formats a list of items as a string with values comma-separated and
     each item surrounded by single quotes
 
     Args:
-        items (List[str]): The list of items to format.
+        items (list[str]): The list of items to format.
 
     Returns:
         str: The formatted string.
@@ -151,14 +151,14 @@ def _format_list_items(items: List[str]) -> str:
 
 
 def validate_item(
-    value: Optional[str], allowed_items: List[str], item_type: str
+    value: Optional[str], allowed_items: list[str], item_type: str
 ) -> Union[str, None]:
     """
     Generic item validation function.
 
     Args:
         value (optional, str): The value to validate.
-        allowed_items (List[str]): A list of allowed items.
+        allowed_items (list[str]): A list of allowed items.
         item_type (str): A description of the item type (e.g., 'provider', 'status', 'type') for
                          error messages.
 

{qbraid_cli-0.8.5a0 → qbraid_cli-0.8.5a1}/qbraid_cli/jobs/app.py

@@ -5,7 +5,7 @@
 Module defining commands in the 'qbraid jobs' namespace.
 
 """
-from typing import Any, Callable, Dict, Tuple
+from typing import Any, Callable
 
 import typer
 from rich.console import Console
@@ -66,7 +66,7 @@ def jobs_state(
     )
 ) -> None:
     """Display the state of qBraid Quantum Jobs for the current environment."""
-    result: Tuple[str, Dict[str, Tuple[bool, bool]]] = run_progress_get_state(library)
+    result: tuple[str, dict[str, tuple[bool, bool]]] = run_progress_get_state(library)
     python_exe, state_values = result
     state_values = dict(sorted(state_values.items()))
 
@@ -95,14 +95,14 @@ def jobs_list(
 ) -> None:
     """List qBraid Quantum Jobs."""
 
-    def import_jobs() -> Tuple[Any, Callable]:
+    def import_jobs() -> tuple[Any, Callable]:
         from qbraid_core.services.quantum import QuantumClient, process_job_data
 
         client = QuantumClient()
 
         return client, process_job_data
 
-    result: Tuple[Any, Callable] = run_progress_task(import_jobs)
+    result: tuple[Any, Callable] = run_progress_task(import_jobs)
     client, process_job_data = result
     # https://github.com/qBraid/api/issues/644
     # raw_data = client.search_jobs(query={"numResults": limit})

{qbraid_cli-0.8.5a0 → qbraid_cli-0.8.5a1}/qbraid_cli/jobs/toggle_braket.py

@@ -10,7 +10,7 @@ import os
 import re
 import subprocess
 from pathlib import Path
-from typing import Optional, Tuple
+from typing import Optional
 
 import requests
 import typer
@@ -34,14 +34,14 @@ def fetch_botocore_version() -> Optional[str]:
     return None
 
 
-def get_package_data(package: str) -> Tuple[str, str, str, str]:
+def get_package_data(package: str) -> tuple[str, str, str, str]:
     """Retrieve package version and location data.
 
     Args:
         package (str): The name of the package to retrieve data for.
 
     Returns:
-        Tuple[str, str, str, str]: The installed and latest versions of the package, and the
+        tuple[str, str, str, str]: The installed and latest versions of the package, and the
                                    local site-packages path where it is / would be installed.
 
     Raises:
@@ -60,7 +60,7 @@ def get_package_data(package: str) -> Tuple[str, str, str, str]:
         installed_version = get_local_package_version(package, python_path=python_pathlib)
 
         latest_version = None
-        if package == "botocore":
+        if package in ["botocore", "boto3"]:
             latest_version = fetch_botocore_version()
         latest_version = latest_version or get_latest_package_version(package)
 
@@ -74,7 +74,7 @@ def confirm_updates(
     mode: str,
     site_packages_path: str,
     installed_version: Optional[str] = None,
-    latest_version: Optional[str] = None,
+    target_version: Optional[str] = None,
 ) -> None:
     """
     Prompts the user to proceed with enabling or disabling qBraid Quantum Jobs.
@@ -84,7 +84,7 @@ def confirm_updates(
         site_packages_path (str): The location of the site-packages directory where
                                   target package(s) will be updated.
         installed_version (optional, str): The installed version of the target package.
-        latest_version (optional, str): The latest version of the target package available on PyPI.
+        target_version (optional, str): The latest version of the target package available on PyPI.
 
     Raises:
         ValueError: If an invalid mode is provided.
@@ -105,12 +105,12 @@ def confirm_updates(
     typer.echo(f"\n==> WARNING: {provider}/{core_package} package required <==")
     if (
         installed_version is not None
-        and latest_version is not None
-        and installed_version != latest_version
+        and target_version is not None
+        and installed_version != target_version
     ):
-        typer.echo(f"==> WARNING: A newer version of {versioned_package} exists. <==")
+        typer.echo(f"==> WARNING: A different version of {versioned_package} is required. <==")
         typer.echo(f"  current version: {installed_version}")
-        typer.echo(f"  latest version: {latest_version}")
+        typer.echo(f"  target version: {target_version}")
 
     gerund = mode[:-2].capitalize() + "ing"
 
@@ -146,12 +146,12 @@ def aws_configure_dummy() -> None:
 
 def enable_braket(auto_confirm: bool = False):
     """Enable qBraid quantum jobs for Amazon Braket."""
-    installed, latest, path, python_exe = run_progress_task(
+    installed, target, path, python_exe = run_progress_task(
         get_package_data, "boto3", description="Solving environment..."
     )
 
     if not auto_confirm:
-        confirm_updates("enable", path, installed_version=installed, latest_version=latest)
+        confirm_updates("enable", path, installed_version=installed, target_version=target)
     typer.echo("")
 
     aws_configure_dummy()  # TODO: possibly add another confirmation for writing aws config files
@@ -165,10 +165,11 @@ def enable_braket(auto_confirm: bool = False):
                 "install",
                 "amazon-braket-sdk",
                 "--upgrade",
-                "--upgrade-strategy eager",
+                "--upgrade-strategy",
+                "eager",
             ]
         )
-        subprocess.check_call([python_exe, "-m", "pip", "install", f"boto3=={latest}"])
+        subprocess.check_call([python_exe, "-m", "pip", "install", f"boto3=={target}"])
         subprocess.check_call([python_exe, "-m", "pip", "uninstall", "botocore", "-y", "--quiet"])
         subprocess.check_call(
             [python_exe, "-m", "pip", "install", "git+https://github.com/qBraid/botocore.git"]

{qbraid_cli-0.8.5a0 → qbraid_cli-0.8.5a1}/qbraid_cli/jobs/validation.py

@@ -6,14 +6,14 @@ Module for validating command arguments for qBraid Quantum Jobs.
 
 """
 import sys
-from typing import Any, Callable, Dict, Optional, Tuple
+from typing import Any, Callable, Optional
 
 import typer
 from rich.console import Console
 
 from qbraid_cli.handlers import handle_error, run_progress_task, validate_item
 
-LEGACY_ARGS: Dict[str, str] = {
+LEGACY_ARGS: dict[str, str] = {
     "amazon_braket": "braket",
     "aws_braket": "braket",
 }
@@ -39,14 +39,14 @@ def validate_library(value: str) -> str:
     return validate_item(value, qjobs_libs, "Library")
 
 
-def get_state(library: Optional[str] = None) -> Tuple[str, Dict[str, Tuple[bool, bool]]]:
+def get_state(library: Optional[str] = None) -> tuple[str, dict[str, tuple[bool, bool]]]:
     """Get the state of qBraid Quantum Jobs for the specified library."""
     from qbraid_core.services.quantum import QuantumClient
 
     jobs_state = QuantumClient.qbraid_jobs_state(device_lib=library)
 
     python_exe: str = jobs_state.get("exe", sys.executable)
-    libs_state: Dict[str, Any] = jobs_state.get("libs", {})
+    libs_state: dict[str, Any] = jobs_state.get("libs", {})
 
     state_values = {
         lib: (state["supported"], state["enabled"]) for lib, state in libs_state.items()
@@ -57,7 +57,7 @@ def get_state(library: Optional[str] = None) -> Tuple[str, Dict[str, Tuple[bool,
 
 def run_progress_get_state(
     library: Optional[str] = None,
-) -> Tuple[str, Dict[str, Tuple[bool, bool]]]:
+) -> tuple[str, dict[str, tuple[bool, bool]]]:
     """Run get state function with rich progress UI."""
     return run_progress_task(
         get_state,

{qbraid_cli-0.8.5a0 → qbraid_cli-0.8.5a1}/qbraid_cli/pip/hooks.py

@@ -36,7 +36,7 @@ def find_matching_prefix(python_executable: Path, path_list: list[Path]) -> Opti
 
     Args:
         python_executable (Path): The path to the Python executable.
-        path_list (List[Path]): A list of paths to check against the Python executable path.
+        path_list (list[Path]): A list of paths to check against the Python executable path.
 
     Returns:
         Optional[Path]: The first matching path that is a prefix of the Python executable path,

{qbraid_cli-0.8.5a0 → qbraid_cli-0.8.5a1}/qbraid_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qbraid-cli
-Version: 0.8.5a0
+Version: 0.8.5a1
 Summary: Command Line Interface for interacting with all parts of the qBraid platform.
 Author-email: qBraid Development Team <contact@qbraid.com>
 License: Proprietary

{qbraid_cli-0.8.5a0 → qbraid_cli-0.8.5a1}/tests/jobs/test_jobs_toggle_braket_confirm.py

@@ -49,4 +49,4 @@ def test_version_warning():
     latest_version = "1.2.0"
     with patch("typer.echo") as mock_echo, patch("typer.confirm", return_value=True):
         confirm_updates("enable", "/fake/site-packages", installed_version, latest_version)
-        mock_echo.assert_any_call("==> WARNING: A newer version of boto3 exists. <==")
+        mock_echo.assert_any_call("==> WARNING: A different version of boto3 is required. <==")

{qbraid_cli-0.8.5a0 → qbraid_cli-0.8.5a1}/tests/jobs/test_jobs_toggle_braket_enable.py

@@ -60,7 +60,8 @@ def test_subprocess_calls():
                     "install",
                     "amazon-braket-sdk",
                     "--upgrade",
-                    "--upgrade-strategy eager",
+                    "--upgrade-strategy",
+                    "eager",
                 ]
             ),
             call([mock_python_path, "-m", "pip", "install", f"boto3=={version}"]),

{qbraid_cli-0.8.5a0 → qbraid_cli-0.8.5a1}/tools/create_dev_build.sh

@@ -73,7 +73,7 @@ fi
 
 # Update the version in the version file
 echo "Setting version to ${DEV_VERSION}"
-toml set "$PYPROJECT_TOML_PATH" "project.version" "$DEV_VERSION" > tmp.$$.toml && mv tmp.$$.toml "$PYPROJECT_TOML_PATH"
+toml set --toml-path "$PYPROJECT_TOML_PATH" "project.version" "$DEV_VERSION"
 
 # Check if `build` module is installed
 if ! python -c "import build" 2>/dev/null; then
@@ -85,4 +85,4 @@ fi
 echo "Building the project..."
 python -m build --outdir "${OUT_DIR}"
 
-echo "Done."
+echo "Done."

qbraid_cli-0.8.5a1/tools/stamp_pre_release.py

@@ -0,0 +1,36 @@
+# Copyright (c) 2024, qBraid Development Team
+# All rights reserved.
+
+"""
+Script for getting/bumping the next pre-release version.
+
+"""
+import pathlib
+import re
+import sys
+
+from qbraid_core.system.versions import get_prelease_version
+
+
+def replace_version_format(v: str) -> str:
+    """
+    Replace the version format from "x.y.z-abc.def" to "x.y.zabcdef".
+
+    Args:
+        v (str): The version string to transform.
+
+    Returns:
+        str: The transformed version string.
+    """
+    pattern = r"-(\w+)\.(\d+)"
+    new_version = re.sub(pattern, r"\1\2", v)
+    return new_version
+
+
+if __name__ == "__main__":
+
+    package_name = sys.argv[1]
+    root = pathlib.Path(__file__).parent.parent.resolve()
+    version = get_prelease_version(root, package_name)
+    formatted_version = replace_version_format(version)
+    print(formatted_version)

qbraid_cli-0.8.5a0/tools/stamp_pre_release.py

@@ -1,18 +0,0 @@
-# Copyright (c) 2024, qBraid Development Team
-# All rights reserved.
-
-"""
-Script for getting/bumping the next pre-release version.
-
-"""
-import pathlib
-import sys
-
-from qbraid_core.system.versions import get_prelease_version
-
-if __name__ == "__main__":
-
-    package_name = sys.argv[1]
-    root = pathlib.Path(__file__).parent.parent.resolve()
-    version = get_prelease_version(root, package_name)
-    print(version)