qbraid-cli 0.8.4a0__tar.gz → 0.8.4b0__tar.gz

qbraid_cli-0.8.4b0/.github/workflows/bump-version.yml

@@ -0,0 +1,71 @@
+name: Bump Version
+
+on:
+  workflow_dispatch:
+    inputs:
+      bump_type:
+        description: 'Select the version bump type'
+        required: true
+        type: choice
+        options:
+          - major
+          - minor
+          - patch
+        default: 'patch'
+
+jobs:
+  bump-version:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: 'main'
+
+      - name: Create feature branch
+        run: git checkout -b qbraid-bot/${{ github.run_id }}
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install "qbraid-core>=0.1.16"
+
+      - name: Setup Git config
+        run: |
+          git config --global user.name 'qbraidTeam'
+          git config --global user.email 'qbraid.team@qbraid.com'
+
+      - name: Bump version, commit and push
+        id: bump_version
+        run: |
+          BUMP_TYPE=${{ github.event.inputs.bump_type }}
+          VERSION=$(python3 tools/bump_version.py $BUMP_TYPE)
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          git commit -am "Bump $BUMP_TYPE version to $VERSION"
+          git push origin qbraid-bot/${{ github.run_id }}
+
+      - name: Create Pull Request
+        id: create_pr
+        run: |
+          VERSION=${{ steps.bump_version.outputs.version }}
+          PR_URL=$(gh pr create -B main -H qbraid-bot/${{ github.run_id }} --title "Bump project version to $VERSION" --body "This PR bumps the project version to $VERSION")
+          PR_NUMBER=$(echo "$PR_URL" | grep -o '[0-9]*$')
+          echo "url=$PR_URL" >> $GITHUB_OUTPUT
+          echo "number=$PR_NUMBER" >> $GITHUB_OUTPUT
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Summary
+        run: |
+          VERSION=${{ steps.bump_version.outputs.version }}
+          PR_URL=${{ steps.create_pr.outputs.url }}
+          PR_NUMBER=${{ steps.create_pr.outputs.number }}
+          echo "Opened PR [#$PR_NUMBER]($PR_URL) to update project to version **$VERSION**." >> $GITHUB_STEP_SUMMARY

qbraid_cli-0.8.4b0/.github/workflows/tag-on-merge.yml

@@ -0,0 +1,36 @@
+name: Tag on PR Merge
+
+on:
+  pull_request:
+    types: [closed]
+
+jobs:
+  tag-version:
+    if: github.event.pull_request.merged == true && github.event.pull_request.user.login == 'github-actions[bot]' && startsWith(github.event.pull_request.title, 'Bump project version to ')
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Extract version
+        id: extract_version
+        run: |
+          VERSION=$(echo '${{ github.event.pull_request.title }}' | sed -E 's/Bump project version to (.*)/\1/')
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: 'main'
+
+      - name: Setup Git config
+        run: |
+          git config --global user.name 'qbraidTeam'
+          git config --global user.email 'qbraid.team@qbraid.com'
+
+      - name: Create Tag
+        run: |
+          VERSION=${{ steps.extract_version.outputs.version }}
+          git tag v$VERSION
+          git push origin v$VERSION
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

