quickpub 2.0.1__tar.gz → 2.0.3__tar.gz

{quickpub-2.0.1/quickpub.egg-info → quickpub-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quickpub
-Version: 2.0.1
+Version: 2.0.3
 Summary: A python package to quickly configure and publish a new package
 Author-email: danielnachumdev <danielnachumdev@gmail.com>
 License: MIT License
@@ -34,21 +34,21 @@ Requires-Python: >=3.8.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
-# quickpub V1.0.3
+# quickpub V2.0.2
 **Tested python versions**: `3.8.0`, `3.9.0`, `3.10.13`,
 
 Example usage of how this package was published
 
 ```python
-from quickpub import publish, MypyRunner, PylintRunner, UnittestRunner, CondaPythonProvider,
-    PypircUploadTarget, SetuptoolsBuildSchema, GithubUploadTarget, PypircEnforcer, ReadmeEnforcer, LicenseEnforcer,
+from quickpub import publish, MypyRunner, PylintRunner, UnittestRunner, CondaPythonProvider, \
+    PypircUploadTarget, SetuptoolsBuildSchema, GithubUploadTarget, PypircEnforcer, ReadmeEnforcer, LicenseEnforcer, \
     PypiRemoteVersionEnforcer, LocalVersionEnforcer
 
 
 def main() -> None:
     publish(
         name="quickpub",
-        version="1.0.3",
+        version="2.0.2",
         author="danielnachumdev",
         author_email="danielnachumdev@gmail.com",
         description="A python package to quickly configure and publish a new package",
@@ -61,13 +61,12 @@ def main() -> None:
         upload_targets=[PypircUploadTarget(), GithubUploadTarget()],
         python_interpreter_provider=CondaPythonProvider(["base", "390", "380"]),
         global_quality_assurance_runners=[
-            MypyRunner(bound="<=15", configuration_path="./mypy.ini"),
+            MypyRunner(bound="<=20", configuration_path="./mypy.ini"),
             PylintRunner(bound=">=0.8", configuration_path="./.pylintrc"),
-            UnittestRunner(bound=">=0.8"),
+            UnittestRunner(bound=">=0.95"),
         ],
-        dependencies=["danielutils>=0.9.92", "requests"],
+        dependencies=["danielutils>=0.9.94", "requests"],
         min_python="3.8.0",
-        demo=True
     )
 
 

{quickpub-2.0.1 → quickpub-2.0.3}/README.md

@@ -1,18 +1,18 @@
-# quickpub V1.0.3
+# quickpub V2.0.2
 **Tested python versions**: `3.8.0`, `3.9.0`, `3.10.13`,
 
 Example usage of how this package was published
 
 ```python
-from quickpub import publish, MypyRunner, PylintRunner, UnittestRunner, CondaPythonProvider,
-    PypircUploadTarget, SetuptoolsBuildSchema, GithubUploadTarget, PypircEnforcer, ReadmeEnforcer, LicenseEnforcer,
+from quickpub import publish, MypyRunner, PylintRunner, UnittestRunner, CondaPythonProvider, \
+    PypircUploadTarget, SetuptoolsBuildSchema, GithubUploadTarget, PypircEnforcer, ReadmeEnforcer, LicenseEnforcer, \
     PypiRemoteVersionEnforcer, LocalVersionEnforcer
 
 
 def main() -> None:
     publish(
         name="quickpub",
-        version="1.0.3",
+        version="2.0.2",
         author="danielnachumdev",
         author_email="danielnachumdev@gmail.com",
         description="A python package to quickly configure and publish a new package",
@@ -25,13 +25,12 @@ def main() -> None:
         upload_targets=[PypircUploadTarget(), GithubUploadTarget()],
         python_interpreter_provider=CondaPythonProvider(["base", "390", "380"]),
         global_quality_assurance_runners=[
-            MypyRunner(bound="<=15", configuration_path="./mypy.ini"),
+            MypyRunner(bound="<=20", configuration_path="./mypy.ini"),
             PylintRunner(bound=">=0.8", configuration_path="./.pylintrc"),
-            UnittestRunner(bound=">=0.8"),
+            UnittestRunner(bound=">=0.95"),
         ],
-        dependencies=["danielutils>=0.9.92", "requests"],
+        dependencies=["danielutils>=0.9.94", "requests"],
         min_python="3.8.0",
-        demo=True
     )
 
 

{quickpub-2.0.1 → quickpub-2.0.3}/pyproject.toml

@@ -4,11 +4,11 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "quickpub"
-version = "2.0.1"
+version = "2.0.3"
 authors = [
     { name = "danielnachumdev", email = "danielnachumdev@gmail.com" },
 ]
-dependencies = ['danielutils>=0.9.94', 'requests']
+dependencies = ['danielutils>=1.0.0', 'requests']
 keywords = []
 license = { "file" = "./LICENSE" }
 description = "A python package to quickly configure and publish a new package"

{quickpub-2.0.1 → quickpub-2.0.3}/quickpub/__main__.py

@@ -1,6 +1,7 @@
-import argparse
 from typing import Optional, Union, List, Any
-from danielutils import warning, file_exists, error
+
+import fire
+from danielutils import warning, error
 
 from .strategies import BuildSchema, ConstraintEnforcer, UploadTarget, QualityAssuranceRunner, PythonProvider, \
     DefaultPythonProvider
@@ -120,42 +121,5 @@ def publish(
             target.upload(name=name, version=version)
 
 
-def parse_args():
-    parser = argparse.ArgumentParser(description="Publish a package")
-
-    parser.add_argument('--name', required=True, type=str, help='Name of the package')
-    parser.add_argument('--author', required=True, type=str, help='Author of the package')
-    parser.add_argument('--author_email', required=True, type=str, help='Email of the author')
-    parser.add_argument('--description', required=True, type=str, help='Description of the package')
-    parser.add_argument('--homepage', required=True, type=str, help='Homepage of the package')
-    parser.add_argument('--explicit_src_folder_path', type=str, help='Explicit source folder path')
-    parser.add_argument('--version', type=str, help='Version of the package')
-    parser.add_argument('--readme_file_path', type=str, default='./README.md', help='Path to the README file')
-    parser.add_argument('--license_file_path', type=str, default='./LICENSE', help='Path to the LICENSE file')
-    parser.add_argument('--min_python', type=str, help='Minimum Python version required')
-    parser.add_argument('--keywords', nargs='*', help='Keywords for the package')
-    parser.add_argument('--dependencies', nargs='*', help='Dependencies of the package')
-    parser.add_argument('--config', help='Additional configuration for the package')
-
-    return parser.parse_args()
-
-
 if __name__ == '__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
-    # )
+    fire.Fire(publish)

{quickpub-2.0.1 → quickpub-2.0.3}/quickpub/strategies/implementations/build_schemas/setuptools_build_schema.py

@@ -1,6 +1,9 @@
+import os
+import sys
+from pathlib import Path
 from typing import Literal
 
-from danielutils import info, file_exists, LayeredCommand
+from danielutils import info, file_exists, LayeredCommand, delete_file
 
 from ...build_schema import BuildSchema
 
@@ -15,8 +18,11 @@ class SetuptoolsBuildSchema(BuildSchema):
             raise self.EXCEPTION_TYPE(f"Could not find {self._setup_file_path} file")
         if verbose:
             info("Creating new distribution...")
+        sources_file_path: str = str(os.path.join(
+            str(Path(self._setup_file_path).parent.resolve()), "quickpub.egg-info/SOURCES.txt"))
+        delete_file(sources_file_path)
         with LayeredCommand() as exc:
-            ret, stdout, stderr = exc("python " + self._setup_file_path + " sdist")
+            ret, stdout, stderr = exc(sys.executable + " " + self._setup_file_path + " sdist")
         if ret != 0:
             raise self.EXCEPTION_TYPE(stderr)
 

{quickpub-2.0.1 → quickpub-2.0.3}/quickpub/strategies/implementations/constraint_enforcers/pypi_remote_version_enforcer.py

@@ -1,7 +1,7 @@
-from danielutils import RetryExecutor, ExponentialBackOffStrategy, ConstantBackOffStrategy
+from danielutils import RetryExecutor, MultiplicativeBackoff, ConstantBackOffStrategy
 from requests import Response
 
-from proxy import get  # type: ignore
+from quickpub.proxy import get  # type: ignore
 from quickpub import Version
 from ...constraint_enforcer import ConstraintEnforcer
 
@@ -14,7 +14,7 @@ class PypiRemoteVersionEnforcer(ConstraintEnforcer):
             return
         url = f"https://pypi.org/project/{name}/"
 
-        timeout_strategy = ExponentialBackOffStrategy(1.1, 1.5)
+        timeout_strategy = MultiplicativeBackoff(2)
 
         def wrapper() -> Response:
             return get(url, timeout=timeout_strategy.get_backoff())

{quickpub-2.0.1 → quickpub-2.0.3}/quickpub/strategies/implementations/constraint_enforcers/pypirc_enforcer.py

@@ -21,7 +21,7 @@ class PypircEnforcer(ConstraintEnforcer):
                 text = f.read()
 
             if not self.PYPIRC_REGEX.match(text):
-                raise self.EXCEPTION_TYPE(f"Couldn't enforce '{self.path}'")
+                raise self.EXCEPTION_TYPE(f"'{self.path}' has an invalid format.")
 
 
 __all__ = [

{quickpub-2.0.1 → quickpub-2.0.3}/quickpub/strategies/implementations/python_providers/default_python_provider.py

@@ -14,7 +14,7 @@ class DefaultPythonProvider(PythonProvider):
         PythonProvider.__init__(self, requested_envs=["system"], explicit_versions=[], exit_on_fail=True)
 
     def __iter__(self) -> Iterator[Tuple[str, LayeredCommand]]:
-        return iter([("system", LayeredCommand("", instance_flush_stderr=False, instance_flush_stdout=False))])
+        return iter([("system", LayeredCommand())])
 
     @classmethod
     def _get_available_envs_impl(cls) -> Set[str]:

{quickpub-2.0.1 → quickpub-2.0.3}/quickpub/strategies/implementations/quality_assurance_runners/pylint_qa_runner.py

@@ -27,8 +27,12 @@ class PylintRunner(QualityAssuranceRunner):
 
     def _calculate_score(self, ret: int, lines: List[str], verbose: bool = False) -> float:
         from quickpub.enforcers import exit_if
-        if len(lines) == 1 and lines[0].endswith("No module named pylint"):
-            raise RuntimeError("No module named pylint found")
+        if len(lines) == 0:
+            return 1
+        if len(lines) == 1:
+            if lines[0].endswith("No module named pylint"):
+                raise SystemExit("No module named pylint found")
+            raise SystemExit("Got an unexpected error!")
         index = -2
         if lines[-1] == '\x1b[0m':
             index += -1

{quickpub-2.0.1 → quickpub-2.0.3}/quickpub/strategies/implementations/quality_assurance_runners/pytest_qa_runner.py

@@ -1,4 +1,5 @@
 import re
+import sys
 from typing import List, Union
 
 from danielutils import LayeredCommand
@@ -58,7 +59,7 @@ class PytestRunner(QualityAssuranceRunner):
         if self.has_config:
             #TODO
             assert False
-        return f"python -m pytest {self.target}"
+        return f"{sys.executable} -m pytest {self.target}"
 
     def _install_dependencies(self, base: LayeredCommand) -> None:
         """
@@ -67,7 +68,7 @@ class PytestRunner(QualityAssuranceRunner):
         :param base: The base LayeredCommand object for executing commands.
         """
         with base:
-            base("pip install pytest")
+            base(f"{sys.executable} -m pip install pytest")
 
     def _calculate_score(self, ret: int, command_output: List[str], *, verbose: bool = False) -> float:
         """

{quickpub-2.0.1 → quickpub-2.0.3}/quickpub/strategies/implementations/quality_assurance_runners/unittest_qa_runner.py

@@ -6,6 +6,17 @@ from danielutils import get_current_working_directory, set_current_working_direc
 from ...quality_assurance_runner import QualityAssuranceRunner
 
 
+def _removesuffix(string: str, suffix: str) -> str:
+    """Remove a suffix from a string.
+
+    Replace this with str.removesuffix() from stdlib when minimum Python
+    version is 3.9.
+    """
+    if suffix and string.endswith(suffix):
+        return string[: -len(suffix)]
+    return string
+
+
 class UnittestRunner(QualityAssuranceRunner):
     NUM_TESTS_PATTERN: re.Pattern = re.compile(r"Ran (\d+) tests? in \d+\.\d+s")
     NUM_FAILED_PATTERN: re.Pattern = re.compile(r"FAILED \((?:failures=(\d+))?(?:, )?(?:errors=(\d+))?\)")
@@ -30,7 +41,7 @@ class UnittestRunner(QualityAssuranceRunner):
 
     def _build_command(self, src: str, *args, use_system_interpreter: bool = False) -> str:
         command: str = self.get_executable()
-        rel = os.path.relpath(src, self.target).removesuffix(src.lstrip("./\\"))
+        rel = _removesuffix(os.path.relpath(src, self.target), src.lstrip("./\\"))
         command += f" discover -s {rel}"
         return command  # f"cd {self.target}; {command}"  # f"; cd {self.target}"
 

{quickpub-2.0.1 → quickpub-2.0.3}/quickpub/strategies/quality_assurance_runner.py

@@ -1,6 +1,6 @@
 import sys
 from abc import abstractmethod
-from typing import Union, List, Optional, cast
+from typing import Union, List, Optional, cast, Dict, Tuple
 from danielutils import LayeredCommand, get_os, OSType, file_exists
 
 from quickpub import Bound
@@ -19,7 +19,7 @@ class Configurable:
 
 
 class HasOptionalExecutable:
-    PYTHON: str = "python" if get_os() == OSType.WINDOWS else "python3"
+    PYTHON: str = sys.executable
 
     @property
     def use_executable(self) -> bool:
@@ -45,6 +45,13 @@ class HasOptionalExecutable:
 from typing import Optional, Union, List
 from abc import abstractmethod
 
+SPEICLA_EXIT_CODES: Dict[int, Tuple[str, str]] = {
+    -1073741515: ("Can't find python in path.",
+                  "Executing command '{command}' failed with exit code {ret} which in hex is {hex} which corresponds to STATUS_DLL_NOT_FOUND"),
+    3221225781: ("Can't find python in path.",
+                 "Executing command '{command}' failed with exit code {ret} which in hex is {hex} which corresponds to STATUS_DLL_NOT_FOUND")
+}
+
 
 class QualityAssuranceRunner(Configurable, HasOptionalExecutable):
     """
@@ -139,6 +146,11 @@ class QualityAssuranceRunner(Configurable, HasOptionalExecutable):
         self._pre_command()
         try:
             ret, out, err = executor(command, command_raise_on_fail=False)
+            if ret in SPEICLA_EXIT_CODES:
+                title, explanation = SPEICLA_EXIT_CODES[ret]
+                unsigned_integer_ret = ret + 2 ** 32
+                raise RuntimeError(
+                    title + "\n\t" + explanation.format(command=command, ret=ret, hex=hex(unsigned_integer_ret)))
             score = self._calculate_score(ret, "".join(out + err).splitlines(), verbose=verbose)
             exit_if(not self.bound.compare_against(score),
                     f"On env '{env_name}' runner '{self.__class__.__name__}' failed to pass its defined bound. Got a score of {score} but expected {self.bound}",

{quickpub-2.0.1 → quickpub-2.0.3/quickpub.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quickpub
-Version: 2.0.1
+Version: 2.0.3
 Summary: A python package to quickly configure and publish a new package
 Author-email: danielnachumdev <danielnachumdev@gmail.com>
 License: MIT License
@@ -34,21 +34,21 @@ Requires-Python: >=3.8.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
-# quickpub V1.0.3
+# quickpub V2.0.2
 **Tested python versions**: `3.8.0`, `3.9.0`, `3.10.13`,
 
 Example usage of how this package was published
 
 ```python
-from quickpub import publish, MypyRunner, PylintRunner, UnittestRunner, CondaPythonProvider,
-    PypircUploadTarget, SetuptoolsBuildSchema, GithubUploadTarget, PypircEnforcer, ReadmeEnforcer, LicenseEnforcer,
+from quickpub import publish, MypyRunner, PylintRunner, UnittestRunner, CondaPythonProvider, \
+    PypircUploadTarget, SetuptoolsBuildSchema, GithubUploadTarget, PypircEnforcer, ReadmeEnforcer, LicenseEnforcer, \
     PypiRemoteVersionEnforcer, LocalVersionEnforcer
 
 
 def main() -> None:
     publish(
         name="quickpub",
-        version="1.0.3",
+        version="2.0.2",
         author="danielnachumdev",
         author_email="danielnachumdev@gmail.com",
         description="A python package to quickly configure and publish a new package",
@@ -61,13 +61,12 @@ def main() -> None:
         upload_targets=[PypircUploadTarget(), GithubUploadTarget()],
         python_interpreter_provider=CondaPythonProvider(["base", "390", "380"]),
         global_quality_assurance_runners=[
-            MypyRunner(bound="<=15", configuration_path="./mypy.ini"),
+            MypyRunner(bound="<=20", configuration_path="./mypy.ini"),
             PylintRunner(bound=">=0.8", configuration_path="./.pylintrc"),
-            UnittestRunner(bound=">=0.8"),
+            UnittestRunner(bound=">=0.95"),
         ],
-        dependencies=["danielutils>=0.9.92", "requests"],
+        dependencies=["danielutils>=0.9.94", "requests"],
         min_python="3.8.0",
-        demo=True
     )
 
 

quickpub-2.0.3/quickpub.egg-info/requires.txt

@@ -0,0 +1,2 @@
+danielutils>=1.0.0
+requests

quickpub-2.0.1/quickpub.egg-info/requires.txt

@@ -1,2 +0,0 @@
-danielutils>=0.9.94
-requests