From 2f9fed64dfc965870f7a004392cc63fea4dc3e16 Mon Sep 17 00:00:00 2001 From: Tomperez98 Date: Sun, 11 Feb 2024 13:47:07 -0500 Subject: [PATCH] Test support py312 --- pyproject.toml | 2 +- pyrgo/{cli => }/__main__.py | 26 +++++++++++++------------- pyrgo/cli/__init__.py | 1 - pyrgo/{cli => }/cmds/__init__.py | 0 pyrgo/{cli => }/cmds/add.py | 0 pyrgo/{cli => }/cmds/audit.py | 2 +- pyrgo/{cli => }/cmds/build.py | 2 +- pyrgo/{cli => }/cmds/check.py | 2 +- pyrgo/{cli => }/cmds/clean.py | 2 +- pyrgo/{cli => }/cmds/doc.py | 2 +- pyrgo/{cli => }/cmds/fix.py | 2 +- pyrgo/{cli => }/cmds/fmt.py | 2 +- pyrgo/{cli => }/cmds/lock.py | 2 +- pyrgo/{cli => }/cmds/new.py | 0 pyrgo/{cli => }/cmds/remove.py | 2 +- pyrgo/{cli => }/cmds/sync.py | 2 +- pyrgo/{cli => }/cmds/test.py | 2 +- pyrgo/{cli => }/utils.py | 0 18 files changed, 25 insertions(+), 26 deletions(-) rename pyrgo/{cli => }/__main__.py (58%) delete mode 100644 pyrgo/cli/__init__.py rename pyrgo/{cli => }/cmds/__init__.py (100%) rename pyrgo/{cli => }/cmds/add.py (100%) rename pyrgo/{cli => }/cmds/audit.py (93%) rename pyrgo/{cli => }/cmds/build.py (92%) rename pyrgo/{cli => }/cmds/check.py (97%) rename pyrgo/{cli => }/cmds/clean.py (95%) rename pyrgo/{cli => }/cmds/doc.py (94%) rename pyrgo/{cli => }/cmds/fix.py (93%) rename pyrgo/{cli => }/cmds/fmt.py (92%) rename pyrgo/{cli => }/cmds/lock.py (98%) rename pyrgo/{cli => }/cmds/new.py (100%) rename pyrgo/{cli => }/cmds/remove.py (97%) rename pyrgo/{cli => }/cmds/sync.py (95%) rename pyrgo/{cli => }/cmds/test.py (93%) rename pyrgo/{cli => }/utils.py (100%) diff --git a/pyproject.toml b/pyproject.toml index 0b78ae1..ecd660c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,7 @@ dependencies = [ dev = ["pytest-cov < 5", "types-toml"] [project.scripts] -pyrgo = "pyrgo.cli.__main__:cli" +pyrgo = "pyrgo.__main__:cli" [project.urls] Documentation = "https://github.com/Tomperez98/pyrgo#readme" diff --git a/pyrgo/cli/__main__.py b/pyrgo/__main__.py similarity index 58% rename from pyrgo/cli/__main__.py rename to pyrgo/__main__.py index 542438f..e2a4949 100644 --- a/pyrgo/cli/__main__.py +++ b/pyrgo/__main__.py @@ -3,19 +3,19 @@ import click -from pyrgo.cli.cmds.add import add -from pyrgo.cli.cmds.audit import audit -from pyrgo.cli.cmds.build import build -from pyrgo.cli.cmds.check import check -from pyrgo.cli.cmds.clean import clean -from pyrgo.cli.cmds.doc import doc -from pyrgo.cli.cmds.fix import fix -from pyrgo.cli.cmds.fmt import fmt -from pyrgo.cli.cmds.lock import lock -from pyrgo.cli.cmds.new import new -from pyrgo.cli.cmds.remove import remove -from pyrgo.cli.cmds.sync import sync -from pyrgo.cli.cmds.test import test +from pyrgo.cmds.add import add +from pyrgo.cmds.audit import audit +from pyrgo.cmds.build import build +from pyrgo.cmds.check import check +from pyrgo.cmds.clean import clean +from pyrgo.cmds.doc import doc +from pyrgo.cmds.fix import fix +from pyrgo.cmds.fmt import fmt +from pyrgo.cmds.lock import lock +from pyrgo.cmds.new import new +from pyrgo.cmds.remove import remove +from pyrgo.cmds.sync import sync +from pyrgo.cmds.test import test @click.group( diff --git a/pyrgo/cli/__init__.py b/pyrgo/cli/__init__.py deleted file mode 100644 index 9707996..0000000 --- a/pyrgo/cli/__init__.py +++ /dev/null @@ -1 +0,0 @@ -"""Pyrgo cli module.""" diff --git a/pyrgo/cli/cmds/__init__.py b/pyrgo/cmds/__init__.py similarity index 100% rename from pyrgo/cli/cmds/__init__.py rename to pyrgo/cmds/__init__.py diff --git a/pyrgo/cli/cmds/add.py b/pyrgo/cmds/add.py similarity index 100% rename from pyrgo/cli/cmds/add.py rename to pyrgo/cmds/add.py diff --git a/pyrgo/cli/cmds/audit.py b/pyrgo/cmds/audit.py similarity index 93% rename from pyrgo/cli/cmds/audit.py rename to pyrgo/cmds/audit.py index 014d1dc..ac9db7d 100644 --- a/pyrgo/cli/cmds/audit.py +++ b/pyrgo/cmds/audit.py @@ -6,9 +6,9 @@ import click from result import Ok -from pyrgo.cli.utils import ensure_env_exist, inform_and_run_program from pyrgo.command_exec import PythonCommandExec from pyrgo.conf import PyrgoConf +from pyrgo.utils import ensure_env_exist, inform_and_run_program @click.command("audit") diff --git a/pyrgo/cli/cmds/build.py b/pyrgo/cmds/build.py similarity index 92% rename from pyrgo/cli/cmds/build.py rename to pyrgo/cmds/build.py index 108de23..e33c315 100644 --- a/pyrgo/cli/cmds/build.py +++ b/pyrgo/cmds/build.py @@ -6,9 +6,9 @@ import click from result import Ok -from pyrgo.cli.utils import inform_and_run_program from pyrgo.command_exec import PythonCommandExec from pyrgo.conf import PyrgoConf +from pyrgo.utils import inform_and_run_program @click.command("build") diff --git a/pyrgo/cli/cmds/check.py b/pyrgo/cmds/check.py similarity index 97% rename from pyrgo/cli/cmds/check.py rename to pyrgo/cmds/check.py index 24d214a..bb4e538 100644 --- a/pyrgo/cli/cmds/check.py +++ b/pyrgo/cmds/check.py @@ -6,9 +6,9 @@ import click from result import Ok -from pyrgo.cli.utils import inform_and_run_program from pyrgo.command_exec import PythonCommandExec from pyrgo.conf import PyrgoConf +from pyrgo.utils import inform_and_run_program def _build_vulture_cmd( diff --git a/pyrgo/cli/cmds/clean.py b/pyrgo/cmds/clean.py similarity index 95% rename from pyrgo/cli/cmds/clean.py rename to pyrgo/cmds/clean.py index 6c9d7cb..350595b 100644 --- a/pyrgo/cli/cmds/clean.py +++ b/pyrgo/cmds/clean.py @@ -8,9 +8,9 @@ import click from result import Ok -from pyrgo.cli.utils import inform_and_run_program from pyrgo.command_exec import PythonCommandExec from pyrgo.conf import PyrgoConf +from pyrgo.utils import inform_and_run_program @click.command("clean") diff --git a/pyrgo/cli/cmds/doc.py b/pyrgo/cmds/doc.py similarity index 94% rename from pyrgo/cli/cmds/doc.py rename to pyrgo/cmds/doc.py index 0b35336..3b377ea 100644 --- a/pyrgo/cli/cmds/doc.py +++ b/pyrgo/cmds/doc.py @@ -5,9 +5,9 @@ import click -from pyrgo.cli.utils import inform_and_run_program from pyrgo.command_exec import PythonCommandExec from pyrgo.conf import PyrgoConf +from pyrgo.utils import inform_and_run_program @click.command("doc") diff --git a/pyrgo/cli/cmds/fix.py b/pyrgo/cmds/fix.py similarity index 93% rename from pyrgo/cli/cmds/fix.py rename to pyrgo/cmds/fix.py index ac4537c..b8fc231 100644 --- a/pyrgo/cli/cmds/fix.py +++ b/pyrgo/cmds/fix.py @@ -6,9 +6,9 @@ import click from result import Ok -from pyrgo.cli.utils import inform_and_run_program from pyrgo.command_exec import PythonCommandExec from pyrgo.conf import PyrgoConf +from pyrgo.utils import inform_and_run_program @click.command("fix") diff --git a/pyrgo/cli/cmds/fmt.py b/pyrgo/cmds/fmt.py similarity index 92% rename from pyrgo/cli/cmds/fmt.py rename to pyrgo/cmds/fmt.py index be96615..c9655d1 100644 --- a/pyrgo/cli/cmds/fmt.py +++ b/pyrgo/cmds/fmt.py @@ -6,9 +6,9 @@ import click from result import Ok -from pyrgo.cli.utils import inform_and_run_program from pyrgo.command_exec import PythonCommandExec from pyrgo.conf import PyrgoConf +from pyrgo.utils import inform_and_run_program @click.command("fmt") diff --git a/pyrgo/cli/cmds/lock.py b/pyrgo/cmds/lock.py similarity index 98% rename from pyrgo/cli/cmds/lock.py rename to pyrgo/cmds/lock.py index 42cd981..1eebb15 100644 --- a/pyrgo/cli/cmds/lock.py +++ b/pyrgo/cmds/lock.py @@ -8,9 +8,9 @@ from result import Ok, Result from typing_extensions import assert_never -from pyrgo.cli.utils import inform_and_run_program from pyrgo.command_exec import PythonCommandExec from pyrgo.conf import PyrgoConf +from pyrgo.utils import inform_and_run_program if TYPE_CHECKING: import subprocess diff --git a/pyrgo/cli/cmds/new.py b/pyrgo/cmds/new.py similarity index 100% rename from pyrgo/cli/cmds/new.py rename to pyrgo/cmds/new.py diff --git a/pyrgo/cli/cmds/remove.py b/pyrgo/cmds/remove.py similarity index 97% rename from pyrgo/cli/cmds/remove.py rename to pyrgo/cmds/remove.py index 1f6aa16..79be29c 100644 --- a/pyrgo/cli/cmds/remove.py +++ b/pyrgo/cmds/remove.py @@ -6,8 +6,8 @@ from packaging.requirements import Requirement from tomlkit.items import Item, Table -from pyrgo.cli.utils import ensure_env_exist from pyrgo.conf import PyrgoConf +from pyrgo.utils import ensure_env_exist @click.command("remove") diff --git a/pyrgo/cli/cmds/sync.py b/pyrgo/cmds/sync.py similarity index 95% rename from pyrgo/cli/cmds/sync.py rename to pyrgo/cmds/sync.py index 21ee590..ea19eb7 100644 --- a/pyrgo/cli/cmds/sync.py +++ b/pyrgo/cmds/sync.py @@ -6,9 +6,9 @@ import click from result import Ok -from pyrgo.cli.utils import ensure_env_exist, inform_and_run_program from pyrgo.command_exec import PythonCommandExec from pyrgo.conf import PyrgoConf +from pyrgo.utils import ensure_env_exist, inform_and_run_program @click.command("sync") diff --git a/pyrgo/cli/cmds/test.py b/pyrgo/cmds/test.py similarity index 93% rename from pyrgo/cli/cmds/test.py rename to pyrgo/cmds/test.py index 6a26c69..f0453d1 100644 --- a/pyrgo/cli/cmds/test.py +++ b/pyrgo/cmds/test.py @@ -7,8 +7,8 @@ import click from result import Ok -from pyrgo.cli.utils import inform_and_run_program from pyrgo.command_exec import PythonCommandExec +from pyrgo.utils import inform_and_run_program @click.command("test") diff --git a/pyrgo/cli/utils.py b/pyrgo/utils.py similarity index 100% rename from pyrgo/cli/utils.py rename to pyrgo/utils.py