common-python-tasks 0.0.1__tar.gz → 0.0.2__tar.gz

{common_python_tasks-0.0.1 → common_python_tasks-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: common-python-tasks
-Version: 0.0.1
+Version: 0.0.2
 Summary: Opinionated Poe the Poet tasks for Python package development.
 License-Expression: MIT
 License-File: LICENSE
@@ -26,8 +26,8 @@ Requires-Dist: pytest (>=9.0.1,<10.0.0)
 Requires-Dist: pytest-cov (>=7.0.0,<8.0.0)
 Requires-Dist: tomlkit (>=0.13.3,<0.14.0)
 Project-URL: Homepage, http://github.com/ci-sourcerer/common-python-tasks
-Project-URL: issues, http://github.com/ci-sourcerer/common-python-tasks/issues
-Project-URL: source, http://github.com/ci-sourcerer/common-python-tasks
+Project-URL: Issues, http://github.com/ci-sourcerer/common-python-tasks/issues
+Project-URL: Source, http://github.com/ci-sourcerer/common-python-tasks.git
 Description-Content-Type: text/markdown
 
 # Common Python tasks
@@ -41,7 +41,7 @@ This package is a collection of (very) opinionated [Poe the Poet Python tasks](h
 You can add `common-python-tasks` to a new project by using the handy automated installation script.
 
 ```shell
-curl -sSL https://api.github.com/repos/ci-sourcerer/common-python-tasks/contents/scripts/add-common-python-tasks.sh | TAGS_TO_INCLUDE="format lint test" sh
+curl -sSL https://api.github.com/repos/ci-sourcerer/common-python-tasks/contents/scripts/add-common-python-tasks.sh | jq -r '.content' | base64 -d | TAGS_TO_INCLUDE="format lint test" sh
 ```
 
 This will complete the following steps.

{common_python_tasks-0.0.1 → common_python_tasks-0.0.2}/README.md

@@ -9,7 +9,7 @@ This package is a collection of (very) opinionated [Poe the Poet Python tasks](h
 You can add `common-python-tasks` to a new project by using the handy automated installation script.
 
 ```shell
-curl -sSL https://api.github.com/repos/ci-sourcerer/common-python-tasks/contents/scripts/add-common-python-tasks.sh | TAGS_TO_INCLUDE="format lint test" sh
+curl -sSL https://api.github.com/repos/ci-sourcerer/common-python-tasks/contents/scripts/add-common-python-tasks.sh | jq -r '.content' | base64 -d | TAGS_TO_INCLUDE="format lint test" sh
 ```
 
 This will complete the following steps.

{common_python_tasks-0.0.1 → common_python_tasks-0.0.2}/pyproject.toml

@@ -29,12 +29,12 @@ dependencies = [
     "tomlkit (>=0.13.3,<0.14.0)",
 ]
 dynamic = []
-version = "0.0.1"
+version = "0.0.2"
 
 [project.urls]
-homepage = "http://github.com/ci-sourcerer/common-python-tasks"
-issues = "http://github.com/ci-sourcerer/common-python-tasks/issues"
-source = "http://github.com/ci-sourcerer/common-python-tasks"
+Homepage = "http://github.com/ci-sourcerer/common-python-tasks"
+Source = "http://github.com/ci-sourcerer/common-python-tasks.git"
+Issues = "http://github.com/ci-sourcerer/common-python-tasks/issues"
 
 [tool.poe]
 include_script = "common_python_tasks:tasks(exclude_tags=['containers'])"

{common_python_tasks-0.0.1 → common_python_tasks-0.0.2}/src/common_python_tasks/__init__.py

@@ -10,7 +10,9 @@ __version__ = "0.0.0"
 __all__ = ["TaskCollection"]
 
 
-def tasks(include_tags: Sequence[str] = tuple(), exclude_tags: Sequence[str] = tuple()):
+def tasks(
+    include_tags: "Sequence[str]" = tuple(), exclude_tags: "Sequence[str]" = tuple()
+):
     from .tasks import tasks
 
     return tasks(include_tags=include_tags, exclude_tags=exclude_tags)

common_python_tasks-0.0.2/src/common_python_tasks/data/.pytest_cache/.gitignore

@@ -0,0 +1,2 @@
+# Created by pytest automatically.
+*

common_python_tasks-0.0.2/src/common_python_tasks/data/.pytest_cache/CACHEDIR.TAG

@@ -0,0 +1,4 @@
+Signature: 8a477f597d28d172789f06886806bc55
+# This file is a cache directory tag created by pytest.
+# For information about cache directory tags, see:
+#	https://bford.info/cachedir/spec.html

common_python_tasks-0.0.2/src/common_python_tasks/data/.pytest_cache/README.md

@@ -0,0 +1,8 @@
+# pytest cache directory #
+
+This directory contains data from the pytest's cache plugin,
+which provides the `--lf` and `--ff` options, as well as the `cache` fixture.
+
+**Do not** commit this to version control.
+
+See [the docs](https://docs.pytest.org/en/stable/how-to/cache.html) for more information.

common_python_tasks-0.0.2/src/common_python_tasks/data/.pytest_cache/v/cache/nodeids

@@ -0,0 +1,47 @@
+[
+  "tests/test_build_image.py::TestBuildImageLatestTag::test_latest_tag_when_no_future_tags",
+  "tests/test_build_image.py::TestBuildImageLatestTag::test_no_latest_tag_when_future_tags_exist",
+  "tests/test_build_image.py::TestDockerignoreHandling::test_dockerignore_content_from_builtin",
+  "tests/test_build_image.py::TestDockerignoreHandling::test_preserves_existing_dockerignore",
+  "tests/test_build_image.py::TestDockerignoreHandling::test_temporary_dockerignore_cleanup_on_error",
+  "tests/test_build_image.py::TestDockerignoreHandling::test_temporary_dockerignore_created_and_removed",
+  "tests/test_build_image.py::TestDockerignoreHandling::test_uses_builtin_dockerignore_when_missing",
+  "tests/test_utilities.py::TestBumpVersion::test_bump_major_no_tags",
+  "tests/test_utilities.py::TestBumpVersion::test_bump_major_with_existing_tag",
+  "tests/test_utilities.py::TestBumpVersion::test_bump_minor_no_tags",
+  "tests/test_utilities.py::TestBumpVersion::test_bump_minor_with_existing_tag",
+  "tests/test_utilities.py::TestBumpVersion::test_bump_patch_alpha_no_tags",
+  "tests/test_utilities.py::TestBumpVersion::test_bump_patch_no_tags",
+  "tests/test_utilities.py::TestBumpVersion::test_bump_patch_with_existing_tag",
+  "tests/test_utilities.py::TestBumpVersion::test_bump_with_alpha_stage",
+  "tests/test_utilities.py::TestBumpVersion::test_bump_with_beta_stage",
+  "tests/test_utilities.py::TestBumpVersion::test_bump_with_rc_stage",
+  "tests/test_utilities.py::TestBumpVersion::test_bump_with_short_stage_names",
+  "tests/test_utilities.py::TestBumpVersion::test_case_insensitive_component",
+  "tests/test_utilities.py::TestBumpVersion::test_case_insensitive_stage",
+  "tests/test_utilities.py::TestBumpVersion::test_dirty_repo_fails",
+  "tests/test_utilities.py::TestBumpVersion::test_dry_run_no_tags",
+  "tests/test_utilities.py::TestBumpVersion::test_dry_run_with_existing_tag",
+  "tests/test_utilities.py::TestBumpVersion::test_invalid_component_fails",
+  "tests/test_utilities.py::TestBumpVersion::test_invalid_stage_fails",
+  "tests/test_utilities.py::TestBumpVersion::test_tag_without_v_prefix",
+  "tests/test_utilities.py::TestHasTagsLaterInHistory::test_git_tag_command_fails",
+  "tests/test_utilities.py::TestHasTagsLaterInHistory::test_has_tags_later_in_history",
+  "tests/test_utilities.py::TestHasTagsLaterInHistory::test_no_tags_exist",
+  "tests/test_utilities.py::TestHasTagsLaterInHistory::test_no_tags_later_in_history",
+  "tests/test_utilities.py::test_fatal_logs_and_exits",
+  "tests/test_utilities.py::test_fatal_with_custom_exit_code",
+  "tests/test_utilities.py::test_format_all_fails_when_no_tools_installed",
+  "tests/test_utilities.py::test_format_all_uses_run_available_tools",
+  "tests/test_utilities.py::test_is_package_installed_caches_results",
+  "tests/test_utilities.py::test_is_package_installed_handles_dashes",
+  "tests/test_utilities.py::test_is_package_installed_when_installed",
+  "tests/test_utilities.py::test_is_package_installed_when_not_installed",
+  "tests/test_utilities.py::test_lint_all_fails_when_no_tools_installed",
+  "tests/test_utilities.py::test_lint_all_uses_run_available_tools",
+  "tests/test_utilities.py::test_require_package_fails_when_not_installed",
+  "tests/test_utilities.py::test_require_package_succeeds_when_installed",
+  "tests/test_utilities.py::test_run_available_tools_fails_when_none_installed",
+  "tests/test_utilities.py::test_run_available_tools_runs_all_when_all_installed",
+  "tests/test_utilities.py::test_run_available_tools_runs_installed_tools"
+]

{common_python_tasks-0.0.1 → common_python_tasks-0.0.2}/src/common_python_tasks/tasks.py

@@ -740,84 +740,63 @@ def bump_version(
     component: str = "patch",
     *,
     stage: str | None = None,
+    dry_run: bool = False,
 ) -> None:
     """Bump the project version.
 
     Args:
-        component: The version component to bump: "major", "minor", or "patch".".
+        component: The version component to bump: "major", "minor", or "patch".
         stage: Optional pre-release stage to apply: "alpha", "beta", or "rc".
+        dry_run: If True, print what would happen without making changes.
     """
-    from dunamai import Style, Version
+    from dunamai import Version
 
     component = component.lower()
     stage = stage.lower() if stage is not None else None
 
-    # Check if repository is dirty
-    if _run_command(
-        ["git", "status", "--porcelain"], capture_output=True
-    ).stdout.strip():
+    valid_components = {"major": 0, "minor": 1, "patch": 2}
+    if component not in valid_components:
+        _fatal(f'Invalid component "{component}". Must be one of: major, minor, patch')
+    bump_index: "Literal[0, 1, 2]" = valid_components[component]
+
+    if stage is not None and stage not in {"alpha", "a", "beta", "b", "rc"}:
+        _fatal(f'Invalid stage "{stage}". Must be one of: alpha, beta, rc')
+
+    if _get_dirty_files():
         _fatal(
-            "Repository has uncommitted changes. Please commit or stash changes before bumping version."
+            "Repository has uncommitted changes. "
+            "Please commit or stash changes before bumping version."
         )
 
-    # Try to get the latest tag; default to v0.0.0 if none exist
-    last_tag_result = _run_command(
+    # Get the latest version tag
+    tag_result = _run_command(
         ["git", "describe", "--tags", "--abbrev=0"],
         capture_output=True,
         acceptable_returncodes={0, 128},
     )
-    last_tag = (
-        last_tag_result.stdout.strip() if last_tag_result.returncode == 0 else "v0.0.0"
-    )
 
-    # Check if current version equals the last tag, refuse to bump if so
-    current_version = _get_version()
-    # Normalize last tag by stripping leading 'v' if present
-    normalized_last_tag = last_tag[1:] if last_tag.startswith("v") else last_tag
-    if current_version == normalized_last_tag and last_tag != "v0.0.0":
-        _fatal(
-            "There have been no changes since the last version tag; cannot bump version as it would not change."
-        )
+    if tag_result.returncode == 0 and tag_result.stdout.strip():
+        version_str = tag_result.stdout.strip().lstrip("v")
+    else:
+        version_str = "0.0.0"
 
-    possible_components = ("major", "minor", "patch")
-    if component not in possible_components:
-        _fatal(
-            f'Invalid component "{component}". Must be one of: {"\n".join(possible_components)}'
-        )
-    component_index: "Literal[0, 1, 2]" = possible_components.index(component)
-
-    prerelease_options = {
-        "a": "alpha",
-        "alpha": "alpha",
-        "b": "beta",
-        "beta": "beta",
-        "rc": "rc",
-    }
-    normalized_stage = None
+    bumped = Version.parse(version_str).bump(bump_index)
+
+    # Apply pre-release stage if specified
     if stage is not None:
-        if stage not in prerelease_options:
-            _fatal(f'Invalid stage "{stage}". Must be one of: alpha, beta, rc')
-        normalized_stage = prerelease_options[stage]
-
-    # Bump version using dunamai
-    if last_tag == "v0.0.0":
-        # No real tags yet; bump from 0.0.0
-        base_version = Version.parse("0.0.0")
-        new_version = base_version.bump(component_index)
+        # Normalize stage name
+        bumped.stage = {"a": "alpha", "b": "beta"}.get(stage, stage)
+        bumped.revision = 1
+
+    # Format the new version string
+    new_version = bumped.serialize()
+
+    if dry_run:
+        LOGGER.info("Dry run: would bump version to %s", new_version)
     else:
-        new_version = Version.from_git().bump(component_index)
-
-    if normalized_stage is not None:
-        if new_version.stage != normalized_stage:
-            new_version.stage = normalized_stage
-            new_version.revision = 1
-        elif new_version.revision is None:
-            new_version.revision = 1
-
-    # Serialize without dirty flag for clean release tags
-    serialized = new_version.serialize(style=Style.Pep440)
-    LOGGER.info("Bumping version to %s", serialized)
-    _run_command(["git", "tag", f"v{serialized}"])
+        new_tag = f"v{new_version}"
+        LOGGER.info("Bumping version to %s", new_version)
+        _run_command(["git", "tag", new_tag])
 
 
 def _build(