quickpub 1.0.1__tar.gz → 1.0.2__tar.gz

{quickpub-1.0.1/quickpub.egg-info → quickpub-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quickpub
-Version: 1.0.1
+Version: 1.0.2
 Summary: A python package to quickly configure and publish a new package
 Author-email: danielnachumdev <danielnachumdev@gmail.com>
 License: MIT License

{quickpub-1.0.1 → quickpub-1.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "quickpub"
-version = "1.0.1"
+version = "1.0.2"
 authors = [
     { name = "danielnachumdev", email = "danielnachumdev@gmail.com" },
 ]

{quickpub-1.0.1 → quickpub-1.0.2}/quickpub/__init__.py

@@ -1,4 +1,3 @@
 from .structures import *
-from .runnables import *
-from .managers import *
+from .strategies import *
 from .__main__ import publish

{quickpub-1.0.1 → quickpub-1.0.2}/quickpub/__main__.py

@@ -1,11 +1,12 @@
 import argparse
-from typing import Optional, Union, List
+from typing import Optional, Union, List, Any
 from danielutils import warning, file_exists, error
 
+from quickpub import SystemInterpreter
+from strategies import BuildStrategy, UploadStrategy, QualityAssuranceStrategy, PythonVersionManagerStrategy
 from .validators import validate_version, validate_python_version, validate_keywords, validate_dependencies, \
     validate_source
-from .functions import build, upload, commit
-from .structures import Version, AdditionalConfiguration, Dependency
+from .structures import Version, Dependency
 from .files import create_toml, create_setup, create_manifest
 from .classifiers import *
 from .enforcers import enforce_local_correct_version, enforce_pypirc_exists, exit_if, enforce_remote_correct_version
@@ -19,6 +20,12 @@ def publish(
         author_email: str,
         description: str,
         homepage: str,
+
+        build_strategies: List[BuildStrategy],
+        upload_strategies: List[UploadStrategy],
+        quality_assurance_strategies: Optional[List[QualityAssuranceStrategy]] = None,
+        python_version_manager_strategy: PythonVersionManagerStrategy = SystemInterpreter(),
+
         explicit_src_folder_path: Optional[str] = None,
         version: Optional[Union[Version, str]] = None,
         readme_file_path: str = "./README.md",
@@ -28,25 +35,35 @@ def publish(
 
         keywords: Optional[List[str]] = None,
         dependencies: Optional[List[Union[str, Dependency]]] = None,
-        config: Optional[AdditionalConfiguration] = None
+        demo: bool = False,
+
+        config: Optional[Any] = None,
 ) -> None:
-    """The main function of this package. will do all the heavy lifting in order for you to publish your package.
-
-    Args:
-        name (str): The name of the package
-        author (str): The name of the author
-        author_email (str): The email of the author
-        description (str): A short description for the package
-        homepage (str): The homepage for the package. URL to the github repo is a good option.
-        explicit_src_folder_path (Optional[Path], optional): The path to the source code of the package. if None defaults to CWD/<name>
-        version (Optional[Union[Version, str]], optional): The version to create the new distribution. if None defaults to 0.0.1
-        readme_file_path (Path, optional): The path to the readme file. Defaults to "./README.md".
-        license_file_path (Path, optional): The path to the license file . Defaults to "./LICENSE".
-        min_python (Optional[Union[Version, str]], optional): The minimum version of python required for this package to run. Defaults to the version of python running this script.
-        keywords (Optional[list[str]], optional): A list of keywords to describe areas of interests of this package. Defaults to None.
-        dependencies (Optional[list[str]], optional): A list of the dependencies for this package. Defaults to None.
-        config (Optional[Config], optional): reserved for future use. Defaults to None.
-    """
+    """The main function for publishing a package. It performs all necessary steps to prepare and publish the package.
+
+     :param name: The name of the package.
+     :param author: The name of the author.
+     :param author_email: The email of the author.
+     :param description: A short description of the package.
+     :param homepage: The homepage URL for the package (e.g., GitHub repository).
+     :param quality_assurance_strategies: Strategies for quality assurance.
+     :param build_strategies: Strategies for building the package.
+     :param upload_strategies: Strategies for uploading the package.
+     :param python_version_manager_strategy: Strategy for managing Python versions. Defaults to SystemInterpreter().
+     :param explicit_src_folder_path: The path to the source code of the package. Defaults to the current working directory/<name>.
+     :param version: The version for the new distribution. Defaults to "0.0.1".
+     :param readme_file_path: The path to the README file. Defaults to "./README.md".
+     :param license_file_path: The path to the license file. Defaults to "./LICENSE".
+     :param min_python: The minimum Python version required for the package. Defaults to the Python version running this script.
+     :param keywords: A list of keywords describing areas of interest for the package. Defaults to None.
+     :param dependencies: A list of dependencies for the package. Defaults to None.
+     :param demo: Whether to perform checks without making any changes. Defaults to False.
+     :param config: Reserved for future use. Defaults to None.
+
+     Returns:
+         None
+     """
+
     enforce_pypirc_exists()
     explicit_src_folder_path = validate_source(name, explicit_src_folder_path)
     if explicit_src_folder_path != f"./{name}":
@@ -55,16 +72,27 @@ def publish(
     exit_if(not file_exists(readme_file_path), f"Could not find readme file at {readme_file_path}")
     exit_if(not file_exists(license_file_path), f"Could not find license file at {license_file_path}")
     version = validate_version(version)
-    enforce_local_correct_version(name, version)
+    if not demo:
+        enforce_local_correct_version(name, version)
     min_python = validate_python_version(min_python)  # type:ignore
     keywords = validate_keywords(keywords)
     validated_dependencies: List[Dependency] = validate_dependencies(dependencies)
     enforce_remote_correct_version(name, version)
 
+    if quality_assurance_strategies is None:
+        quality_assurance_strategies = []
     try:
-        if not qa(name, config, explicit_src_folder_path, validated_dependencies):
-            error(
-                f"quickpub.publish exited early as '{name}' did not pass quality assurance step, see above logs to pass this step.")
+        res = qa(
+            python_version_manager_strategy,
+            quality_assurance_strategies,
+            name,
+            explicit_src_folder_path,
+            validated_dependencies
+        )
+        if not res:
+            error(f"quickpub.publish exited early as '{name}' "
+                  "did not pass quality assurance step, see above "
+                  "logs to pass this step.")
             raise SystemExit(1)
     except SystemExit as e:
         raise e
@@ -93,15 +121,11 @@ def publish(
         min_python=min_python
     )
     create_manifest(name=name)
-
-    build()
-    upload(
-        name=name,
-        version=version
-    )
-    commit(
-        version=version
-    )
+    if not demo:
+        for build_strategy in build_strategies:
+            build_strategy.execute_strategy()
+        for upload_strategy in upload_strategies:
+            upload_strategy.execute_strategy(name=name, version=version)
 
 
 def parse_args():
@@ -124,25 +148,22 @@ def parse_args():
     return parser.parse_args()
 
 
-def main():
-    args = parse_args()
-
-    publish(
-        name=args.name,
-        author=args.author,
-        author_email=args.author_email,
-        description=args.description,
-        homepage=args.homepage,
-        explicit_src_folder_path=args.explicit_src_folder_path,
-        version=args.version,
-        readme_file_path=args.readme_file_path,
-        license_file_path=args.license_file_path,
-        min_python=args.min_python,
-        keywords=args.keywords,
-        dependencies=args.dependencies,
-        config=args.config
-    )
-
-
 if __name__ == '__main__':
-    main()
+    print("CLI is not currently supported")
+    # args = parse_args()
+    #
+    # publish(
+    #     name=args.name,
+    #     author=args.author,
+    #     author_email=args.author_email,
+    #     description=args.description,
+    #     homepage=args.homepage,
+    #     explicit_src_folder_path=args.explicit_src_folder_path,
+    #     version=args.version,
+    #     readme_file_path=args.readme_file_path,
+    #     license_file_path=args.license_file_path,
+    #     min_python=args.min_python,
+    #     keywords=args.keywords,
+    #     dependencies=args.dependencies,
+    #     config=args.config
+    # )

{quickpub-1.0.1 → quickpub-1.0.2}/quickpub/enforcers.py

@@ -21,7 +21,7 @@ def _remove_suffix(s: str, suffix: str) -> str:
     :return: modified string
     """
     if get_python_version() >= (3, 9):
-        return s.removesuffix(suffix)
+        return s.removesuffix(suffix)  # type:ignore
     return _remove_prefix(s[::-1], suffix[::-1])[::-1]
 
 
@@ -33,7 +33,7 @@ def _remove_prefix(s: str, prefix: str) -> str:
     :return:
     """
     if get_python_version() >= (3, 9):
-        return s.removeprefix(prefix)
+        return s.removeprefix(prefix)  # type:ignore
 
     if s.startswith(prefix):
         return s[len(prefix):]

quickpub-1.0.2/quickpub/functions.py

@@ -0,0 +1,72 @@
+import sys
+from typing import Optional, Literal
+from danielutils import info
+
+from .enforcers import exit_if
+from .structures import Version
+import quickpub.proxy
+
+
+def build(
+        *,
+        verbose: bool = True
+) -> None:
+    if verbose:
+        info("Creating new distribution...")
+    ret, stdout, stderr = quickpub.proxy.cm("python", "setup.py", "sdist")
+    exit_if(
+        ret != 0,
+        stderr.decode(encoding="utf8")
+    )
+
+
+def upload(
+        *,
+        name: str,
+        version: Version,
+        verbose: bool = True
+) -> None:
+    if verbose:
+        info("Uploading")
+    ret, stdout, stderr = quickpub.proxy.cm("twine", "upload", "--config-file", ".pypirc",
+                                            f"dist/{name}-{version}.tar.gz")
+    exit_if(
+        ret != 0,
+        f"Failed uploading the package to pypi. Try running the following command manually:\n\ttwine upload --config-file .pypirc dist/{name}-{version}.tar.gz"
+    )
+
+
+def commit(
+        *,
+        version: Version,
+        verbose: bool = True
+) -> None:
+    if verbose:
+        info("Git")
+        info("\tStaging")
+    ret, stdout, stderr = quickpub.proxy.cm("git add .")
+    exit_if(
+        ret != 0,
+        stderr.decode(encoding="utf8")
+    )
+    if verbose:
+        info("\tCommitting")
+    ret, stdout, stderr = quickpub.proxy.cm(f"git commit -m \"updated to version {version}\"")
+    exit_if(
+        ret != 0,
+        stderr.decode(encoding="utf8")
+    )
+    if verbose:
+        info("\tPushing")
+    ret, stdout, stderr = quickpub.proxy.cm("git push")
+    exit_if(
+        ret != 0,
+        stderr.decode(encoding="utf8")
+    )
+
+
+__all__ = [
+    "build",
+    "upload",
+    "commit",
+]

{quickpub-1.0.1 → quickpub-1.0.2}/quickpub/qa.py

@@ -4,8 +4,9 @@ from functools import wraps
 from typing import Optional, ContextManager, List, Callable, Tuple, Dict, Union
 from danielutils import AttrContext, LayeredCommand, AsciiProgressBar, ColoredText, ProgressBarPool, TemporaryFile
 
-from .managers import PythonManager  # pylint: disable=relative-beyond-top-level
-from .structures import AdditionalConfiguration, Dependency, Version, Bound  # pylint: disable=relative-beyond-top-level
+from quickpub import QualityAssuranceStrategy
+from .strategies import PythonVersionManagerStrategy  # pylint: disable=relative-beyond-top-level
+from .structures import Dependency, Version, Bound  # pylint: disable=relative-beyond-top-level
 from .enforcers import exit_if  # pylint: disable=relative-beyond-top-level
 
 try:
@@ -53,7 +54,7 @@ def global_import_sanity_check(package_name: str, executor: LayeredCommand, is_s
 VERSION_REGEX: re.Pattern = re.compile(r"^\d+\.\d+\.\d+$")
 
 
-def validate_dependencies(python_manager: PythonManager, required_dependencies: List[Dependency],
+def validate_dependencies(python_manager: PythonVersionManagerStrategy, required_dependencies: List[Dependency],
                           executor: LayeredCommand,
                           env_name: str, err_print_func: Callable) -> None:
     """
@@ -92,13 +93,22 @@ def validate_dependencies(python_manager: PythonManager, required_dependencies:
                 err_func=err_print_func)
 
 
-def create_progress_bar_pool(config, python_manager) -> ProgressBarPool:
+def create_progress_bar_pool(python_version_manager: PythonVersionManagerStrategy,
+                             quality_assurance_strategies: List[QualityAssuranceStrategy]) -> ProgressBarPool:
     return ProgressBarPool(
         AsciiProgressBar,
         2,
         individual_options=[
-            dict(iterator=python_manager, desc="Envs", total=len(python_manager.requested_envs)),
-            dict(iterator=config.runners or [], desc="Runners", total=len(config.runners or [])),
+            dict(
+                iterator=python_version_manager,
+                desc="Envs",
+                total=len(python_version_manager.requested_envs)
+            ),
+            dict(
+                iterator=quality_assurance_strategies or [],
+                desc="Runners",
+                total=len(quality_assurance_strategies or [])
+            ),
         ]
     )
 
@@ -112,18 +122,19 @@ def create_pool_print_error(pool: ProgressBarPool):
     return func
 
 
-def qa(package_name: str, config: Optional[AdditionalConfiguration], src_folder_path: Optional[str],
-       dependencies: list) -> bool:
-    if config is None:
-        return True
+def qa(
+        python_version_manager: PythonVersionManagerStrategy,
+        quality_assurance_strategies: List[QualityAssuranceStrategy],
+        package_name: str,
+        src_folder_path: Optional[str],
+        dependencies: list
+) -> bool:
+    from .strategies import SystemInterpreter
     result = True
-    python_manager = config.python_manager
-    is_system_interpreter: bool = False
-    if python_manager is None:
-        from .managers import SystemInterpreter
-        python_manager = SystemInterpreter()
-        is_system_interpreter = True
-    pool = create_progress_bar_pool(config, python_manager)
+    if python_version_manager is None:
+        python_version_manager = SystemInterpreter()
+    is_system_interpreter = isinstance(python_version_manager, SystemInterpreter)
+    pool = create_progress_bar_pool(python_version_manager, quality_assurance_strategies)
     pool_err = create_pool_print_error(pool)
     with MultiContext(
             AttrContext(LayeredCommand, 'class_flush_stdout', False),
@@ -137,7 +148,7 @@ def qa(package_name: str, config: Optional[AdditionalConfiguration], src_folder_
             with executor:
                 executor._prev_instance = base
                 try:
-                    validate_dependencies(python_manager, dependencies, executor, env_name, pool_err)
+                    validate_dependencies(python_version_manager, dependencies, executor, env_name, pool_err)
                 except SystemExit:
                     result = False
                     continue
@@ -154,7 +165,7 @@ def qa(package_name: str, config: Optional[AdditionalConfiguration], src_folder_
                             src_folder_path,
                             executor,
                             use_system_interpreter=is_system_interpreter,
-                            raise_on_fail=python_manager.exit_on_fail,
+                            raise_on_fail=python_version_manager.exit_on_fail,
                             print_func=pool_err,
                             env_name=env_name
                         )
@@ -168,8 +179,8 @@ def qa(package_name: str, config: Optional[AdditionalConfiguration], src_folder_
                             f"Failed running '{runner.__class__.__name__}' on env '{env_name}'. "
                             f"Try manually: '{manual_command}'.")
                         pool.write(f"\tCaused by '{e.__cause__ or e}'")
-                        if python_manager.exit_on_fail:
-                            raise e
+                        if python_version_manager.exit_on_fail:
+                            raise RuntimeError() from e
     return result
 
 

quickpub-1.0.2/quickpub/strategies/__init__.py

@@ -0,0 +1,6 @@
+from .implementations import *
+from .upload_strategy import *
+from .quality_assurance_strategy import *
+from .quickpub_strategy import *
+from .build_strategy import *
+from .python_version_manager_strategy import *

quickpub-1.0.2/quickpub/strategies/build_strategy.py

@@ -0,0 +1,16 @@
+from abc import abstractmethod
+
+from .quickpub_strategy import QuickpubStrategy
+
+
+class BuildStrategy(QuickpubStrategy):
+    def __init__(self, verbose: bool = True) -> None:
+        self.verbose = verbose
+
+    @abstractmethod
+    def execute_strategy(self, *args, **kwargs) -> None: ...
+
+
+__all__ = [
+    "BuildStrategy"
+]

quickpub-1.0.2/quickpub/strategies/implementations/__init__.py

@@ -0,0 +1,9 @@
+from .pypirc_upload_strategy import *
+from .git_upload_strategy import *
+from .setuptools_build_strategy import *
+from .mypy_qa_strategy import *
+from .pylint_qa_strategy import *
+from .pytest_qa_strategy import *
+from .unittest_qa_strategy import *
+from .conda_python_version_manager_strategy import *
+from .system_interpreter import *

quickpub-1.0.1/quickpub/managers/implementations/conda.py → quickpub-1.0.2/quickpub/strategies/implementations/conda_python_version_manager_strategy.py

@@ -1,15 +1,15 @@
 from typing import Tuple, Optional, Set, Iterator, List
 from danielutils import LayeredCommand, warning
 
-from ..python_manager import PythonManager
+from ..python_version_manager_strategy import PythonVersionManagerStrategy
 
 
-class CondaPythonManager(PythonManager):
+class CondaPythonVersionManagerStrategy(PythonVersionManagerStrategy):
     def get_python_executable_name(self) -> str:
         return "python"
 
     def __init__(self, env_names: List[str]) -> None:
-        PythonManager.__init__(self, requested_envs=env_names, explicit_versions=[], exit_on_fail=True)
+        PythonVersionManagerStrategy.__init__(self, requested_envs=env_names, explicit_versions=[], exit_on_fail=True)
         self._cached_available_envs: Optional[Set[str]] = None
 
     def get_available_envs(self) -> Set[str]:
@@ -33,5 +33,5 @@ class CondaPythonManager(PythonManager):
 
 
 __all__ = [
-    'CondaPythonManager',
+    'CondaPythonVersionManagerStrategy',
 ]

quickpub-1.0.2/quickpub/strategies/implementations/git_upload_strategy.py

@@ -0,0 +1,26 @@
+from danielutils import info
+
+from ..upload_strategy import UploadStrategy
+
+class GitUploadStrategy(UploadStrategy):
+    def execute_strategy(self, version: str, **kwargs) -> None:
+        from quickpub.proxy import cm
+        from quickpub.enforcers import exit_if
+        if self.verbose:
+            info("Git")
+            info("\tStaging")
+        ret, stdout, stderr = cm("git add .")
+        exit_if(ret != 0, stderr.decode(encoding="utf8"))
+        if self.verbose:
+            info("\tCommitting")
+        ret, stdout, stderr = cm(f"git commit -m \"updated to version {version}\"")
+        exit_if(ret != 0, stderr.decode(encoding="utf8"))
+        if self.verbose:
+            info("\tPushing")
+        ret, stdout, stderr = cm("git push")
+        exit_if(ret != 0, stderr.decode(encoding="utf8"))
+
+
+__all__ = [
+    "GitUploadStrategy",
+]

quickpub-1.0.1/quickpub/runnables/implementations/mypy.py → quickpub-1.0.2/quickpub/strategies/implementations/mypy_qa_strategy.py

@@ -3,10 +3,10 @@ from typing import Optional, List
 
 from danielutils import LayeredCommand
 
-from ..base_runner import BaseRunner
+from ..quality_assurance_strategy import QualityAssuranceStrategy
 
 
-class MypyRunner(BaseRunner):
+class MypyRunner(QualityAssuranceStrategy):
     def _install_dependencies(self, base: LayeredCommand) -> None:
         with base:
             base("pip install pylint")
@@ -23,8 +23,8 @@ class MypyRunner(BaseRunner):
 
     def __init__(self, bound: str = "<15", configuration_path: Optional[str] = None,
                  executable_path: Optional[str] = None) -> None:
-        BaseRunner.__init__(self, name="mypy", bound=bound, configuration_path=configuration_path,
-                            executable_path=executable_path)
+        QualityAssuranceStrategy.__init__(self, name="mypy", bound=bound, configuration_path=configuration_path,
+                                          executable_path=executable_path)
 
     def _calculate_score(self, ret, lines: List[str], verbose: bool = False) -> float:
         from ...enforcers import exit_if

quickpub-1.0.1/quickpub/runnables/implementations/pylint.py → quickpub-1.0.2/quickpub/strategies/implementations/pylint_qa_strategy.py

@@ -3,10 +3,10 @@ from typing import Optional, List
 
 from danielutils import LayeredCommand
 
-from ..base_runner import BaseRunner
+from strategies.quality_assurance_strategy import QualityAssuranceStrategy
 
 
-class PylintRunner(BaseRunner):
+class PylintRunner(QualityAssuranceStrategy):
     def _install_dependencies(self, base: LayeredCommand) -> None:
         with base:
             base("pip install pylint")
@@ -15,8 +15,8 @@ class PylintRunner(BaseRunner):
 
     def __init__(self, bound: str = ">=0.8", configuration_path: Optional[str] = None,
                  executable_path: Optional[str] = None) -> None:
-        BaseRunner.__init__(self, name="pylint", bound=bound, configuration_path=configuration_path,
-                            executable_path=executable_path)
+        QualityAssuranceStrategy.__init__(self, name="pylint", bound=bound, configuration_path=configuration_path,
+                                          executable_path=executable_path)
 
     def _build_command(self, target: str, use_system_interpreter: bool = False) -> str:
         command: str = self.get_executable()

quickpub-1.0.2/quickpub/strategies/implementations/pypirc_upload_strategy.py

@@ -0,0 +1,44 @@
+import re
+
+from danielutils import file_exists, info
+
+from ..upload_strategy import UploadStrategy
+
+
+class PypircUploadStrategy(UploadStrategy):
+    REGEX_PATTERN: re.Pattern = re.compile(
+        r"\[distutils\]\nindex-servers =\n    pypi\n    testpypi\n\n\[pypi\]\nusername = __token__\npassword = .+\n\n\[testpypi\]\nusername = __token__\npassword = .+\n")
+
+    def execute_strategy(self, *, name: str, version: str, **kwargs) -> None:
+        from quickpub.proxy import cm
+        from quickpub.enforcers import exit_if
+        self._validate_file_exists()
+        self._validate_file_contents()
+        if self.verbose:
+            info("Uploading")
+        ret, stdout, stderr = cm("twine", "upload", "--config-file", ".pypirc",
+                                 f"dist/{name}-{version}.tar.gz")
+        exit_if(
+            ret != 0,
+            f"Failed uploading the package to pypi. Try running the following command manually:\n\ttwine upload --config-file .pypirc dist/{name}-{version}.tar.gz"
+        )
+
+    def _validate_file_exists(self) -> None:
+        if not file_exists(self.pypirc_file_path):
+            raise RuntimeError(f"{self.__class__.__name__} can't find pypirc file at '{self.pypirc_file_path}'")
+
+    def _validate_file_contents(self) -> None:
+        with open(self.pypirc_file_path, "r", encoding="utf8") as f:
+            text = f.read()
+        if not self.REGEX_PATTERN.match(text):
+            raise RuntimeError(
+                f"{self.__class__.__name__} checked the contents of '{self.pypirc_file_path}' and it failed to match the following regex: {self.REGEX_PATTERN.pattern}")
+
+    def __init__(self, pypirc_file_path: str = "./.pypirc", verbose: bool = False) -> None:
+        super().__init__(verbose)
+        self.pypirc_file_path = pypirc_file_path
+
+
+__all__ = [
+    "PypircUploadStrategy"
+]

quickpub-1.0.2/quickpub/strategies/implementations/pytest_qa_strategy.py

@@ -0,0 +1 @@
+# TODO

quickpub-1.0.2/quickpub/strategies/implementations/setuptools_build_strategy.py

@@ -0,0 +1,21 @@
+from danielutils import info
+
+from ..build_strategy import BuildStrategy
+
+
+class SetuptoolsBuildStrategy(BuildStrategy):
+    def execute_strategy(self, *args, **kwargs) -> None:
+        from quickpub.proxy import cm
+        from quickpub.enforcers import exit_if
+        if self.verbose:
+            info("Creating new distribution...")
+        ret, stdout, stderr = cm("python", "setup.py", "sdist")
+        exit_if(
+            ret != 0,
+            stderr.decode(encoding="utf8")
+        )
+
+
+__all__ = [
+    "SetuptoolsBuildStrategy",
+]

{quickpub-1.0.1/quickpub/managers → quickpub-1.0.2/quickpub/strategies}/implementations/system_interpreter.py

@@ -3,15 +3,15 @@ from typing import Set, Tuple, Iterator
 
 from danielutils import LayeredCommand
 
-from .. import PythonManager
+from ..python_version_manager_strategy import PythonVersionManagerStrategy
 
 
-class SystemInterpreter(PythonManager):
+class SystemInterpreter(PythonVersionManagerStrategy):
     def get_python_executable_name(self) -> str:
         return sys.executable
 
     def __init__(self) -> None:
-        PythonManager.__init__(self, requested_envs=["system"], explicit_versions=[], exit_on_fail=True)
+        PythonVersionManagerStrategy.__init__(self, requested_envs=["system"], explicit_versions=[], exit_on_fail=True)
 
     def __iter__(self) -> Iterator[Tuple[str, LayeredCommand]]:
         return iter([("system", LayeredCommand(""))])

quickpub-1.0.1/quickpub/runnables/implementations/unittest.py → quickpub-1.0.2/quickpub/strategies/implementations/unittest_qa_strategy.py

@@ -3,10 +3,10 @@ import os
 from typing import Optional, List
 from danielutils import get_current_working_directory, set_current_working_directory, LayeredCommand, warning
 
-from ..base_runner import BaseRunner
+from strategies.quality_assurance_strategy import QualityAssuranceStrategy
 
 
-class UnittestRunner(BaseRunner):
+class UnittestRunner(QualityAssuranceStrategy):
     def _install_dependencies(self, base: LayeredCommand) -> None:
         return None
 
@@ -23,7 +23,7 @@ class UnittestRunner(BaseRunner):
     RATING_PATTERN: re.Pattern = re.compile(r".*?([\d\.\/]+)")
 
     def __init__(self, target: Optional[str] = "./tests", bound: str = ">=0.8") -> None:
-        BaseRunner.__init__(self, name="unittest", bound=bound, target=target)
+        QualityAssuranceStrategy.__init__(self, name="unittest", bound=bound, target=target)
         self._cwd = ""
 
     def _build_command(self, src: str, *args, use_system_interpreter: bool = False) -> str: