refactor: move package managers into a package

Signed-off-by: Frost Ming <[email protected]>
frostming · Jan 26, 2024 · 8230581 · 8230581
1 parent 6e86941
commit 8230581
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 16 deletions.
diff --git a/src/onepm/__init__.py b/src/onepm/__init__.py
@@ -6,11 +6,11 @@
 from packaging.requirements import Requirement
 from packaging.utils import canonicalize_name
 
-from onepm.base import PackageManager
-from onepm.pdm import PDM
-from onepm.pip import Pip
-from onepm.pipenv import Pipenv
-from onepm.poetry import Poetry
+from onepm.pm.base import PackageManager
+from onepm.pm.pdm import PDM
+from onepm.pm.pip import Pip
+from onepm.pm.pipenv import Pipenv
+from onepm.pm.poetry import Poetry
 
 if sys.version_info >= (3, 11):
     import tomllib

diff --git a/src/onepm/pm/__init__.py b/src/onepm/pm/__init__.py
diff --git a/src/onepm/base.py → src/onepm/pm/base.py b/src/onepm/base.py → src/onepm/pm/base.py
diff --git a/src/onepm/pdm.py → src/onepm/pm/pdm.py b/src/onepm/pdm.py → src/onepm/pm/pdm.py
@@ -3,7 +3,7 @@
 import os
 from typing import Any, NoReturn
 
-from onepm.base import PackageManager
+from onepm.pm.base import PackageManager
 
 
 class PDM(PackageManager):

diff --git a/src/onepm/pip.py → src/onepm/pm/pip.py b/src/onepm/pip.py → src/onepm/pm/pip.py
@@ -4,7 +4,7 @@
 import sys
 from typing import Any, NoReturn
 
-from onepm.base import PackageManager
+from onepm.pm.base import PackageManager
 
 
 class Pip(PackageManager):

diff --git a/src/onepm/pipenv.py → src/onepm/pm/pipenv.py b/src/onepm/pipenv.py → src/onepm/pm/pipenv.py
@@ -3,7 +3,7 @@
 import os
 from typing import Any, NoReturn
 
-from onepm.base import PackageManager
+from onepm.pm.base import PackageManager
 
 
 class Pipenv(PackageManager):

diff --git a/src/onepm/poetry.py → src/onepm/pm/poetry.py b/src/onepm/poetry.py → src/onepm/pm/poetry.py
@@ -3,7 +3,7 @@
 import os
 from typing import Any, NoReturn
 
-from onepm.base import PackageManager
+from onepm.pm.base import PackageManager
 
 
 class Poetry(PackageManager):

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -14,7 +14,7 @@ def execute_args(monkeypatch):
     def fake_execute(args):
         call_args[:] = args
 
-    monkeypatch.setattr("onepm.base.PackageManager._execute_command", fake_execute)
+    monkeypatch.setattr("onepm.pm.base.PackageManager._execute_command", fake_execute)
     return call_args
 
 
@@ -39,7 +39,7 @@ def poetry(monkeypatch):
         "onepm.determine_package_manager", mock.Mock(return_value=Poetry)
     )
     monkeypatch.setattr(
-        "onepm.base.PackageManager.find_executable", mock.Mock(return_value="poetry")
+        "onepm.pm.base.PackageManager.find_executable", mock.Mock(return_value="poetry")
     )
 
 
@@ -49,13 +49,13 @@ def pipenv(monkeypatch):
         "onepm.determine_package_manager", mock.Mock(return_value=Pipenv)
     )
     monkeypatch.setattr(
-        "onepm.base.PackageManager.find_executable", mock.Mock(return_value="pipenv")
+        "onepm.pm.base.PackageManager.find_executable", mock.Mock(return_value="pipenv")
     )
 
 
 @pytest.fixture()
 def pdm(monkeypatch):
     monkeypatch.setattr("onepm.determine_package_manager", mock.Mock(return_value=PDM))
     monkeypatch.setattr(
-        "onepm.base.PackageManager.find_executable", mock.Mock(return_value="pdm")
+        "onepm.pm.base.PackageManager.find_executable", mock.Mock(return_value="pdm")
     )
diff --git a/tests/test_pip.py b/tests/test_pip.py
@@ -3,8 +3,7 @@
 
 import pytest
 
-from onepm import pa, pi, pr, pu, pun
-from onepm.pip import Pip
+from onepm import Pip, pa, pi, pr, pu, pun
 
 pytestmark = pytest.mark.usefixtures("pip")
 
@@ -17,7 +16,7 @@ def mock_find_executable(name: str, path: str | None = None) -> str:
 
     monkeypatch.setenv("VIRTUAL_ENV", "foo")
     monkeypatch.setattr(
-        "onepm.base.PackageManager.find_executable", mock_find_executable
+        "onepm.pm.base.PackageManager.find_executable", mock_find_executable
     )