Extract common Python code to toml-fmt-common (#12)

tox-dev · Oct 20, 2024 · 85b99c9 · 85b99c9
1 parent 0f7af98
commit 85b99c9
Show file tree

Hide file tree

Showing 19 changed files with 184 additions and 812 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
-/common/target
-/target
-/pyproject-fmt/.tox
-/pyproject-fmt/dist
-/dist
+.tox
+target
+dist
+__pycache__
+_lib.abi3.*
diff --git a/common/README.md b/common/README.md
@@ -1,5 +1,5 @@
-# toml-fmt common
+# toml-fmt-common
 
-Contains code common to all formatters.
+Contains Rust code common to all formatters under the `toml-fmt` umbrella.
 
 [![Test common](https://github.com/tox-dev/toml-fmt/actions/workflows/common.yaml/badge.svg)](https://github.com/tox-dev/toml-fmt/actions/workflows/common.yaml)
diff --git a/pyproject-fmt/.github/FUNDING.yml b/pyproject-fmt/.github/FUNDING.yml
diff --git a/pyproject-fmt/.github/SECURITY.md b/pyproject-fmt/.github/SECURITY.md
diff --git a/pyproject-fmt/.github/dependabot.yml b/pyproject-fmt/.github/dependabot.yml
diff --git a/pyproject-fmt/.github/release.yml b/pyproject-fmt/.github/release.yml
diff --git a/pyproject-fmt/.github/workflows/check.yaml b/pyproject-fmt/.github/workflows/check.yaml
diff --git a/pyproject-fmt/.github/workflows/release.yaml b/pyproject-fmt/.github/workflows/release.yaml
diff --git a/pyproject-fmt/.gitignore b/pyproject-fmt/.gitignore
diff --git a/pyproject-fmt/.rustfmt.toml b/pyproject-fmt/.rustfmt.toml
diff --git a/pyproject-fmt/docs/index.rst b/pyproject-fmt/docs/index.rst
@@ -74,8 +74,8 @@ If not set they will default to values from the CLI, the example above shows the
 Command line interface
 ----------------------
 .. sphinx_argparse_cli::
-  :module: pyproject_fmt.cli
-  :func: _build_cli
+  :module: pyproject_fmt.__main__
+  :func: _build_our_cli
   :prog: pyproject-fmt
   :title:
 

diff --git a/pyproject-fmt/pyproject.toml b/pyproject-fmt/pyproject.toml
@@ -32,13 +32,13 @@ dynamic = [
   "version",
 ]
 dependencies = [
-  "tomli>=2.0.2; python_version<'3.11'",
+  "toml-fmt-common==1.0.1",
 ]
 urls."Bug Tracker" = "https://github.com/tox-dev/toml-fmt/issues"
 urls."Changelog" = "https://github.com/tox-dev/toml-fmt/blob/main/pyproject-fmt/CHANGELOG.md"
 urls.Documentation = "https://github.com/tox-dev/toml-fmt/"
 urls."Source Code" = "https://github.com/tox-dev/toml-fmt"
-scripts.pyproject-fmt = "pyproject_fmt.__main__:run"
+scripts.pyproject-fmt = "pyproject_fmt.__main__:runner"
 
 [tool.maturin]
 bindings = "pyo3"

diff --git a/pyproject-fmt/src/pyproject_fmt/__init__.py b/pyproject-fmt/src/pyproject_fmt/__init__.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from .__main__ import run
+from .__main__ import runner as run
 
 __all__ = [
     "run",