From 33728cdec34f3e1709bcc9a94e82b1f0d3deb41f Mon Sep 17 00:00:00 2001 From: edraft Date: Sun, 12 Oct 2025 20:43:44 +0200 Subject: [PATCH] Added internal extra url --- src/cli/cpl.project.json | 1 - src/cli/cpl/cli/command/package/install.py | 14 ++++++++++++-- src/cli/cpl/cli/command/package/uninstall.py | 7 ++++++- src/cli/cpl/cli/command/package/update.py | 2 +- src/cli/cpl/cli/utils/pip.py | 2 +- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/cli/cpl.project.json b/src/cli/cpl.project.json index 57786277..76a94d70 100644 --- a/src/cli/cpl.project.json +++ b/src/cli/cpl.project.json @@ -17,7 +17,6 @@ "main": "cpl/cli/main.py", "directory": "cpl", "build": { - "build": "python -m build", "include": [ "_templates/" ], diff --git a/src/cli/cpl/cli/command/package/install.py b/src/cli/cpl/cli/command/package/install.py index d2bb4aa2..fd1bb93f 100644 --- a/src/cli/cpl/cli/command/package/install.py +++ b/src/cli/cpl/cli/command/package/install.py @@ -19,7 +19,12 @@ def install(package: str, project: str, dev: bool, verbose: bool): if package is not None: Console.write_line(f"Installing {package} to '{project.name}':") try: - Pip.command("install", package, verbose=verbose, path=project.path) + Pip.command( + "install --extra-index-url https://git.sh-edraft.de/api/packages/sh-edraft.de/pypi/simple/", + package, + verbose=verbose, + path=project.path, + ) except subprocess.CalledProcessError as e: Console.error(f"Failed to install {package}: exit code {e.returncode}") return @@ -51,6 +56,11 @@ def install(package: str, project: str, dev: bool, verbose: bool): dep = Pip.normalize_dep(name, version) Console.write_line(f" -> {dep}") try: - Pip.command("install", dep, verbose=verbose, path=project.path) + Pip.command( + "install --extra-index-url https://git.sh-edraft.de/api/packages/sh-edraft.de/pypi/simple/", + dep, + verbose=verbose, + path=project.path, + ) except subprocess.CalledProcessError as e: Console.error(f"Failed to install {dep}: exit code {e.returncode}") diff --git a/src/cli/cpl/cli/command/package/uninstall.py b/src/cli/cpl/cli/command/package/uninstall.py index ef1b5b7e..f856b41a 100644 --- a/src/cli/cpl/cli/command/package/uninstall.py +++ b/src/cli/cpl/cli/command/package/uninstall.py @@ -22,7 +22,12 @@ def uninstall(package: str, project: str, dev: bool, verbose: bool): deps = project.dependencies if not dev else project.dev_dependencies try: - Pip.command("uninstall -y", package, verbose=verbose, path=project.path) + Pip.command( + "uninstall -y", + package, + verbose=verbose, + path=project.path, + ) except subprocess.CalledProcessError as e: Console.error(f"Failed to uninstall {package}: exit code {e.returncode}") return diff --git a/src/cli/cpl/cli/command/package/update.py b/src/cli/cpl/cli/command/package/update.py index fed28888..ea602dc1 100644 --- a/src/cli/cpl/cli/command/package/update.py +++ b/src/cli/cpl/cli/command/package/update.py @@ -30,7 +30,7 @@ def update(package: str, project: str, dev: bool, verbose: bool): Console.write_line(f"Updating {package} to '{project.name}':") try: Pip.command( - "install --upgrade", + "install --upgrade --extra-index-url https://git.sh-edraft.de/api/packages/sh-edraft.de/pypi/simple/", f"{Pip.normalize_dep(package, old_spec)}", verbose=verbose, path=project.path, diff --git a/src/cli/cpl/cli/utils/pip.py b/src/cli/cpl/cli/utils/pip.py index 70fbf343..8d9c0798 100644 --- a/src/cli/cpl/cli/utils/pip.py +++ b/src/cli/cpl/cli/utils/pip.py @@ -109,7 +109,7 @@ class Pip: Console.write_line(f"Running: {pip} {command} {''.join(args)}") subprocess.run( - [*pip.split(), command, *args], + [*pip.split(), *command.split(), *args], check=True, stdin=subprocess.DEVNULL if not verbose else None, stdout=subprocess.DEVNULL if not verbose else None,