articlepub 0.1.1__tar.gz → 0.1.2__tar.gz

{articlepub-0.1.1 → articlepub-0.1.2}/.github/workflows/release.yml

@@ -7,6 +7,7 @@ on:
 
 permissions:
   contents: write
+  id-token: write
 
 concurrency:
   group: release-${{ github.ref }}
@@ -16,6 +17,7 @@ jobs:
   release:
     name: Build, publish, and release
     runs-on: ubuntu-latest
+    environment: release
 
     steps:
       - name: Check out repository
@@ -72,9 +74,7 @@ jobs:
         run: uvx --from "dist/articlepub-${{ steps.version.outputs.version }}-py3-none-any.whl" articlepub --help
 
       - name: Publish to PyPI
-        env:
-          UV_PUBLISH_TOKEN: ${{ secrets.ARTICLEPUB_PYPI_UPLOAD_TOKEN }}
-        run: uv publish dist/* --check-url https://pypi.org/simple/articlepub/
+        run: uv publish dist/* --trusted-publishing always --check-url https://pypi.org/simple/articlepub/
 
       - name: Create GitHub release
         env:

{articlepub-0.1.1 → articlepub-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: articlepub
-Version: 0.1.1
+Version: 0.1.2
 Summary: Turn article URLs into Kindle-friendly EPUBs and optionally upload them to Calibre-Web.
 Author: Farhad
 Requires-Python: >=3.11
@@ -158,6 +158,13 @@ If you do not want to use an LLM, add `--provider none`.
 
 Run `uvx articlepub --help` or `uvx articlepub add --help` for the full CLI reference.
 
+Check the installed version:
+
+```bash
+uvx articlepub --version
+uvx articlepub version
+```
+
 ## Local Development
 
 From a checkout of this repository:
@@ -188,9 +195,9 @@ Before tagging, update the version in both places:
 Then commit, tag, and push:
 
 ```bash
-git tag v0.1.1
+git tag v0.1.2
 git push origin main
-git push origin v0.1.1
+git push origin v0.1.2
 ```
 
-The GitHub Action will run tests, build the wheel and source distribution, publish to PyPI using `secrets.ARTICLEPUB_PYPI_UPLOAD_TOKEN`, and create a GitHub Release with generated release notes.
+The GitHub Action will run tests, build the wheel and source distribution, publish to PyPI with Trusted Publishing, and create a GitHub Release with generated release notes. The PyPI trusted publisher should point at the `release` GitHub Actions environment.

{articlepub-0.1.1 → articlepub-0.1.2}/README.md

@@ -150,6 +150,13 @@ If you do not want to use an LLM, add `--provider none`.
 
 Run `uvx articlepub --help` or `uvx articlepub add --help` for the full CLI reference.
 
+Check the installed version:
+
+```bash
+uvx articlepub --version
+uvx articlepub version
+```
+
 ## Local Development
 
 From a checkout of this repository:
@@ -180,9 +187,9 @@ Before tagging, update the version in both places:
 Then commit, tag, and push:
 
 ```bash
-git tag v0.1.1
+git tag v0.1.2
 git push origin main
-git push origin v0.1.1
+git push origin v0.1.2
 ```
 
-The GitHub Action will run tests, build the wheel and source distribution, publish to PyPI using `secrets.ARTICLEPUB_PYPI_UPLOAD_TOKEN`, and create a GitHub Release with generated release notes.
+The GitHub Action will run tests, build the wheel and source distribution, publish to PyPI with Trusted Publishing, and create a GitHub Release with generated release notes. The PyPI trusted publisher should point at the `release` GitHub Actions environment.

{articlepub-0.1.1 → articlepub-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "articlepub"
-version = "0.1.1"
+version = "0.1.2"
 description = "Turn article URLs into Kindle-friendly EPUBs and optionally upload them to Calibre-Web."
 readme = "README.md"
 requires-python = ">=3.11"

articlepub-0.1.2/src/articlepub/__init__.py

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

{articlepub-0.1.1 → articlepub-0.1.2}/src/articlepub/cli.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import argparse
 from pathlib import Path
 
+from . import __version__
 from .cli_support import make_provider
 from .cli_ui import TerminalUI
 from .constants import DEFAULT_OUTPUT_DIR
@@ -30,6 +31,9 @@ def main(argv: list[str] | None = None) -> int:
             return _upload(args, ui)
         if args.command == "tui":
             return run_tui(ui)
+        if args.command == "version":
+            print(__version__)
+            return 0
         parser.print_help()
         return 2
     except Exception as exc:
@@ -194,6 +198,7 @@ def _calibre_config(args: argparse.Namespace) -> CalibreConfig:
 
 def _parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(prog="articlepub")
+    parser.add_argument("--version", action="version", version=__version__)
     sub = parser.add_subparsers(dest="command")
 
     add = sub.add_parser("add", help="Convert a URL to EPUB")
@@ -209,6 +214,7 @@ def _parser() -> argparse.ArgumentParser:
     _add_calibre_args(upload, require_url=True)
 
     sub.add_parser("tui", help="Run the interactive terminal UI")
+    sub.add_parser("version", help="Print the ArticlePub version")
     return parser
 
 

{articlepub-0.1.1 → articlepub-0.1.2}/tests/test_cli.py

@@ -5,6 +5,7 @@ from tempfile import TemporaryDirectory
 from unittest import TestCase
 from unittest.mock import patch
 
+from articlepub import __version__
 from articlepub.cli import main
 from articlepub.upload import UploadResult
 
@@ -13,6 +14,22 @@ FIXTURE = Path(__file__).parent / "fixtures" / "blog.html"
 
 
 class CliTest(TestCase):
+    def test_global_version_flag_prints_version(self) -> None:
+        stdout = io.StringIO()
+        with redirect_stdout(stdout), self.assertRaises(SystemExit) as exit_context:
+            main(["--version"])
+
+        self.assertEqual(exit_context.exception.code, 0)
+        self.assertEqual(stdout.getvalue(), f"{__version__}\n")
+
+    def test_version_command_prints_version(self) -> None:
+        stdout = io.StringIO()
+        with redirect_stdout(stdout):
+            code = main(["version"])
+
+        self.assertEqual(code, 0)
+        self.assertEqual(stdout.getvalue(), f"{__version__}\n")
+
     def test_add_local_file_without_provider(self) -> None:
         with TemporaryDirectory() as tmp:
             stdout = io.StringIO()

{articlepub-0.1.1 → articlepub-0.1.2}/uv.lock

@@ -4,5 +4,5 @@ requires-python = ">=3.11"
 
 [[package]]
 name = "articlepub"
-version = "0.1.1"
+version = "0.1.2"
 source = { editable = "." }

articlepub-0.1.1/src/articlepub/__init__.py

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