autopub 1.0.0a19__tar.gz → 1.0.0a21__tar.gz

autopub-1.0.0a21/PKG-INFO

@@ -0,0 +1,21 @@
+Metadata-Version: 2.1
+Name: autopub
+Version: 1.0.0a21
+Summary: Automatic package release upon pull request merge
+Home-page: https://github.com/autopub/autopub
+Author: Justin Mayer
+Author-email: entroP@gmail.com
+Requires-Python: >=3.9.0,<4.0
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Provides-Extra: github
+Requires-Dist: dunamai (>=1.23.0,<2.0.0)
+Requires-Dist: pydantic (>=2.10.5,<3.0.0)
+Requires-Dist: python-frontmatter (>=1.1.0,<2.0.0)
+Requires-Dist: tomlkit (>=0.13.2,<0.14.0)
+Project-URL: Issue Tracker, https://github.com/autopub/autopub/issues
+Project-URL: Repository, https://github.com/autopub/autopub

{autopub-1.0.0a19 → autopub-1.0.0a21}/autopub/__init__.py

@@ -2,11 +2,12 @@ from __future__ import annotations
 
 import hashlib
 import json
-from collections.abc import Iterable
+from functools import cached_property
 from pathlib import Path
-from typing import Mapping, TypeAlias
+from typing import Iterable, Mapping, TypeAlias
 
 import frontmatter
