pdfly 0.3.0__tar.gz → 0.3.2__tar.gz

pdfly-0.3.0/.github/workflows/release.yaml → pdfly-0.3.2/.github/workflows/create-github-release.yaml

@@ -1,42 +1,21 @@
-# This action assumes that there is a REL-commit which already has a
-# Markdown-formatted git tag. Hence the CHANGELOG is already adjusted
-# and it's decided what should be in the release.
-# This action only ensures the release is done with the proper contents
-# and that it's announced with a Github release.
-name: Publish Python Package to PyPI
+name: Create a GitHub release page
+
 on:
   push:
     tags:
       - '*.*.*'
+  workflow_dispatch:
+
+permissions:
+  contents: write
 
 jobs:
   build_and_publish:
-    name: Publish a new version
+    name: Create a GitHub release page
     runs-on: ubuntu-latest
-
     steps:
-      # Ensure it's on PyPI
       - name: Checkout Repository
         uses: actions/checkout@v4
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.x
-
-      - name: Install Flit
-        run: |
-          python -m pip install --upgrade pip
-          pip install flit
-
-      - name: Publish Package to PyPI🚀
-        env:
-          FLIT_USERNAME: '__token__'
-          FLIT_PASSWORD: ${{ secrets.FLIT_PASSWORD }}
-        run: |
-          flit publish
-
-      # Create the Github Page
       - name: Prepare variables
         id: prepare_variables
         run: |

{pdfly-0.3.0 → pdfly-0.3.2}/.github/workflows/github-ci.yaml

@@ -54,7 +54,7 @@ jobs:
         submodules: 'recursive'
     - name: Cache Downloaded Files
       id: cache-downloaded-files
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: '**/tests/pdf_cache/*'
         key: cache-downloaded-files

pdfly-0.3.2/.github/workflows/publish-to-pypi.yaml

@@ -0,0 +1,35 @@
+name: Publish Python Package to PyPI
+
+on:
+  push:
+    tags:
+      - '*.*.*'
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  build_and_publish:
+    name: Publish a new version
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+
+      - name: Install Flit
+        run: |
+          python -m pip install --upgrade pip
+          pip install flit
+
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Publish Package to PyPI🚀
+        env:
+          FLIT_USERNAME: '__token__'
+          FLIT_PASSWORD: ${{ secrets.FLIT_PASSWORD }}
+        run: |
+          flit publish

pdfly-0.3.2/.github/workflows/release.yaml

@@ -0,0 +1,47 @@
+# This action assumes that there is a REL-commit which already has a
+# Markdown-formatted git tag. Hence the CHANGELOG is already adjusted
+# and it's decided what should be in the release.
+# This action only ensures the release is done with the proper contents
+# and that it's announced with a Github release.
+name: Create git tag
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: write
+
+jobs:
+  build_and_publish:
+    name: Publish a new version
+    runs-on: ubuntu-latest
+    if: "${{ startsWith(github.event.head_commit.message, 'REL: ') }}"
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Extract version from commit message
+        id: extract_version
+        run: |
+          VERSION=$(echo "${{ github.event.head_commit.message }}" | grep -oP '(?<=REL: )\d+\.\d+\.\d+')
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
+      - name: Extract tag message from commit message
+        id: extract_message
+        run: |
+          VERSION="${{ steps.extract_version.outputs.version }}"
+          delimiter="$(openssl rand -hex 8)"
+          MESSAGE=$(echo "${{ github.event.head_commit.message }}" | sed "0,/REL: $VERSION/s///" )
+          echo "message<<${delimiter}" >> $GITHUB_OUTPUT
+          echo "$MESSAGE" >> $GITHUB_OUTPUT
+          echo "${delimiter}" >> $GITHUB_OUTPUT
+
+      - name: Create Git Tag
+        run: |
+          VERSION="${{ steps.extract_version.outputs.version }}"
+          MESSAGE="${{ steps.extract_message.outputs.message }}"
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+          git tag "$VERSION" -m "$MESSAGE"
+          git push origin $VERSION

{pdfly-0.3.0 → pdfly-0.3.2}/.gitignore

