From 26013bf1a45150a0d35b662e881172431e327c5f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 12 Jun 2024 14:08:34 +0200 Subject: [PATCH 1/8] ignore .venv --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index bee8a64..9f7550b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ __pycache__ +.venv From ba771ea0fe1a4148ae2b94127243145195ce99bf Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 12 Jun 2024 14:09:25 +0200 Subject: [PATCH 2/8] ruff.lint --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d7119c5..d608a73 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,2 +1,2 @@ -[tool.ruff] +[tool.ruff.lint] select = ["ALL"] From be045fb6ef3c592cab2af33f05d4bb68fc5bcd0d Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 12 Jun 2024 14:15:51 +0200 Subject: [PATCH 3/8] ignore formatter conflicting rules --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index d608a73..4075eff 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,2 +1,3 @@ [tool.ruff.lint] +ignore = ["COM812", "ISC001"] select = ["ALL"] From 2b78b45b1b33dace1096249ffb62e04975ba22b4 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 12 Jun 2024 14:39:02 +0200 Subject: [PATCH 4/8] ignore linter conflicting rules --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4075eff..f543b45 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,3 @@ [tool.ruff.lint] -ignore = ["COM812", "ISC001"] +ignore = ["COM812", "D203", "D213", "ISC001"] select = ["ALL"] From abd7afe65dca9e39d8c9100a6b4818a3a54934e9 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 12 Jun 2024 14:40:39 +0200 Subject: [PATCH 5/8] format init --- cd/__init__.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/cd/__init__.py b/cd/__init__.py index b1b377f..b310cfd 100644 --- a/cd/__init__.py +++ b/cd/__init__.py @@ -34,13 +34,19 @@ def cd_clone_branch() -> None: split() print(project, end="") split() - print(f"""\ + print( + f"""\ {project.url} ↓ -""", end="", flush=True) - ps.run("git", +""", + end="", + flush=True, + ) + ps.run( + "git", "clone", - "--branch", project.branch, + "--branch", + project.branch, "--", project.url, project.root, @@ -60,7 +66,8 @@ def cd_synchronize() -> None: root = Path(os.sep) / user / project.branch / projects.group / project.name # target = f"{user}@{host}:{root}" - ps.run("rsync", + ps.run( + "rsync", "--archive", "--delete-before", "--verbose", From 7d6700a04b89c952c0139573465c506e98780eca Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 12 Jun 2024 14:43:16 +0200 Subject: [PATCH 6/8] /.venv --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9f7550b..9195364 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ __pycache__ -.venv +/.venv From c5119b410727e0afc58c33c9d0314f009afaa09e Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 12 Jun 2024 14:56:12 +0200 Subject: [PATCH 7/8] ruff/line-length --- pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index f543b45..8aa6871 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,6 @@ +[tool.ruff] +line-length = 80 + [tool.ruff.lint] ignore = ["COM812", "D203", "D213", "ISC001"] select = ["ALL"] From f776b8468d63b4078738fb488d3c375a55fd6421 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 13 Jun 2024 12:34:05 +0200 Subject: [PATCH 8/8] step/log --- cd/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cd/__init__.py b/cd/__init__.py index b310cfd..fa17729 100644 --- a/cd/__init__.py +++ b/cd/__init__.py @@ -5,6 +5,7 @@ from pathlib import Path import env from rwx import fs, ps +from rwx.log import stream as log from cd.project import Project from cd.projects import Projects @@ -153,6 +154,6 @@ def split() -> None: def step(*arguments: str) -> None: env.CD_STEP += 1 - print(env.CD_DOWN) + log.log(env.CD_DOWN) print(env.CD_VERT, env.CD_STEP, *arguments) - print(env.CD___UP, flush=True) + log.log(env.CD___UP)