+import tomlkit
 from pydantic import ValidationError
 
 from autopub.exceptions import (
@@ -21,6 +22,7 @@ from autopub.exceptions import (
     ReleaseTypeInvalid,
     ReleaseTypeMissing,
 )
+from autopub.plugin_loader import load_plugins
 from autopub.plugins import (
     AutopubPackageManagerPlugin,
     AutopubPlugin,
@@ -35,12 +37,27 @@ ConfigType = Mapping[str, ConfigValue]
 
 
 class Autopub:
-    config: ConfigType = {}
     RELEASE_FILE_PATH = "RELEASE.md"
+    plugins: list[AutopubPlugin]
 
     def __init__(self, plugins: Iterable[type[AutopubPlugin]] = ()) -> None:
         self.plugins = [plugin_class() for plugin_class in plugins]
 
+        self.load_plugins()
+
+    @cached_property
+    def config(self) -> ConfigType:
+        pyproject_path = Path.cwd() / "pyproject.toml"
+
+        if not Path("pyproject.toml").exists():
+            return {}
+
+        content = pyproject_path.read_text()
+
+        data = tomlkit.parse(content)
+
+        return data.get("tool", {}).get("autopub", {})  # type: ignore
+
     @property
     def release_file(self) -> Path:
         return Path.cwd() / self.RELEASE_FILE_PATH
@@ -69,6 +86,17 @@ class Autopub:
 
         return ReleaseInfo.from_dict(release_info)
 
+    def load_plugins(self, default_plugins: list[str] | None = None) -> None:
+        default_plugins = default_plugins or []
+
+        additional_plugins: list[str] = self.config.get("plugins", [])  # type: ignore
+
+        all_plugins = default_plugins + additional_plugins
+
+        plugins = load_plugins(all_plugins)
+
+        self.plugins += [plugin_class() for plugin_class in plugins]
+
     def check(self) -> None:
         release_file = Path(self.RELEASE_FILE_PATH)
 

{autopub-1.0.0a19 → autopub-1.0.0a21}/autopub/cli/__init__.py

@@ -9,7 +9,6 @@ from rich.panel import Panel
 from typing_extensions import Annotated
 
 from autopub import Autopub
-from autopub.cli.plugins import find_plugins
 from autopub.exceptions import AutopubException, InvalidConfiguration
 
 app = typer.Typer()
@@ -19,14 +18,15 @@ class State(TypedDict):
     plugins: list[str]
 
 
-state: State = {"plugins": []}
+class AutoPubCLI(typer.Context):
+    obj: Autopub
 
 
 @app.command()
-def check():
+def check(context: AutoPubCLI):
     """This commands checks if the current PR has a valid release file."""
 
-    autopub = Autopub(plugins=find_plugins(state["plugins"]))
+    autopub = context.obj
 
     try:
         autopub.validate_config()
@@ -38,7 +38,8 @@ def check():
         for id_ in e.validation_errors:
             error = e.validation_errors[id_]
             parts.append("")
-            parts.append(f"[bold]Plugin:[/] {id_}")
+            parts.append(f"[bold on bright_magenta] Plugin: [/] {id_}")
+            parts.append("")
 
             errors: list[RenderableType] = []
 
@@ -46,7 +47,8 @@ def check():
                 location = " -> ".join(map(str, error["loc"]))
                 message = error["msg"]
 
-                errors.append(f"[bold blue]{location}[/]: {message}")
+                errors.append(f"[bold on blue] {location} [/]: {message}")
+                errors.append("")
 
             parts.append(Padding(Group(*errors), (0, 2)))
 
@@ -82,8 +84,8 @@ def check():
 
 
 @app.command()
-def build():
-    autopub = Autopub(plugins=find_plugins(state["plugins"]))
+def build(context: AutoPubCLI):
+    autopub = context.obj
 
     try:
         autopub.build()
@@ -96,8 +98,8 @@ def build():
 
 
 @app.command()
-def prepare():
-    autopub = Autopub(plugins=find_plugins(state["plugins"]))
+def prepare(context: AutoPubCLI):
+    autopub = context.obj
 
     try:
         autopub.prepare()
@@ -111,12 +113,13 @@ def prepare():
 
 @app.command()
 def publish(
+    context: AutoPubCLI,
     repository: Annotated[
         Optional[str],
         typer.Option("--repository", "-r", help="Repository to publish to"),
     ] = None,
 ):
-    autopub = Autopub(plugins=find_plugins(state["plugins"]))
+    autopub = context.obj
 
     try:
         autopub.publish(repository=repository)
@@ -130,28 +133,20 @@ def publish(
 
 @app.callback(invoke_without_command=True)
 def main(
-    plugins: list[str] = typer.Option(
-        [],
-        "--plugin",
-        "-p",
-        help="List of plugins to use",
-    ),
+    context: AutoPubCLI,
     should_show_version: Annotated[
         Optional[bool], typer.Option("--version", is_eager=True)
     ] = None,
 ):
-    state["plugins"] = plugins
-    state["plugins"].extend(
-        [
-            "git",
-            "update_changelog",
-            "bump_version",
-        ]
-    )
-
     if should_show_version:
         from importlib.metadata import version
 
         print(version("autopub"))
 
         raise typer.Exit()
+
+    autopub = Autopub()
+    # default plugins we always want to load (?)
+    autopub.load_plugins(["git", "update_changelog", "bump_version"])
+
+    context.obj = autopub

autopub-1.0.0a19/autopub/cli/plugins.py → autopub-1.0.0a21/autopub/plugin_loader.py

@@ -60,7 +60,7 @@ def _find_plugin(plugin: str) -> type[AutopubPlugin] | None:
     return None
 
 
-def find_plugins(names: list[str]) -> list[type[AutopubPlugin]]:
+def load_plugins(names: list[str]) -> list[type[AutopubPlugin]]:
     sys.path.append(os.getcwd())
 
     plugins: list[type] = []

autopub-1.0.0a21/autopub/plugins/uv.py

@@ -0,0 +1,34 @@
+from __future__ import annotations
+
+from typing import Any
+
+from autopub.plugins import AutopubPackageManagerPlugin, AutopubPlugin
+
+
+class UvPlugin(AutopubPlugin, AutopubPackageManagerPlugin):
+    def build(self) -> None:
+        self.run_command(["uv", "build"])
+
+    def publish(self, repository: str | None = None, **kwargs: Any) -> None:
+        additional_args: list[str] = []
+
+        if repository:
+            raise ValueError("Not yet implemented")
+
+        if publish_url := kwargs.get("publish_url"):
+            additional_args.append("--publish-url")
+            additional_args.append(publish_url)
+
+        if username := kwargs.get("username"):
+            additional_args.append("--username")
+            additional_args.append(username)
+
+        if password := kwargs.get("password"):
+            additional_args.append("--password")
+            additional_args.append(password)
+
+        if token := kwargs.get("token"):
+            additional_args.append("--token")
+            additional_args.append(token)
+
+        self.run_command(["uv", "publish", *additional_args])

{autopub-1.0.0a19 → autopub-1.0.0a21}/pyproject.toml

@@ -1,15 +1,15 @@
 [project]
-requires-python = ">=3.8"
-
-[tool.poetry]
+requires-python = ">=3.9.0,<4.0"
 name = "autopub"
-version = "1.0.0-alpha.19"
+version = "1.0.0-alpha.21"
 description = "Automatic package release upon pull request merge"
-authors = ["Justin Mayer <entroP@gmail.com>", "Patrick Arminio <patrick.arminio@gmail.com>"]
+authors = [
+    { name = "Justin Mayer", email = "entroP@gmail.com" },
+    { name = "Patrick Arminio", email = "patrick.arminio@gmail.com" },
+]
 license = "AGPL-3.0"
 readme = "README.md"
 keywords = ["automatic", "packaging", "publish", "release", "version"]
-repository = "https://github.com/autopub/autopub"
 
 classifiers = [
     "Development Status :: 4 - Beta",
@@ -21,29 +21,34 @@ classifiers = [
     "Topic :: System :: Systems Administration",
 ]
 
+[tool.poetry]
+repository = "https://github.com/autopub/autopub"
 include = ["autopub/py.typed"]
-
+name = "autopub"
+version = "1.0.0-alpha.21"
+description = "Automatic package release upon pull request merge"
+authors = [
+    "Justin Mayer <entroP@gmail.com>",
+    "Patrick Arminio <patrick.arminio@gmail.com>",
+]
 
 [tool.poetry.urls]
 "Issue Tracker" = "https://github.com/autopub/autopub/issues"
 
 [tool.poetry.dependencies]
-python = "^3.8"
-tomlkit = ">= 0.5, < 2.0"
-githubrelease = {version = "^1.5.9", optional = true}
-httpx = {version = "=0.16.1", optional = true}
-typer = "^0.9.0"
-rich = "^12.5.1"
-python-frontmatter = "^1.0.0"
-build = "^0.10.0"
-twine = "^4.0.2"
-dunamai = "^1.17.0"
-time-machine = "^2.13.0"
-pydantic = ">=2"
+python = ">=3.9.0,<4.0"
+python-frontmatter = "^1.1.0"
+tomlkit = "^0.13.2"
+pydantic = "^2.10.5"
+dunamai = "^1.23.0"
 
-[tool.poetry.dev-dependencies]
-githubrelease = "^1.5"
 
+[tool.poetry.dev-dependencies]
+backoff = { version = "~=2.1.2", optional = true }
+click = { version = "*", optional = true }
+linkheader = { version = "*", optional = true }
+requests = { version = "*", optional = true }
+httpx = { version = "*", optional = true }
 # Tasks
 invoke = "^1.6"
 
@@ -60,7 +65,7 @@ pytest = "^7.1.2"
 pytest-httpserver = "^1.0.8"
 
 [tool.poetry.extras]
-github = ["githubrelease", "httpx"]
+github = ["backoff", "click", "linkheader", "requests", "httpx"]
 
 [tool.poetry.scripts]
 autopub = "autopub.cli:app"
@@ -68,21 +73,17 @@ autopub = "autopub.cli:app"
 [tool.poetry.group.dev.dependencies]
 pytest-cov = "^4.1.0"
 pytest-mock = "^3.12.0"
+time-machine = "^2.16.0"
 
 [tool.autopub]
 project-name = "AutoPub"
 git-username = "botpub"
-git-email = "botpub@autopub.rocks"
+git-email = "52496925+botpub@users.noreply.github.com"
 append-github-contributor = true
 
 
 [tool.ruff]
-select = [
-  "I",
-  "E",
-  "F",
-  "UP",
-]
+select = ["I", "E", "F", "UP"]
 exclude = ["typings"]
 force-exclude = true
 

autopub-1.0.0a19/PKG-INFO

@@ -1,94 +0,0 @@
-Metadata-Version: 2.1
-Name: autopub
-Version: 1.0.0a19
-Summary: Automatic package release upon pull request merge
-Home-page: https://github.com/autopub/autopub
-License: AGPL-3.0
-Keywords: automatic,packaging,publish,release,version
-Author: Justin Mayer
-Author-email: entroP@gmail.com
-Requires-Python: >=3.8,<4.0
-Classifier: Development Status :: 4 - Beta
-Classifier: Environment :: Console
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: GNU Affero General Public License v3
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Topic :: System :: Software Distribution
-Classifier: Topic :: System :: Systems Administration
-Provides-Extra: github
-Requires-Dist: build (>=0.10.0,<0.11.0)
-Requires-Dist: dunamai (>=1.17.0,<2.0.0)
-Requires-Dist: githubrelease (>=1.5.9,<2.0.0) ; extra == "github"
-Requires-Dist: httpx (==0.16.1) ; extra == "github"
-Requires-Dist: pydantic (>=2)
-Requires-Dist: python-frontmatter (>=1.0.0,<2.0.0)
-Requires-Dist: rich (>=12.5.1,<13.0.0)
-Requires-Dist: time-machine (>=2.13.0,<3.0.0)
-Requires-Dist: tomlkit (>=0.5,<2.0)
-Requires-Dist: twine (>=4.0.2,<5.0.0)
-Requires-Dist: typer (>=0.9.0,<0.10.0)
-Project-URL: Issue Tracker, https://github.com/autopub/autopub/issues
-Project-URL: Repository, https://github.com/autopub/autopub
-Description-Content-Type: text/markdown
-
-# AutoPub
-
-[![Build Status](https://img.shields.io/circleci/build/github/autopub/autopub)](https://circleci.com/gh/autopub/autopub) [![PyPI Version](https://img.shields.io/pypi/v/autopub)](https://pypi.org/project/autopub/)
-
-AutoPub enables project maintainers to release new package versions to PyPI by merging pull requests.
-
-## Environment
-
-AutoPub is intended for use with continuous integration (CI) systems such as [GitHub Actions][], [CircleCI][], or [Travis CI][]. Projects used with AutoPub are built via [build][] and published via [Twine][]. Contributions that add support for other CI and build systems are welcome.
-
-## Configuration
-
-AutoPub settings can be configured via the `[tool.autopub]` table in the target project’s `pyproject.toml` file. Required settings include Git username and email address:
-
-```toml
-[tool.autopub]
-git-username = "Your Name"
-git-email = "your_email@example.com"
-```
-
-## Release Files
-
-Contributors should include a `RELEASE.md` file in their pull requests with two bits of information:
-
-* Release type: major, minor, or patch
-* Description of the changes, to be used as the changelog entry
-
-Example:
-
-    Release type: patch
-
-    Add function to update version strings in multiple files.
-
-## Usage
-
-The following `autopub` sub-commands can be used as steps in your CI flows:
-
-* `autopub check`: Check whether release file exists.
-* `autopub prepare`: Update version strings and add entry to changelog.
-* `autopub build`: Build the project.
-* `autopub commit`: Add, commit, and push incremented version and changelog changes.
-* `autopub githubrelease`: Create a new release on GitHub.
-* `autopub publish`: Publish a new release.
-
-For systems such as Travis CI in which only one deployment step is permitted, there is a single command that runs the above steps in sequence:
-
-* `autopub deploy`: Run `prepare`, `build`, `commit`, `githubrelease`, and `publish` in one invocation.
-
-
-[GitHub Actions]: https://github.com/features/actions
-[CircleCI]: https://circleci.com
-[Travis CI]: https://travis-ci.org
-[build]: https://pypa-build.readthedocs.io
-[Twine]: https://twine.readthedocs.io/
-

autopub-1.0.0a19/README.md

@@ -1,54 +0,0 @@
-# AutoPub
-
-[![Build Status](https://img.shields.io/circleci/build/github/autopub/autopub)](https://circleci.com/gh/autopub/autopub) [![PyPI Version](https://img.shields.io/pypi/v/autopub)](https://pypi.org/project/autopub/)
-
-AutoPub enables project maintainers to release new package versions to PyPI by merging pull requests.
-
-## Environment
-
-AutoPub is intended for use with continuous integration (CI) systems such as [GitHub Actions][], [CircleCI][], or [Travis CI][]. Projects used with AutoPub are built via [build][] and published via [Twine][]. Contributions that add support for other CI and build systems are welcome.
-
-## Configuration
-
-AutoPub settings can be configured via the `[tool.autopub]` table in the target project’s `pyproject.toml` file. Required settings include Git username and email address:
-
-```toml
-[tool.autopub]
-git-username = "Your Name"
-git-email = "your_email@example.com"
-```
-
-## Release Files
-
-Contributors should include a `RELEASE.md` file in their pull requests with two bits of information:
-
-* Release type: major, minor, or patch
-* Description of the changes, to be used as the changelog entry
-
-Example:
-
-    Release type: patch
-
-    Add function to update version strings in multiple files.
-
-## Usage
-
-The following `autopub` sub-commands can be used as steps in your CI flows:
-
-* `autopub check`: Check whether release file exists.
-* `autopub prepare`: Update version strings and add entry to changelog.
-* `autopub build`: Build the project.
-* `autopub commit`: Add, commit, and push incremented version and changelog changes.
-* `autopub githubrelease`: Create a new release on GitHub.
-* `autopub publish`: Publish a new release.
-
-For systems such as Travis CI in which only one deployment step is permitted, there is a single command that runs the above steps in sequence:
-
-* `autopub deploy`: Run `prepare`, `build`, `commit`, `githubrelease`, and `publish` in one invocation.
-
-
-[GitHub Actions]: https://github.com/features/actions
-[CircleCI]: https://circleci.com
-[Travis CI]: https://travis-ci.org
-[build]: https://pypa-build.readthedocs.io
-[Twine]: https://twine.readthedocs.io/