Skip to content

Move packages to top-level aedifix directory #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jacobfaib merged 1 commit into from
May 12, 2025
Merged

Move packages to top-level aedifix directory #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/aedifix/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -38,5 +38,6 @@
"basic_configure",
"cmake",
"package",
"packages",
"util",
)
2 changes: 1 addition & 1 deletion src/aedifix/manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
3 changes: 1 addition & 2 deletions src/aedifix/package/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
0 src/aedifix/package/packages/__init__.py → src/aedifix/packages/__init__.py
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions src/aedifix/package/packages/cmake.py → src/aedifix/packages/cmake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
8 changes: 4 additions & 4 deletions src/aedifix/package/packages/python.py → src/aedifix/packages/python.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
Loading