quickpub 0.6.0__tar.gz → 0.6.30__tar.gz

{quickpub-0.6.0 → quickpub-0.6.30}/PKG-INFO

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

{quickpub-0.6.0 → quickpub-0.6.30}/pyproject.toml

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

quickpub-0.6.30/quickpub/__init__.py

@@ -0,0 +1,2 @@
+from .__main__ import publish
+from .structures import Version, Config

{quickpub-0.6.0 → quickpub-0.6.30}/quickpub/__main__.py

@@ -1,16 +1,19 @@
-from typing import Optional, Union, cast
-from danielutils import error, get_python_version, get_files, directory_exists
+from typing import Optional, Union
+from danielutils import warning
+from .validators import validate_version, validate_python_version, validate_keywords, validate_dependencies, \
+    validate_source
 from .publish import build, upload, commit, metrics
 from .structures import Version, Config
 from .files import create_toml, create_setup
 from .classifiers import *
-from .enforce_version import enforce_correct_version
+from .enforcers import enforce_correct_version, enforce_pypirc_exists
+from .custom_types import Path
 
 
 def publish(
         *,
         name: str,
-        src: str,
+        src: Optional[Path] = None,
         version: Optional[Union[Version, str]] = None,
         author: str,
         author_email: str,
@@ -23,21 +26,31 @@ def publish(
         dependencies: Optional[list[str]] = None,
         config: Optional[Config] = None
 ) -> None:
-    if version is None:
-        version = Version(0, 0, 1)
-    else:
-        version: Version = version if isinstance(version, Version) else Version.from_str(version)  # type: ignore
+    """
 
+    :param name: The display name of the package
+    :param src: The source folder of the package, Defaults to CWD/<name>
+    :param version:
+    :param author:
+    :param author_email:
+    :param description:
+    :param homepage:
+    :param min_python:
+    :param keywords:
+    :param dependencies:
+    :param config:
+    :return:
+    """
+    enforce_pypirc_exists()
+    src = validate_source(name, src)
+    if src != f"./{name}":
+        warning(
+            "The source folder's name is different from the package's name. this may not be currently supported correctly")
+    version = validate_version(version)
     enforce_correct_version(name, version)
-
-    if min_python is None:
-        min_python = Version(*get_python_version())
-
-    if keywords is None:
-        keywords = []
-
-    if dependencies is None:
-        dependencies = []
+    min_python = validate_python_version(min_python)
+    keywords = validate_keywords(keywords)
+    dependencies = validate_dependencies(dependencies)
 
     create_setup()
     create_toml(

quickpub-0.6.30/quickpub/custom_types.py

@@ -0,0 +1,7 @@
+from typing import TypeAlias, TypeVar
+
+Path: TypeAlias = TypeVar("Path", bound=str)
+
+__all__ = [
+    "Path"
+]

quickpub-0.6.30/quickpub/enforcers.py

@@ -0,0 +1,42 @@
+import sys
+from typing import Union, Callable
+
+from danielutils import directory_exists, get_files, error, file_exists
+from .structures import Version
+
+
+def exit_if(predicate: Union[bool, Callable[[], bool]], msg: str) -> None:
+    if isinstance(predicate, bool):
+        if predicate:
+            error(msg)
+            sys.exit(1)
+    else:
+        if predicate():
+            error(msg)
+            sys.exit(1)
+
+
+def enforce_correct_version(name: str, version: Version) -> None:
+    if directory_exists("./dist"):
+        max_version = Version(0, 0, 0)
+        for d in get_files("./dist"):
+            d = d.removeprefix(f"{name}-").removesuffix(".tar.gz")
+            v = Version.from_str(d)
+            max_version = max(max_version, v)
+        exit_if(
+            version <= max_version,
+            f"Specified version is '{version}' but (locally available) latest existing is '{max_version}'"
+        )
+
+
+def enforce_pypirc_exists() -> None:
+    exit_if(
+        not file_exists("./.pypirc"),
+        "No .pypirc file found"
+    )
+
+
+__all__ = [
+    "enforce_correct_version",
+    "enforce_pypirc_exists"
+]

{quickpub-0.6.0 → quickpub-0.6.30}/quickpub/publish.py

@@ -1,6 +1,9 @@
 import sys
+from typing import Optional, Literal
+
 from danielutils import info, error
 
+from .enforcers import exit_if
 from .proxy import cm
 from .structures import Version
 
@@ -149,9 +152,10 @@ def build(
     if verbose:
         info("Creating new distribution...")
     ret, stdout, stderr = cm("python", "setup.py", "sdist")
-    if ret != 0:
-        error(stderr.decode(encoding="utf8"))
-        sys.exit(1)
+    exit_if(
+        ret != 0,
+        stderr.decode(encoding="utf8")
+    )
 
 
 def upload(
@@ -162,10 +166,11 @@ def upload(
 ) -> None:
     if verbose:
         info("Uploading")
-    ret, stdout, stderr = cm("wt.exe", "twine", "upload", "--config-file", ".pypirc", f"dist/{name}-{version}.tar.gz")
-    if ret != 0:
-        error(stderr.decode(encoding="utf8"))
-        sys.exit(1)
+    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 commit(
@@ -176,16 +181,28 @@ def commit(
     if verbose:
         info("Git")
         info("\tStaging")
-    cm("git add .")
+    ret, stdout, stderr = cm("git add .")
+    exit_if(
+        ret != 0,
+        stderr.decode(encoding="utf8")
+    )
     if verbose:
         info("\tCommitting")
-    cm(f"git commit -m \"updated to version {version}\"")
+    ret, stdout, stderr = cm(f"git commit -m \"updated to version {version}\"")
+    exit_if(
+        ret != 0,
+        stderr.decode(encoding="utf8")
+    )
     if verbose:
         info("\tPushing")
-    cm("git push")
+    ret, stdout, stderr = cm("git push")
+    exit_if(
+        ret != 0,
+        stderr.decode(encoding="utf8")
+    )
 
 
-def metrics():
+def metrics(testing_client: Optional[Literal["pytest", "unitest"]] = None):
     pass
 
 

quickpub-0.6.30/quickpub/validators.py

@@ -0,0 +1,46 @@
+from typing import Optional, Union
+
+from danielutils import get_python_version
+
+from .custom_types import Path
+from .structures import Version
+
+
+def validate_version(version: Optional[Union[str, Version]]) -> Version:
+    if version is None:
+        version = Version(0, 0, 1)
+    else:
+        version: Version = version if isinstance(version, Version) else Version.from_str(version)  # type: ignore
+    return version
+
+
+def validate_python_version(min_python: Optional[Version]) -> Version:
+    if min_python is not None:
+        return min_python
+    return Version(*get_python_version())
+
+
+def validate_keywords(keywords: Optional[list[str]]) -> list[str]:
+    if keywords is None:
+        return []
+    return keywords
+
+
+def validate_dependencies(dependencies: Optional[list[str]]) -> list[str]:
+    if dependencies is None:
+        return []
+    return dependencies
+
+
+def validate_source(name: str, src: Optional[Path] = None) -> Path:
+    if src is not None:
+        return src
+    return f"./{name}"
+
+
+__all__ = [
+    "validate_version",
+    "validate_python_version",
+    "validate_keywords",
+    "validate_dependencies"
+]

{quickpub-0.6.0 → quickpub-0.6.30}/quickpub.egg-info/PKG-INFO

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

{quickpub-0.6.0 → quickpub-0.6.30}/quickpub.egg-info/SOURCES.txt

@@ -4,12 +4,14 @@ setup.py
 quickpub/__init__.py
 quickpub/__main__.py
 quickpub/classifiers.py
-quickpub/enforce_version.py
+quickpub/custom_types.py
+quickpub/enforcers.py
 quickpub/files.py
 quickpub/proxy.py
 quickpub/publish.py
 quickpub/py.typed
 quickpub/structures.py
+quickpub/validators.py
 quickpub.egg-info/PKG-INFO
 quickpub.egg-info/SOURCES.txt
 quickpub.egg-info/dependency_links.txt

quickpub-0.6.0/quickpub/__init__.py

@@ -1,6 +0,0 @@
-from .__main__ import publish
-from .classifiers import *
-from .files import *
-from .publish import *
-from .structures import *
-from .proxy import *

quickpub-0.6.0/quickpub/enforce_version.py

@@ -1,23 +0,0 @@
-import sys
-from danielutils import directory_exists, get_files, error
-from .structures import Version
-
-
-def enforce_correct_version(name: str, version: Version) -> None:
-    if directory_exists("./dist"):
-        max_version = Version(0, 0, 0)
-        for d in get_files("./dist"):
-            d = d.removeprefix(f"{name}-").removesuffix(".tar.gz")
-            v = Version.from_str(d)
-            max_version = max(max_version, v)
-        if version < max_version:
-            error(f"Specified version is '{version}' but (locally available) latest is '{max_version}'")
-            sys.exit(1)
-        if version == max_version:
-            error(f"Version {version} already exists!")
-            sys.exit(1)
-
-
-__all__ = [
-    "enforce_correct_version"
-]