WIP: dev into master #184

Draft
edraft wants to merge 121 commits from dev into master
5 changed files with 20 additions and 6 deletions
Showing only changes of commit 33728cdec3 - Show all commits

View File

@@ -17,7 +17,6 @@
"main": "cpl/cli/main.py", "main": "cpl/cli/main.py",
"directory": "cpl", "directory": "cpl",
"build": { "build": {
"build": "python -m build",
"include": [ "include": [
"_templates/" "_templates/"
], ],

View File

@@ -19,7 +19,12 @@ def install(package: str, project: str, dev: bool, verbose: bool):
if package is not None: if package is not None:
Console.write_line(f"Installing {package} to '{project.name}':") Console.write_line(f"Installing {package} to '{project.name}':")
try: 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: except subprocess.CalledProcessError as e:
Console.error(f"Failed to install {package}: exit code {e.returncode}") Console.error(f"Failed to install {package}: exit code {e.returncode}")
return return
@@ -51,6 +56,11 @@ def install(package: str, project: str, dev: bool, verbose: bool):
dep = Pip.normalize_dep(name, version) dep = Pip.normalize_dep(name, version)
Console.write_line(f" -> {dep}") Console.write_line(f" -> {dep}")
try: 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: except subprocess.CalledProcessError as e:
Console.error(f"Failed to install {dep}: exit code {e.returncode}") Console.error(f"Failed to install {dep}: exit code {e.returncode}")

View File

@@ -22,7 +22,12 @@ def uninstall(package: str, project: str, dev: bool, verbose: bool):
deps = project.dependencies if not dev else project.dev_dependencies deps = project.dependencies if not dev else project.dev_dependencies
try: 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: except subprocess.CalledProcessError as e:
Console.error(f"Failed to uninstall {package}: exit code {e.returncode}") Console.error(f"Failed to uninstall {package}: exit code {e.returncode}")
return return

View File

@@ -30,7 +30,7 @@ def update(package: str, project: str, dev: bool, verbose: bool):
Console.write_line(f"Updating {package} to '{project.name}':") Console.write_line(f"Updating {package} to '{project.name}':")
try: try:
Pip.command( 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)}", f"{Pip.normalize_dep(package, old_spec)}",
verbose=verbose, verbose=verbose,
path=project.path, path=project.path,

View File

@@ -109,7 +109,7 @@ class Pip:
Console.write_line(f"Running: {pip} {command} {''.join(args)}") Console.write_line(f"Running: {pip} {command} {''.join(args)}")
subprocess.run( subprocess.run(
[*pip.split(), command, *args], [*pip.split(), *command.split(), *args],
check=True, check=True,
stdin=subprocess.DEVNULL if not verbose else None, stdin=subprocess.DEVNULL if not verbose else None,
stdout=subprocess.DEVNULL if not verbose else None, stdout=subprocess.DEVNULL if not verbose else None,