ChatPyPI 0.1.2__tar.gz → 0.1.4__tar.gz

{chatpypi-0.1.2/src/ChatPyPI.egg-info → chatpypi-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ChatPyPI
-Version: 0.1.2
+Version: 0.1.4
 Summary: ChatPyPI: ChatArch Python package lifecycle helper extracted from ChatTool.
 Author-email: ChatArch <1073853456@qq.com>
 License-Expression: MIT
@@ -14,6 +14,8 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click>=8.0
+Requires-Dist: build<2.0.0,>=1.2.0
+Requires-Dist: twine<7.0.0,>=6.0.0
 Requires-Dist: chatstyle<0.2.0,>=0.1.0
 Requires-Dist: chatenv<0.3.0,>=0.2.0
 Provides-Extra: dev

{chatpypi-0.1.2 → chatpypi-0.1.4}/pyproject.toml

@@ -9,7 +9,7 @@ description = "ChatPyPI: ChatArch Python package lifecycle helper extracted from
 readme = "README.md"
 requires-python = ">=3.10"
 license = "MIT"
-dependencies = ["click>=8.0", "chatstyle>=0.1.0,<0.2.0", "chatenv>=0.2.0,<0.3.0"]
+dependencies = ["click>=8.0", "build>=1.2.0,<2.0.0", "twine>=6.0.0,<7.0.0", "chatstyle>=0.1.0,<0.2.0", "chatenv>=0.2.0,<0.3.0"]
 authors = [{name = "ChatArch", email = "1073853456@qq.com"}]
 keywords = ["chatpypi", "chatarch", "cli"]
 classifiers = [

{chatpypi-0.1.2 → chatpypi-0.1.4/src/ChatPyPI.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ChatPyPI
-Version: 0.1.2
+Version: 0.1.4
 Summary: ChatPyPI: ChatArch Python package lifecycle helper extracted from ChatTool.
 Author-email: ChatArch <1073853456@qq.com>
 License-Expression: MIT
@@ -14,6 +14,8 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click>=8.0
+Requires-Dist: build<2.0.0,>=1.2.0
+Requires-Dist: twine<7.0.0,>=6.0.0
 Requires-Dist: chatstyle<0.2.0,>=0.1.0
 Requires-Dist: chatenv<0.3.0,>=0.2.0
 Provides-Extra: dev

{chatpypi-0.1.2 → chatpypi-0.1.4}/src/ChatPyPI.egg-info/requires.txt

@@ -1,4 +1,6 @@
 click>=8.0
+build<2.0.0,>=1.2.0
+twine<7.0.0,>=6.0.0
 chatstyle<0.2.0,>=0.1.0
 chatenv<0.3.0,>=0.2.0
 

{chatpypi-0.1.2 → chatpypi-0.1.4}/src/chatpypi/__init__.py

@@ -40,4 +40,4 @@ __all__ = [
     "upload_distributions",
 ]
 
-__version__ = "0.1.2"
+__version__ = "0.1.4"

{chatpypi-0.1.2 → chatpypi-0.1.4}/src/chatpypi/main.py

@@ -5,6 +5,7 @@ from datetime import datetime, timezone
 import importlib
 import json
 import importlib.util
+import logging
 from pathlib import Path
 import re
 import subprocess
@@ -21,6 +22,9 @@ except ModuleNotFoundError:  # pragma: no cover
 
 
 DEFAULT_DIST_DIRNAME = "dist"
+logger = logging.getLogger(__name__)
+logger.addHandler(logging.NullHandler())
+
 LICENSE_TEMPLATES = {
     "MIT": """MIT License
 
@@ -1051,13 +1055,14 @@ def scaffold_package(
                       workflow_dispatch:
 
                     permissions:
-                      contents: write
-                      id-token: write
+                      contents: read
 
                     jobs:
                       publish:
                         runs-on: ubuntu-latest
-                        environment: pypi
+                        permissions:
+                          contents: read
+                          id-token: write
                         steps:
                           - uses: actions/checkout@v4
                             with:
@@ -1677,6 +1682,7 @@ def _clean_dist_dir(dist_dir: Path) -> None:
 def run_command(
     args: list[str], cwd: Path, env: dict[str, str] | None = None
 ) -> CommandResult:
+    logger.info("Running command", extra={"command_args": args, "cwd": str(cwd)})
     process = subprocess.run(
         args,
         cwd=str(cwd),
@@ -1685,6 +1691,10 @@ def run_command(
         text=True,
         check=False,
     )
+    logger.info(
+        "Command finished",
+        extra={"command_args": args, "cwd": str(cwd), "returncode": process.returncode},
+    )
     return CommandResult(
         args=list(args),
         returncode=process.returncode,
@@ -1724,12 +1734,28 @@ def build_package(
     elif wheel and not sdist:
         args.append("--wheel")
 
+    logger.info(
+        "Building package distributions",
+        extra={"project_dir": str(project_dir), "dist_dir": str(dist_dir)},
+    )
     result = _ensure_success(runner(args, project_dir), "Build")
     files = find_distributions(dist_dir)
     if not files:
+        logger.error(
+            "Build completed without distributions",
+            extra={"project_dir": str(project_dir), "dist_dir": str(dist_dir)},
+        )
         raise PyPICommandError(
             f"Build completed but no distributions were found under {dist_dir}"
         )
+    logger.info(
+        "Built package distributions",
+        extra={
+            "project_dir": str(project_dir),
+            "dist_dir": str(dist_dir),
+            "artifact_count": len(files),
+        },
+    )
     return result, files
 
 
@@ -1745,14 +1771,30 @@ def check_distributions(
     files = find_distributions(dist_dir)
     if not files:
         raise PyPICommandError(
-            f"No distributions found under {dist_dir}. Run `chattool pypi build` first."
+            f"No distributions found under {dist_dir}. Run `chatpypi build` first."
         )
 
     args = [sys.executable, "-m", "twine", "check"]
     if strict:
         args.append("--strict")
     args.extend(str(path) for path in files)
+    logger.info(
+        "Checking package distributions",
+        extra={
+            "project_dir": str(project_dir),
+            "dist_dir": str(dist_dir),
+            "artifact_count": len(files),
+        },
+    )
     result = _ensure_success(runner(args, project_dir), "Twine check")
+    logger.info(
+        "Checked package distributions",
+        extra={
+            "project_dir": str(project_dir),
+            "dist_dir": str(dist_dir),
+            "artifact_count": len(files),
+        },
+    )
     return result, files
 
 
@@ -1768,12 +1810,28 @@ def upload_distributions(
     files = find_distributions(dist_dir)
     if not files:
         raise PyPICommandError(
-            f"No distributions found under {dist_dir}. Run `chattool pypi build` first."
+            f"No distributions found under {dist_dir}. Run `chatpypi build` first."
         )
 
     args = [sys.executable, "-m", "twine", "upload"]
     if skip_existing:
         args.append("--skip-existing")
     args.extend(str(path) for path in files)
+    logger.info(
+        "Uploading package distributions",
+        extra={
+            "project_dir": str(project_dir),
+            "dist_dir": str(dist_dir),
+            "artifact_count": len(files),
+        },
+    )
     result = _ensure_success(runner(args, project_dir), "Twine upload")
+    logger.info(
+        "Uploaded package distributions",
+        extra={
+            "project_dir": str(project_dir),
+            "dist_dir": str(dist_dir),
+            "artifact_count": len(files),
+        },
+    )
     return result, files

chatpypi-0.1.4/tests/test_version.py

@@ -0,0 +1,85 @@
+from pathlib import Path
+import logging
+
+import chatpypi
+from chatpypi import CommandResult
+from chatpypi import __version__
+
+
+def test_version_present():
+    assert __version__ == "0.1.4"
+
+
+def test_public_package_api_exports_core_helpers(tmp_path):
+    assert chatpypi.normalize_module_name("ChatPyPI") == "chatpypi"
+    assert chatpypi.resolve_dist_dir(tmp_path) == tmp_path / "dist"
+    assert issubclass(chatpypi.PyPICommandError, RuntimeError)
+    assert callable(chatpypi.scaffold_package)
+    assert callable(chatpypi.build_package)
+    assert callable(chatpypi.check_distributions)
+    assert callable(chatpypi.upload_distributions)
+    assert callable(chatpypi.check_repository_conflicts)
+
+
+def test_scaffold_package_importable_api_creates_project(tmp_path):
+    project_dir = tmp_path / "DemoPkg"
+
+    result = chatpypi.scaffold_package(
+        package_name="DemoPkg",
+        description="Demo package",
+        initial_version="0.1.0",
+        requires_python=">=3.10",
+        license_name="MIT",
+        author="ChatArch",
+        email="1073853456@qq.com",
+        project_dir=project_dir,
+        template="default",
+    )
+
+    assert result.project_dir == project_dir
+    assert result.package_name == "DemoPkg"
+    assert result.module_name == "demopkg"
+    assert (project_dir / "pyproject.toml").exists()
+    assert (project_dir / "src" / "demopkg" / "__init__.py").exists()
+
+
+def test_runtime_dependencies_include_build_and_twine():
+    pyproject = Path(__file__).resolve().parents[1] / "pyproject.toml"
+    text = pyproject.read_text(encoding="utf-8")
+
+    assert '"build>=1.2.0,<2.0.0"' in text
+    assert '"twine>=6.0.0,<7.0.0"' in text
+
+
+def test_build_package_logs_and_returns_artifacts(tmp_path, caplog):
+    project_dir = tmp_path / "DemoBuild"
+    project_dir.mkdir()
+    (project_dir / "pyproject.toml").write_text("[project]\nname='demo'\n", encoding="utf-8")
+
+    def fake_runner(args, cwd):
+        dist_dir = Path(args[args.index("--outdir") + 1])
+        dist_dir.mkdir(parents=True, exist_ok=True)
+        (dist_dir / "demo-0.1.0-py3-none-any.whl").write_text(
+            "wheel", encoding="utf-8"
+        )
+        return CommandResult(args=list(args), returncode=0, stdout="built", stderr="")
+
+    with caplog.at_level(logging.INFO, logger="chatpypi.main"):
+        result, files = chatpypi.build_package(project_dir, runner=fake_runner)
+
+    assert result.returncode == 0
+    assert [path.name for path in files] == ["demo-0.1.0-py3-none-any.whl"]
+    assert "Building package distributions" in caplog.text
+    assert "Built package distributions" in caplog.text
+
+
+def test_check_distributions_error_mentions_chatpypi_build(tmp_path):
+    project_dir = tmp_path / "EmptyDist"
+    project_dir.mkdir()
+
+    try:
+        chatpypi.check_distributions(project_dir)
+    except chatpypi.PyPICommandError as exc:
+        assert "Run `chatpypi build` first" in str(exc)
+    else:  # pragma: no cover
+        raise AssertionError("expected PyPICommandError")

chatpypi-0.1.2/tests/test_version.py

@@ -1,41 +0,0 @@
-from pathlib import Path
-
-import chatpypi
-from chatpypi import __version__
-
-
-def test_version_present():
-    assert __version__ == "0.1.2"
-
-
-def test_public_package_api_exports_core_helpers(tmp_path):
-    assert chatpypi.normalize_module_name("ChatPyPI") == "chatpypi"
-    assert chatpypi.resolve_dist_dir(tmp_path) == tmp_path / "dist"
-    assert issubclass(chatpypi.PyPICommandError, RuntimeError)
-    assert callable(chatpypi.scaffold_package)
-    assert callable(chatpypi.build_package)
-    assert callable(chatpypi.check_distributions)
-    assert callable(chatpypi.upload_distributions)
-    assert callable(chatpypi.check_repository_conflicts)
-
-
-def test_scaffold_package_importable_api_creates_project(tmp_path):
-    project_dir = tmp_path / "DemoPkg"
-
-    result = chatpypi.scaffold_package(
-        package_name="DemoPkg",
-        description="Demo package",
-        initial_version="0.1.0",
-        requires_python=">=3.10",
-        license_name="MIT",
-        author="ChatArch",
-        email="1073853456@qq.com",
-        project_dir=project_dir,
-        template="default",
-    )
-
-    assert result.project_dir == project_dir
-    assert result.package_name == "DemoPkg"
-    assert result.module_name == "demopkg"
-    assert (project_dir / "pyproject.toml").exists()
-    assert (project_dir / "src" / "demopkg" / "__init__.py").exists()