{qbraid_cli-0.8.4a0 → qbraid_cli-0.8.4b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qbraid-cli
-Version: 0.8.4a0
+Version: 0.8.4b0
 Summary: Command Line Interface for interacting with all parts of the qBraid platform.
 Author-email: qBraid Development Team <contact@qbraid.com>
 License: Proprietary
@@ -29,7 +29,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: typer>=0.12.1
 Requires-Dist: rich>=10.11.0
-Requires-Dist: qbraid-core[environments]==0.1.17a0
+Requires-Dist: qbraid-core[environments]>=0.1.17b0
 Provides-Extra: jobs
 Requires-Dist: amazon-braket-sdk>=1.48.1; extra == "jobs"
 Provides-Extra: dev

{qbraid_cli-0.8.4a0 → qbraid_cli-0.8.4b0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qbraid-cli"
-version = "0.8.4-alpha"
+version = "0.8.4-beta"
 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" }]
@@ -29,7 +29,7 @@ classifiers = [
 dependencies = [
     "typer>=0.12.1",
     "rich>=10.11.0",
-    "qbraid-core[environments]==0.1.17a0",
+    "qbraid-core[environments]>=0.1.17b0",
 ]
 requires-python = ">= 3.9"
 

{qbraid_cli-0.8.4a0 → qbraid_cli-0.8.4b0}/qbraid_cli/_version.py

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

{qbraid_cli-0.8.4a0 → qbraid_cli-0.8.4b0}/qbraid_cli/envs/create.py

@@ -5,10 +5,6 @@
 Module supporting 'qbraid envs create' command.
 
 """
-import json
-import os
-import shutil
-import sys
 
 
 def create_venv(*args, **kwargs) -> None:
@@ -20,14 +16,14 @@ def create_venv(*args, **kwargs) -> None:
 
 def update_state_json(*ags, **kwargs) -> None:
     """Update the state.json file for the qBraid environment."""
-    from qbraid_core.services.environments.state import update_install_status
+    from qbraid_core.services.environments.state import update_state_json as update_state
 
-    return update_install_status(*ags, **kwargs)
+    return update_state(*ags, **kwargs)
 
 
 def create_qbraid_env_assets(slug: str, alias: str, kernel_name: str, slug_path: str) -> None:
     """Create a qBraid environment including python venv, PS1 configs,
     kernel resource files, and qBraid state.json."""
-    from qbraid_core.services.environments.create import create_qbraid_env_assets
+    from qbraid_core.services.environments.create import create_qbraid_env_assets as create_assets
 
-    return create_qbraid_env_assets(slug, alias, kernel_name, slug_path)
+    return create_assets(slug, alias, kernel_name, slug_path)

{qbraid_cli-0.8.4a0 → qbraid_cli-0.8.4b0}/qbraid_cli/kernels/app.py

@@ -2,13 +2,10 @@
 # All rights reserved.
 
 """
-Module defining commands in the 'qbraid jobs' namespace.
+Module defining commands in the 'qbraid kernels' namespace.
 
 """
-from pathlib import Path
-
 import typer
-from qbraid_core.services.environments.kernels import add_kernels, list_kernels, remove_kernels
 from rich.console import Console
 
 from qbraid_cli.handlers import handle_error
@@ -19,9 +16,11 @@ kernels_app = typer.Typer(help="Manage qBraid kernels.")
 @kernels_app.command(name="list")
 def kernels_list():
     """List all available kernels."""
+    from qbraid_core.services.environments.kernels import get_all_kernels
+
     console = Console()
     # Get the list of kernelspecs
-    kernelspecs = list_kernels()
+    kernelspecs: dict = get_all_kernels()
 
     if len(kernelspecs) == 0:
         console.print("No qBraid kernels are active.")
@@ -31,16 +30,25 @@ def kernels_list():
     longest_kernel_name = max(len(kernel_name) for kernel_name in kernelspecs)
     spacing = longest_kernel_name + 10
 
-    console.print("# qbraid kernels:\n#\n")
+    output_lines = []
+    output_lines.append("# qbraid kernels:")
+    output_lines.append("#")
+    output_lines.append("")
 
     # Ensure 'python3' kernel is printed first if it exists
     default_kernel_name = "python3"
     python3_kernel_info = kernelspecs.pop(default_kernel_name, None)
     if python3_kernel_info:
-        console.print(f"{default_kernel_name.ljust(spacing)}{python3_kernel_info['resource_dir']}")
+        line = f"{default_kernel_name.ljust(spacing)}{python3_kernel_info['resource_dir']}"
+        output_lines.append(line)
     # print rest of the kernels
     for kernel_name, kernel_info in sorted(kernelspecs.items()):
-        console.print(f"{kernel_name.ljust(spacing)}{kernel_info['resource_dir']}")
+        line = f"{kernel_name.ljust(spacing)}{kernel_info['resource_dir']}"
+        output_lines.append(line)
+
+    final_output = "\n".join(output_lines)
+
+    console.print(final_output)
 
 
 @kernels_app.command(name="add")
@@ -50,15 +58,18 @@ def kernels_add(
     )
 ):
     """Add a kernel."""
+    from qbraid_core.services.environments.kernels import add_kernels
 
     try:
         add_kernels(environment)
-    except ValueError as e:
+    except ValueError:
         handle_error(
-            message=e,
-            include_traceback=False,
+            message="Failed to add kernel(s). Please verify that the environment exists.",
+            include_traceback=True,
         )
-        return
+
+    console = Console()
+    console.print(f"\nSuccessfully added '{environment}' kernel(s).", highlight=False)
 
 
 @kernels_app.command(name="remove")
@@ -69,11 +80,18 @@ def kernels_remove(
     )
 ):
     """Remove a kernel."""
+    from qbraid_core.services.environments.kernels import remove_kernels
+
     try:
         remove_kernels(environment)
     except ValueError:
-        handle_error(message=f"Environment '{environment}' not found.", include_traceback=False)
-        return
+        handle_error(
+            message="Failed to remove kernel(s). Please verify that the environment exists.",
+            include_traceback=True,
+        )
+
+    console = Console()
+    console.print(f"\nSuccessfully removed '{environment}' kernel(s).", highlight=False)
 
 
 if __name__ == "__main__":

{qbraid_cli-0.8.4a0 → qbraid_cli-0.8.4b0}/qbraid_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qbraid-cli
-Version: 0.8.4a0
+Version: 0.8.4b0
 Summary: Command Line Interface for interacting with all parts of the qBraid platform.
 Author-email: qBraid Development Team <contact@qbraid.com>
 License: Proprietary
@@ -29,7 +29,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: typer>=0.12.1
 Requires-Dist: rich>=10.11.0
-Requires-Dist: qbraid-core[environments]==0.1.17a0
+Requires-Dist: qbraid-core[environments]>=0.1.17b0
 Provides-Extra: jobs
 Requires-Dist: amazon-braket-sdk>=1.48.1; extra == "jobs"
 Provides-Extra: dev

{qbraid_cli-0.8.4a0 → qbraid_cli-0.8.4b0}/qbraid_cli.egg-info/SOURCES.txt

@@ -11,11 +11,13 @@ ruff.toml
 .github/PULL_REQUEST_TEMPLATE.md
 .github/ISSUE_TEMPLATE/bug_report.yml
 .github/ISSUE_TEMPLATE/feature_request.yml
+.github/workflows/bump-version.yml
 .github/workflows/docs.yml
 .github/workflows/format.yml
 .github/workflows/main.yml
 .github/workflows/pre-release.yml
 .github/workflows/publish.yml
+.github/workflows/tag-on-merge.yml
 docs/Makefile
 docs/conf.py
 docs/index.rst
@@ -115,6 +117,7 @@ tests/jobs/test_jobs_validate_handle_state.py
 tests/jobs/test_jobs_validate_library.py
 tests/kernels/__init__.py
 tests/kernels/test_kernels_list.py
+tools/bump_version.py
 tools/create_dev_build.sh
 tools/install_wheel_extras.sh
 tools/split_md.py

{qbraid_cli-0.8.4a0 → qbraid_cli-0.8.4b0}/qbraid_cli.egg-info/requires.txt

@@ -1,6 +1,6 @@
 typer>=0.12.1
 rich>=10.11.0
-qbraid-core[environments]==0.1.17a0
+qbraid-core[environments]>=0.1.17b0
 
 [dev]
 ruff

{qbraid_cli-0.8.4a0 → qbraid_cli-0.8.4b0}/tests/kernels/test_kernels_list.py

@@ -15,8 +15,7 @@ def mock_is_exe(path):
     return path == "/path/to/bin/python3", "-m", "ipykernel_launcher", "-f", "test"
 
 
-# @patch("jupyter_client.kernelspec.KernelSpecManager")
-@patch("qbraid_cli.kernels.app.list_kernels", return_value={})
+@patch("qbraid_core.services.environments.kernels.get_all_kernels", return_value={})
 @patch("qbraid_cli.kernels.app.Console")
 def test_kernels_list_no_active_kernels(mock_console, mock_list_kernels):
     """Test listing kernels when no kernels are active."""
@@ -33,7 +32,7 @@ def test_kernels_list_no_active_kernels(mock_console, mock_list_kernels):
 
 
 @patch(
-    "qbraid_cli.kernels.app.list_kernels",
+    "qbraid_core.services.environments.kernels.get_all_kernels",
     return_value={"python3": {"resource_dir": "/path/to/python3/kernel"}},
 )
 @patch("qbraid_cli.kernels.app.Console")
@@ -43,15 +42,14 @@ def test_kernels_list_default_python3_kernel_present(mock_console, mock_list_ker
     kernels_list()
 
     expected_calls = [
-        call("# qbraid kernels:\n#\n"),
-        call("python3          /path/to/python3/kernel"),
+        call("# qbraid kernels:\n#\n\npython3          /path/to/python3/kernel"),
     ]
     actual_calls = mock_console.return_value.print.call_args_list
     assert actual_calls == expected_calls
 
 
 @patch(
-    "qbraid_cli.kernels.app.list_kernels",
+    "qbraid_core.services.environments.kernels.get_all_kernels",
     return_value={
         "python3": {"resource_dir": "/path/to/python3/kernel"},
         "another_kernel": {
@@ -71,9 +69,9 @@ def test_kernels_list_multiple_kernels_available(mock_console, mock_list_kernels
         kernels_list()
 
     expected_calls = [
-        call("# qbraid kernels:\n#\n"),
-        call("python3                 /path/to/python3/kernel"),
-        call("another_kernel          /path/to/another/kernel"),
+        call(
+            "# qbraid kernels:\n#\n\npython3                 /path/to/python3/kernel\nanother_kernel          /path/to/another/kernel"
+        ),
     ]
     actual_calls = mock_console.return_value.print.call_args_list
     assert actual_calls == expected_calls

qbraid_cli-0.8.4b0/tools/bump_version.py

@@ -0,0 +1,21 @@
+# Copyright (c) 2024, qBraid Development Team
+# All rights reserved.
+
+"""
+Script to bump the major, minor, or patch version in pyproject.toml.
+
+"""
+import pathlib
+import sys
+
+from qbraid_core.system.versions import bump_version, extract_version, update_version_in_pyproject
+
+if __name__ == "__main__":
+
+    bump_type = sys.argv[1]
+    root = pathlib.Path(__file__).parent.parent.resolve()
+    pyproject_toml_path = root / "pyproject.toml"
+    old_version = extract_version(pyproject_toml_path)
+    new_version = bump_version(old_version, bump_type)
+    update_version_in_pyproject(pyproject_toml_path, new_version)
+    print(new_version)