@@ -134,3 +134,7 @@ dmypy.json
 # Documentation files copied when building:
 docs/meta/CHANGELOG.md
 docs/meta/CONTRIBUTORS.md
+
+# 'make release' creates those files:
+RELEASE_COMMIT_MSG.md
+RELEASE_TAG_MSG.md

{pdfly-0.3.0 → pdfly-0.3.2}/.pre-commit-config.yaml

@@ -48,5 +48,7 @@ repos:
     rev: 'v1.7.1'
     hooks:
       - id: mypy
-        files: ^pypdf/.*
+        files: ^pdfly/.*
         args: [--ignore-missing-imports]
+        additional_dependencies:
+        - "pydantic>=1.10.4"

{pdfly-0.3.0 → pdfly-0.3.2}/CHANGELOG.md

@@ -1,5 +1,25 @@
 # CHANGELOG
 
+## Version 0.3.2, 2024-04-14
+
+### Developer Experience (DEV)
+-  Decouple git tag / PyPI release / Github release page (#49, #50)
+
+
+[Full Changelog](https://github.com/py-pdf/pdfly/compare/0.3.1...0.3.2)
+
+## Version 0.3.1, 2024-03-29
+
+### Maintenance (MAINT)
+-  Update pypdf usage (#48)
+
+### Developer Experience (DEV)
+-  Release via REL commit (#48)
+-  Fix mypy issues
+-  Add make_release.py
+
+[Full Changelog](https://github.com/py-pdf/pdfly/compare/0.3.0...0.3.1)
+
 ## Version 0.3.0, 2023-12-17
 
 ### New Features (ENH)

{pdfly-0.3.0 → pdfly-0.3.2}/Makefile

@@ -4,6 +4,10 @@ maint:
 	pip-compile -U requirements/dev.in
 	pip-compile -U requirements/docs.in
 
+release:
+	python make_release.py
+	git commit -eF RELEASE_COMMIT_MSG.md
+
 upload:
 	make clean
 	flit publish

{pdfly-0.3.0 → pdfly-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pdfly
-Version: 0.3.0
+Version: 0.3.2
 Summary: A pure-python CLI application to manipulate PDF files
 Author-email: Martin Thoma <info@martin-thoma.de>
 Maintainer-email: Martin Thoma <info@martin-thoma.de>

pdfly-0.3.2/make_release.py

@@ -0,0 +1,377 @@
+"""Internal tool to update the changelog."""
+
+import json
+import subprocess
+import urllib.request
+from dataclasses import dataclass
+from datetime import datetime, timezone
+from typing import Any, Dict, List, Tuple
+
+from rich.prompt import Prompt
+
+
+@dataclass(frozen=True)
+class Change:
+    """Capture the data of a git commit."""
+
+    commit_hash: str
+    prefix: str
+    message: str
+    author: str
+    author_login: str
+
+
+def main(changelog_path: str) -> None:
+    """
+    Create a changelog.
+
+    Args:
+        changelog_path: The location of the CHANGELOG file
+    """
+    changelog = get_changelog(changelog_path)
+    git_tag = get_most_recent_git_tag()
+    changes, changes_with_author = get_formatted_changes(git_tag)
+    if changes == "":
+        print("No changes")
+        return
+
+    new_version = version_bump(git_tag)
+    new_version = get_version_interactive(new_version, changes)
+    adjust_version_py(new_version)
+
+    today = datetime.now(tz=timezone.utc)
+    header = f"## Version {new_version}, {today:%Y-%m-%d}\n"
+    url = f"https://github.com/py-pdf/pdfly/compare/{git_tag}...{new_version}"
+    trailer = f"\n[Full Changelog]({url})\n\n"
+    new_entry = header + changes + trailer
+    print(new_entry)
+    write_commit_msg_file(new_version, changes_with_author + trailer)
+    write_release_msg_file(new_version, changes_with_author + trailer, today)
+
+    # Make the script idempotent by checking if the new entry is already in the changelog
+    if new_entry in changelog:
+        print("Changelog is already up-to-date!")
+        return
+
+    new_changelog = "# CHANGELOG\n\n" + new_entry + strip_header(changelog)
+    write_changelog(new_changelog, changelog_path)
+    print_instructions(new_version)
+
+
+def print_instructions(new_version: str) -> None:
+    """Print release instructions."""
+    print("=" * 80)
+    print(f"☑  _version.py was adjusted to '{new_version}'")
+    print("☑  CHANGELOG.md was adjusted")
+    print("")
+    print("Now run:")
+    print("  git commit -eF RELEASE_COMMIT_MSG.md")
+    print(f"  git tag -s {new_version} -eF RELEASE_TAG_MSG.md")
+    print("  git push")
+    print("  git push --tags")
+
+
+def adjust_version_py(version: str) -> None:
+    """Adjust the __version__ string."""
+    with open("pdfly/_version.py", "w") as fp:
+        fp.write(f'__version__ = "{version}"\n')
+
+
+def get_version_interactive(new_version: str, changes: str) -> str:
+    """Get the new __version__ interactively."""
+    print("The changes are:")
+    print(changes)
+    orig = new_version
+    new_version = Prompt.ask("New semantic version", default=orig)
+    while not is_semantic_version(new_version):
+        new_version = Prompt.ask(
+            "That was not a semantic version. Please enter a semantic version",
+            default=orig,
+        )
+    return new_version
+
+
+def is_semantic_version(version: str) -> bool:
+    """Check if the given version is a semantic version."""
+    # It's not so important to cover the edge-cases like pre-releases
+    # This is meant for pdfly only and we don't make pre-releases
+    if version.count(".") != 2:
+        return False
+    try:
+        return bool([int(part) for part in version.split(".")])
+    except Exception:
+        return False
+
+
+def write_commit_msg_file(new_version: str, commit_changes: str) -> None:
+    """
+    Write a file that can be used as a commit message.
+
+    Like this:
+
+        git commit -eF RELEASE_COMMIT_MSG.md && git push
+    """
+    with open("RELEASE_COMMIT_MSG.md", "w") as fp:
+        fp.write(f"REL: {new_version}\n\n")
+        fp.write("## What's new\n")
+        fp.write(commit_changes)
+
+
+def write_release_msg_file(
+    new_version: str, commit_changes: str, today: datetime
+) -> None:
+    """
+    Write a file that can be used as a git tag message.
+
+    Like this:
+
+        git tag -eF RELEASE_TAG_MSG.md && git push
+    """
+    with open("RELEASE_TAG_MSG.md", "w") as fp:
+        fp.write(f"Version {new_version}, {today:%Y-%m-%d}\n\n")
+        fp.write("## What's new\n")
+        fp.write(commit_changes)
+
+
+def strip_header(md: str) -> str:
+    """Remove the 'CHANGELOG' header."""
+    return md.lstrip("# CHANGELOG").lstrip()  # noqa
+
+
+def version_bump(git_tag: str) -> str:
+    """
+    Increase the patch version of the git tag by one.
+
+    Args:
+        git_tag: Old version tag
+
+    Returns:
+        The new version where the patch version is bumped.
+    """
+    # just assume a patch version change
+    major, minor, patch = git_tag.split(".")
+    return f"{major}.{minor}.{int(patch) + 1}"
+
+
+def get_changelog(changelog_path: str) -> str:
+    """
+    Read the changelog.
+
+    Args:
+        changelog_path: Path to the CHANGELOG file
+
+    Returns:
+        Data of the CHANGELOG
+    """
+    with open(changelog_path) as fh:
+        changelog = fh.read()
+    return changelog
+
+
+def write_changelog(new_changelog: str, changelog_path: str) -> None:
+    """
+    Write the changelog.
+
+    Args:
+        new_changelog: Contents of the new CHANGELOG
+        changelog_path: Path where the CHANGELOG file is
+    """
+    with open(changelog_path, "w") as fh:
+        fh.write(new_changelog)
+
+
+def get_formatted_changes(git_tag: str) -> Tuple[str, str]:
+    """
+    Format the changes done since the last tag.
+
+    Args:
+        git_tag: the reference tag
+
+    Returns:
+        Changes done since git_tag
+    """
+    commits = get_git_commits_since_tag(git_tag)
+
+    # Group by prefix
+    grouped: Dict[str, List[Dict[str, Any]]] = {}
+    for commit in commits:
+        if commit.prefix not in grouped:
+            grouped[commit.prefix] = []
+        grouped[commit.prefix].append(
+            {"msg": commit.message, "author": commit.author_login}
+        )
+
+    # Order prefixes
+    order = [
+        "SEC",
+        "DEP",
+        "ENH",
+        "PI",
+        "BUG",
+        "ROB",
+        "DOC",
+        "DEV",
+        "CI",
+        "MAINT",
+        "TST",
+        "STY",
+    ]
+    abbrev2long = {
+        "SEC": "Security",
+        "DEP": "Deprecations",
+        "ENH": "New Features",
+        "BUG": "Bug Fixes",
+        "ROB": "Robustness",
+        "DOC": "Documentation",
+        "DEV": "Developer Experience",
+        "CI": "Continuous Integration",
+        "MAINT": "Maintenance",
+        "TST": "Testing",
+        "STY": "Code Style",
+        "PI": "Performance Improvements",
+    }
+
+    # Create output
+    output = ""
+    output_with_user = ""
+    for prefix in order:
+        if prefix not in grouped:
+            continue
+        tmp = f"\n### {abbrev2long[prefix]} ({prefix})\n"  # header
+        output += tmp
+        output_with_user += tmp
+        for commit_dict in grouped[prefix]:
+            output += f"- {commit_dict['msg']}\n"
+            output_with_user += (
+                f"- {commit_dict['msg']} by @{commit_dict['author']}\n"
+            )
+        del grouped[prefix]
+
+    if grouped:
+        output += "\n### Other\n"
+        for prefix in grouped:
+            output += f"- {prefix}: {grouped[prefix]}\n"
+
+    return output, output_with_user
+
+
+def get_most_recent_git_tag() -> str:
+    """
+    Get the git tag most recently created.
+
+    Returns:
+        Most recently created git tag.
+    """
+    git_tag = str(
+        subprocess.check_output(
+            ["git", "describe", "--abbrev=0"], stderr=subprocess.STDOUT
+        )
+    ).strip("'b\\n")
+    return git_tag
+
+
+def get_author_mapping(line_count: int) -> Dict[str, str]:
+    """
+    Get the authors for each commit.
+
+    Args:
+        line_count: Number of lines from Git log output. Used for determining how
+            many commits to fetch.
+
+    Returns:
+        A mapping of long commit hashes to author login handles.
+    """
+    per_page = min(line_count, 100)
+    page = 1
+    mapping: Dict[str, str] = {}
+    for _ in range(0, line_count, per_page):
+        with urllib.request.urlopen(  # noqa: S310
+            f"https://api.github.com/repos/py-pdf/pdfly/commits?per_page={per_page}&page={page}"
+        ) as response:
+            commits = json.loads(response.read())
+        page += 1
+        for commit in commits:
+            print(commit)
+            if commit["author"]:
+                gh_handle = commit["author"]["login"]
+            else:
+                # This is not perfect, but better than the other option
+                gh_handle = commit["commit"]["author"]["name"].replace(" ", "")
+            mapping[commit["sha"]] = gh_handle
+    return mapping
+
+
+def get_git_commits_since_tag(git_tag: str) -> List[Change]:
+    """
+    Get all commits since the last tag.
+
+    Args:
+        git_tag: Reference tag from which the changes to the current commit are
+            fetched.
+
+    Returns:
+        List of all changes since git_tag.
+    """
+    commits = str(
+        subprocess.check_output(
+            [
+                "git",
+                "--no-pager",
+                "log",
+                f"{git_tag}..HEAD",
+                '--pretty=format:"%H:::%s:::%aN"',
+            ],
+            stderr=subprocess.STDOUT,
+        )
+    ).strip("'b\\n")
+    lines = commits.split("\\n")
+    authors = get_author_mapping(len(lines))
+    return [parse_commit_line(line, authors) for line in lines if line != ""]
+
+
+def parse_commit_line(line: str, authors: Dict[str, str]) -> Change:
+    """
+    Parse the first line of a git commit message.
+
+    Args:
+        line: The first line of a git commit message.
+
+    Returns:
+        The parsed Change object
+
+    Raises:
+        ValueError: The commit line is not well-structured
+    """
+    parts = line.split(":::")
+    if len(parts) != 3:
+        raise ValueError(f"Invalid commit line: '{line}'")
+    commit_hash, rest, author = parts
+    if ":" in rest:
+        prefix, message = rest.split(":", 1)
+    else:
+        prefix = ""
+        message = rest
+
+    # Standardize
+    message.strip()
+    commit_hash = commit_hash.strip('"')
+
+    if author.endswith('"'):
+        author = author[:-1]
+    author_login = authors[commit_hash]
+
+    prefix = prefix.strip()
+    if prefix == "DOCS":
+        prefix = "DOC"
+
+    return Change(
+        commit_hash=commit_hash,
+        prefix=prefix,
+        message=message,
+        author=author,
+        author_login=author_login,
+    )
+
+
+if __name__ == "__main__":
+    main("CHANGELOG.md")

pdfly-0.3.2/pdfly/_version.py

@@ -0,0 +1 @@
+__version__ = "0.3.2"

{pdfly-0.3.0 → pdfly-0.3.2}/pdfly/up2.py

@@ -18,7 +18,7 @@ def main(pdf: Path, output: Path) -> None:
     for i in range(0, len(reader.pages) - 1, 2):
         lhs = reader.pages[i]
         rhs = reader.pages[i + 1]
-        lhs.mergeTranslatedPage(rhs, float(lhs.mediabox.right), 0, True)
+        lhs.merge_translated_page(rhs, float(lhs.mediabox.right), 0, True)
         writer.add_page(lhs)
         print(str(i) + " ")
         sys.stdout.flush()

{pdfly-0.3.0 → pdfly-0.3.2}/pyproject.toml

@@ -143,3 +143,4 @@ max-complexity = 20  # Recommended: 10
 
 [tool.ruff.per-file-ignores]
 "sample-files/*" = ["D100", "INP001", "FA102", "I001"]
+"make_release.py" = ["T201", "S603", "S607"]

{pdfly-0.3.0 → pdfly-0.3.2}/requirements/dev.in

@@ -1,9 +1,11 @@
 black
 pip-tools
 pre-commit>=3.2.0
+pydantic
 pytest
 pytest-cov
 pytest-socket
 pytest-timeout
+rich
 twine
 wheel

{pdfly-0.3.0 → pdfly-0.3.2}/requirements/dev.txt

@@ -8,6 +8,8 @@ aiohttp==3.9.1
     # via black
 aiosignal==1.3.1
     # via aiohttp
+annotated-types==0.6.0
+    # via pydantic
 async-timeout==4.0.3
     # via aiohttp
 attrs==23.1.0
@@ -106,6 +108,10 @@ pre-commit==3.5.0
     # via -r requirements/dev.in
 pycparser==2.21
     # via cffi
+pydantic==2.5.2
+    # via -r requirements/dev.in
+pydantic-core==2.14.5
+    # via pydantic
 pygments==2.17.2
     # via
     #   readme-renderer
@@ -137,7 +143,9 @@ requests-toolbelt==1.0.0
 rfc3986==2.0.0
     # via twine
 rich==13.7.0
-    # via twine
+    # via
+    #   -r requirements/dev.in
+    #   twine
 secretstorage==3.3.3
     # via keyring
 tomli==2.0.1
@@ -152,7 +160,10 @@ twine==4.0.2
     # via -r requirements/dev.in
 typing-extensions==4.9.0
     # via
+    #   annotated-types
     #   black
+    #   pydantic
+    #   pydantic-core
     #   rich
 urllib3==2.1.0
     # via

pdfly-0.3.0/pdfly/_version.py

@@ -1 +0,0 @@
-__version__ = "0.3.0"