From ba5d307b8c2628bcecd51835c0689af5c5dc0467 Mon Sep 17 00:00:00 2001 From: Jacob Faibussowitsch Date: Mon, 5 May 2025 14:04:02 -0400 Subject: [PATCH] Move packages to top-level aedifix directory --- src/aedifix/__init__.py | 3 ++- src/aedifix/manager.py | 2 +- src/aedifix/package/__init__.py | 3 +-- src/aedifix/{package => }/packages/__init__.py | 0 src/aedifix/{package => }/packages/cmake.py | 6 +++--- src/aedifix/{package => }/packages/python.py | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) rename src/aedifix/{package => }/packages/__init__.py (100%) rename src/aedifix/{package => }/packages/cmake.py (96%) rename src/aedifix/{package => }/packages/python.py (92%) diff --git a/src/aedifix/__init__.py b/src/aedifix/__init__.py index a7dc353..3b22c3f 100644 --- a/src/aedifix/__init__.py +++ b/src/aedifix/__init__.py @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from __future__ import annotations -from . import cmake, package, util +from . import cmake, package, packages, util from ._version import version as __version__ from .cmake import ( CMAKE_VARIABLE, @@ -38,5 +38,6 @@ "basic_configure", "cmake", "package", + "packages", "util", ) diff --git a/src/aedifix/manager.py b/src/aedifix/manager.py index b11754b..eb9da00 100644 --- a/src/aedifix/manager.py +++ b/src/aedifix/manager.py @@ -482,7 +482,7 @@ def gen_summary() -> Iterator[str]: "$ make", ] - from .package.packages.python import Python + from .packages.python import Python if self._get_package(Python).state.enabled(): install_mess.extend( diff --git a/src/aedifix/package/__init__.py b/src/aedifix/package/__init__.py index 9d535ea..e9fa346 100644 --- a/src/aedifix/package/__init__.py +++ b/src/aedifix/package/__init__.py @@ -3,8 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 from __future__ import annotations -from . import packages from .main_package import MainPackage from .package import Package -__all__ = ("MainPackage", "Package", "packages") +__all__ = ("MainPackage", "Package") diff --git a/src/aedifix/package/packages/__init__.py b/src/aedifix/packages/__init__.py similarity index 100% rename from src/aedifix/package/packages/__init__.py rename to src/aedifix/packages/__init__.py diff --git a/src/aedifix/package/packages/cmake.py b/src/aedifix/packages/cmake.py similarity index 96% rename from src/aedifix/package/packages/cmake.py rename to src/aedifix/packages/cmake.py index ccc3df3..f70ad1f 100644 --- a/src/aedifix/package/packages/cmake.py +++ b/src/aedifix/packages/cmake.py @@ -7,12 +7,12 @@ import shutil from typing import TYPE_CHECKING, Final -from ...cmake import CMAKE_VARIABLE, CMakePath, CMakeString -from ...util.argument_parser import ArgSpec, ConfigArgument +from ..cmake import CMAKE_VARIABLE, CMakePath, CMakeString from ..package import Package +from ..util.argument_parser import ArgSpec, ConfigArgument if TYPE_CHECKING: - from ...manager import ConfigurationManager + from ..manager import ConfigurationManager _cmake_exe = shutil.which("cmake") diff --git a/src/aedifix/package/packages/python.py b/src/aedifix/packages/python.py similarity index 92% rename from src/aedifix/package/packages/python.py rename to src/aedifix/packages/python.py index b3692be..c6f754f 100644 --- a/src/aedifix/package/packages/python.py +++ b/src/aedifix/packages/python.py @@ -6,13 +6,13 @@ import sys from typing import TYPE_CHECKING, Final -from ...util.argument_parser import ArgSpec, ConfigArgument -from ...util.exception import UnsatisfiableConfigurationError -from ...util.utility import find_active_python_version_and_path from ..package import Package +from ..util.argument_parser import ArgSpec, ConfigArgument +from ..util.exception import UnsatisfiableConfigurationError +from ..util.utility import find_active_python_version_and_path if TYPE_CHECKING: - from ...manager import ConfigurationManager + from ..manager import ConfigurationManager class Python(Package):