Test support py312

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"

pyrgo/cli/__main__.py → 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(

pyrgo/cli/cmds/audit.py → 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")

pyrgo/cli/cmds/build.py → 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")

pyrgo/cli/cmds/check.py → 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(

pyrgo/cli/cmds/clean.py → 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")

pyrgo/cli/cmds/doc.py → 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")

pyrgo/cli/cmds/fix.py → 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")

pyrgo/cli/cmds/fmt.py → 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")

pyrgo/cli/cmds/lock.py → 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

pyrgo/cli/cmds/remove.py → 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")

pyrgo/cli/cmds/sync.py → 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")

pyrgo/cli/cmds/test.py → 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")