pycargoebuild 0.17.0__tar.gz → 0.17.2__tar.gz

{pycargoebuild-0.17.0 → pycargoebuild-0.17.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycargoebuild
-Version: 0.17.0
+Version: 0.17.2
 Summary: A generator for Rust/Cargo ebuilds written in Python
 Author-email: Michał Górny <mgorny@gentoo.org>
 Requires-Python: >=3.10
@@ -9,7 +9,7 @@ Classifier: License :: OSI Approved :: GNU General Public License v2 or later (G
 License-File: COPYING
 Requires-Dist: jinja2
 Requires-Dist: license_expression
-Requires-Dist: tomli >= 1.2.3; python_version < '3.11'
+Requires-Dist: tomli >= 2.4.0; python_version < '3.15'
 Requires-Dist: rich ; extra == "pretty-log"
 Requires-Dist: pytest ; extra == "test"
 Project-URL: Repository, https://gitweb.gentoo.org/proj/pycargoebuild.git/

{pycargoebuild-0.17.0 → pycargoebuild-0.17.2}/pycargoebuild/__init__.py

@@ -4,4 +4,4 @@
 
 """A generator for Rust/Cargo ebuilds written in Python"""
 
-__version__ = "0.17.0"
+__version__ = "0.17.2"

{pycargoebuild-0.17.0 → pycargoebuild-0.17.2}/pycargoebuild/__main__.py

@@ -2,6 +2,8 @@
 # (c) 2022-2026 Michał Górny <mgorny@gentoo.org>
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+from __future__ import annotations
+
 import argparse
 import datetime
 import enum
@@ -18,7 +20,7 @@ import tempfile
 import typing
 from pathlib import Path, PurePosixPath
 
-if sys.version_info >= (3, 11):
+if sys.version_info >= (3, 15):
     import tomllib
 else:
     import tomli as tomllib
@@ -90,7 +92,7 @@ def main(prog_name: str, *argv: str) -> int:
                        action="store_true",
                        help="Force overwriting the output file")
     opt_g.add_argument("-i", "--input", "--inplace",
-                       type=argparse.FileType("r", encoding="utf-8"),
+                       type=Path,
                        metavar="INPUT",
                        help="Update the CRATES and LICENSE variables "
                             "in the specified ebuild instead of creating "
@@ -117,7 +119,7 @@ def main(prog_name: str, *argv: str) -> int:
                        default="auto",
                        help="Fetcher to use")
     cfg_g.add_argument("-l", "--license-mapping",
-                       type=argparse.FileType("r", encoding="utf-8"),
+                       type=Path,
                        help="Path to license-mapping.conf file (default: "
                             "get from Portage)")
     cfg_g.add_argument("--no-config",
@@ -191,10 +193,8 @@ def main(prog_name: str, *argv: str) -> int:
         if default_distdir is not None:
             args.distdir = Path(default_distdir)
     if args.license_mapping is None:
-        default_license_mapping = config_toml_paths.get("license-mapping")
-        if default_license_mapping is not None:
-            args.license_mapping = open(default_license_mapping, "r",
-                                        encoding="utf-8")
+        # may still be None
+        args.license_mapping = config_toml_paths.get("license-mapping")
 
     if args.distdir is None or args.license_mapping is None:
         from portage import create_trees
@@ -204,11 +204,10 @@ def main(prog_name: str, *argv: str) -> int:
             args.distdir = Path(tree["porttree"].settings["DISTDIR"])
         if args.license_mapping is None:
             repo = Path(tree["porttree"].dbapi.repositories["gentoo"].location)
-            args.license_mapping = open(repo / "metadata/license-mapping.conf",
-                                        "r", encoding="utf-8")
+            args.license_mapping = repo / "metadata/license-mapping.conf"
 
-    load_license_mapping(args.license_mapping)
-    args.license_mapping.close()
+    with open(args.license_mapping, "r", encoding="utf-8") as f:
+        load_license_mapping(f)
     MAPPING.update(
         (k.lower(), v) for k, v
         in config_toml.get("license-mapping", {}).items())
@@ -348,7 +347,7 @@ def main(prog_name: str, *argv: str) -> int:
 
     if args.input is not None and args.output is None:
         # default to overwriting the input file
-        outfile = Path(args.input.name)
+        outfile = args.input
     else:
         # This warning is only relevant when constructing a new ebuild,
         # as otherwise we do not update other metadata.
@@ -391,17 +390,16 @@ def main(prog_name: str, *argv: str) -> int:
                               "overwrite it")
                 return 1
             with tempfile.NamedTemporaryFile(mode="wb",
-                                             dir=args.distdir,
+                                             dir=crate_tarball.parent,
                                              delete=False
                                              ) as cratef:
                 try:
-                    # typing: https://github.com/python/typeshed/issues/11072
                     with tarfile.open(fileobj=cratef,
                                       mode="w:xz",
                                       format=tarfile.GNU_FORMAT,
                                       encoding="UTF-8",
-                                      preset=9 | lzma.PRESET_EXTREME,  # type: ignore
-                                      ) as tar_out:  # type: ignore
+                                      preset=9 | lzma.PRESET_EXTREME,
+                                      ) as tar_out:
                         os.fchmod(cratef.fileno(), 0o666 & ~umask)
                         logging.info("Repacking crates ...")
                         repack_crates(tar_out, crates)
@@ -418,7 +416,7 @@ def main(prog_name: str, *argv: str) -> int:
     try:
         if args.input is not None:
             ebuild = update_ebuild(
-                args.input.read(),
+                args.input.read_text(encoding="utf-8"),
                 pkg_meta,
                 crates,
                 distdir=args.distdir,
@@ -467,10 +465,9 @@ def main(prog_name: str, *argv: str) -> int:
                                      delete=False) as outf:
         try:
             if args.input is not None:
-                st = os.stat(args.input.fileno())
+                st = args.input.stat()
                 os.chown(outf.fileno(), st.st_uid, st.st_gid)
                 os.chmod(outf.fileno(), stat.S_IMODE(st.st_mode))
-                args.input.close()
             else:
                 os.fchmod(outf.fileno(), 0o666 & ~umask)
             outf.write(ebuild)

{pycargoebuild-0.17.0 → pycargoebuild-0.17.2}/pycargoebuild/cargo.py

@@ -1,7 +1,9 @@
 # pycargoebuild
-# (c) 2022-2024 Michał Górny <mgorny@gentoo.org>
+# (c) 2022-2026 Michał Górny <mgorny@gentoo.org>
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+from __future__ import annotations
+
 import dataclasses
 import enum
 import functools
@@ -11,7 +13,7 @@ import typing
 import urllib.parse
 from pathlib import Path, PurePath
 
-if sys.version_info >= (3, 11):
+if sys.version_info >= (3, 15):
     import tomllib
 else:
     import tomli as tomllib
@@ -131,10 +133,7 @@ class GitCrate(Crate):
                 raise RuntimeError(
                     f"{root_dir}/Cargo.toml not found in {filename}")
             with tarf:
-                # tarfile.ExFileObject() is IO[bytes] while tomli/tomllib
-                # expects BinaryIO -- but it actually is compatible
-                # https://github.com/hukkin/tomli/issues/214
-                return (tomllib.load(tarf).get("workspace", {})  # type: ignore
+                return (tomllib.load(tarf).get("workspace", {})
                                           .get("package", {}))
 
     @functools.cache
@@ -149,9 +148,6 @@ class GitCrate(Crate):
                     if f is None:
                         continue
 
-                    # tarfile.ExFileObject() is IO[bytes] while tomli/tomllib
-                    # expects BinaryIO -- but it actually is compatible
-                    # https://github.com/hukkin/tomli/issues/214
                     try:
                         metadata = get_package_metadata(
                             f, workspace_toml)  # type: ignore
@@ -190,7 +186,7 @@ class GitCrate(Crate):
                     tarf = crate_tar.extractfile(tar_info)
                     assert tarf is not None
                     with tarf:
-                        if "workspace" in tomllib.load(tarf):  # type: ignore
+                        if "workspace" in tomllib.load(tarf):
                             return path.parent
         return None
 
@@ -205,7 +201,7 @@ class PackageMetadata(typing.NamedTuple):
     homepage: str | None = None
 
     def with_replaced_license(self, new_license: str | None
-                              ) -> "PackageMetadata":
+                              ) -> PackageMetadata:
         return PackageMetadata(name=self.name,
                                version=self.version,
                                features=self.features,

{pycargoebuild-0.17.0 → pycargoebuild-0.17.2}/pycargoebuild/ebuild.py

@@ -1,7 +1,9 @@
 # pycargoebuild
-# (c) 2022-2025 Michał Górny <mgorny@gentoo.org>
+# (c) 2022-2026 Michał Górny <mgorny@gentoo.org>
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+from __future__ import annotations
+
 import datetime
 import logging
 import re
@@ -10,7 +12,6 @@ import tarfile
 import typing
 import urllib.parse
 from functools import partial
-from pathlib import Path
 
 import jinja2
 import license_expression
@@ -26,6 +27,9 @@ from pycargoebuild.cargo import (
 from pycargoebuild.format import format_license_var
 from pycargoebuild.license import UnmatchedLicense, spdx_to_ebuild
 
+if typing.TYPE_CHECKING:
+    from pathlib import Path
+
 EBUILD_TEMPLATE = """\
 # Copyright {{year}} Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
@@ -72,7 +76,7 @@ src_configure() {
 """
 
 
-def get_CRATES(crates: typing.Iterable[Crate],
+def get_CRATES(crates: set[Crate],
                ) -> str:
     """
     Return the value of CRATES for the given crate list
@@ -231,7 +235,7 @@ def url_dquote_escape(value: str) -> str:
 
 
 def get_ebuild(pkg_meta: PackageMetadata,
-               crates: typing.Iterable[Crate],
+               crates: set[Crate],
                distdir: Path,
                *,
                crate_license: bool = True,
@@ -251,7 +255,7 @@ def get_ebuild(pkg_meta: PackageMetadata,
     compiled_template = jinja_env.from_string(template)
 
     return compiled_template.render(
-        crates=get_CRATES(crates if crate_tarball is None else ()),
+        crates=get_CRATES(crates if crate_tarball is None else set()),
         crate_licenses=(get_crate_LICENSE(crates, distdir, license_overrides)
                         if crate_license else None),
         description=bash_dquote_escape(collapse_whitespace(
@@ -313,7 +317,7 @@ class GitCratesSubst(CountingSubst):
 
 def update_ebuild(ebuild: str,
                   pkg_meta: PackageMetadata,
-                  crates: typing.Iterable[Crate],
+                  crates: set[Crate],
                   distdir: Path,
                   *,
                   crate_license: bool = True,
@@ -327,7 +331,7 @@ def update_ebuild(ebuild: str,
     if license_overrides is None:
         license_overrides = {}
     crates_repl = CountingSubst(
-        partial(get_CRATES, crates if crate_tarball is None else ()))
+        partial(get_CRATES, crates if crate_tarball is None else set()))
     git_crates_repl = GitCratesSubst(partial(get_GIT_CRATES, crates, distdir))
     crate_license_repl = (
         CountingSubst(partial(get_crate_LICENSE, crates, distdir,

{pycargoebuild-0.17.0 → pycargoebuild-0.17.2}/pycargoebuild/fetch.py

@@ -1,17 +1,21 @@
 # pycargoebuild
-# (c) 2022-2024 Michał Górny <mgorny@gentoo.org>
+# (c) 2022-2026 Michał Górny <mgorny@gentoo.org>
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+from __future__ import annotations
+
 import hashlib
 import subprocess
 import sys
 import tempfile
 import typing
-from pathlib import Path
 
 from pycargoebuild import __version__
 from pycargoebuild.cargo import Crate, FileCrate
 
+if typing.TYPE_CHECKING:
+    from pathlib import Path
+
 
 class ChecksumMismatchError(RuntimeError):
     def __init__(self,

{pycargoebuild-0.17.0 → pycargoebuild-0.17.2}/pycargoebuild/format.py

@@ -1,14 +1,16 @@
 # pycargoebuild
-# (c) 2022-2024 Michał Górny <mgorny@gentoo.org>
+# (c) 2022-2026 Michał Górny <mgorny@gentoo.org>
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+from __future__ import annotations
+
 import typing
 from textwrap import TextWrapper
 
 
 class CompoundGroup(typing.NamedTuple):
     prefix: list[str]
-    values: list[typing.Union[str, "CompoundGroup"]]
+    values: list[str | CompoundGroup]
     suffix: list[str]
 
 

{pycargoebuild-0.17.0 → pycargoebuild-0.17.2}/pycargoebuild/license.py

@@ -1,7 +1,9 @@
 # pycargoebuild
-# (c) 2022-2024 Michał Górny <mgorny@gentoo.org>
+# (c) 2022-2026 Michał Górny <mgorny@gentoo.org>
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+from __future__ import annotations
+
 import configparser
 import logging
 import typing
@@ -23,7 +25,7 @@ class UnmatchedLicense(RuntimeError):
         self.crate = crate
 
 
-def load_license_mapping(f: typing.IO["str"]) -> None:
+def load_license_mapping(f: typing.IO[str]) -> None:
     """Read license mapping from the specified file"""
     conf = configparser.ConfigParser(comment_prefixes=("#",),
                                      delimiters=("=",),
@@ -33,7 +35,9 @@ def load_license_mapping(f: typing.IO["str"]) -> None:
     MAPPING.update((k.lower(), v) for k, v in conf.items("spdx-to-ebuild"))
 
 
-def symbol_to_ebuild(license_symbol: license_expression.LicenseSymbol) -> str:
+def symbol_to_ebuild(license_symbol: license_expression.LicenseSymbol |
+                                     license_expression.LicenseWithExceptionSymbol
+                     ) -> str:
     full_key = str(license_symbol).lower()
     full_match = MAPPING.get(full_key)
     no_plus = MAPPING.get(full_key.replace("+", ""))
@@ -64,7 +68,7 @@ def spdx_to_ebuild(spdx: license_expression.Renderable) -> str:
     """
     Convert SPDX license expression to ebuild license string.
     """
-    def sub(x: license_expression.LicenseExpression, in_or: bool
+    def sub(x: license_expression.Renderable, in_or: bool
             ) -> typing.Generator[str, None, None]:
         if isinstance(x, license_expression.AND):
             if in_or:

{pycargoebuild-0.17.0 → pycargoebuild-0.17.2}/pyproject.toml

@@ -15,7 +15,7 @@ requires-python = ">=3.10"
 dependencies = [
     "jinja2",
     "license_expression",
-    "tomli >= 1.2.3; python_version < '3.11'",
+    "tomli >= 2.4.0; python_version < '3.15'",
 ]
 
 [project.optional-dependencies]
@@ -41,27 +41,6 @@ include = [
     "tox.ini",
 ]
 
-[tool.mypy]
-disallow_untyped_defs = true
-no_implicit_optional = true
-
-[[tool.mypy.overrides]]
-module = [
-    "integration_test.*",
-    "test.*",
-]
-# requiring explicit types for all test methods would be cumbersome
-disallow_untyped_defs = false
-check_untyped_defs = true
-
-[[tool.mypy.overrides]]
-module = [
-    "license_expression.*",
-    "portage.*",
-    "rich.*",
-]
-ignore_missing_imports = true
-
 [tool.pytest.ini_options]
 testpaths = [
     "test",
@@ -115,3 +94,6 @@ ignore = [
 [tool.ruff.lint.flake8-copyright]
 min-file-size = 1
 notice-rgx = "\\(c\\) \\d{4}(-\\d{4})?"
+
+[tool.ty.analysis]
+allowed-unresolved-imports = ["portage.**"]

{pycargoebuild-0.17.0 → pycargoebuild-0.17.2}/test/test_cargo.py

@@ -256,6 +256,26 @@ def test_get_package_metadata_default_version():
                             version="0.0.0"))
 
 
+def test_get_package_metadata_toml_1_1():
+    input_toml = b"""
+        [package]
+        name = "test"
+        version = "0"
+        license = "MIT"
+
+        [dependencies]
+        foo = {
+            version = "2",
+            features = ["a", "b"],
+        }
+    """
+
+    assert (get_package_metadata(io.BytesIO(input_toml)) ==
+            PackageMetadata(name="test",
+                            version="0",
+                            license="MIT"))
+
+
 TOP_CARGO_TOML = b"""\
 [package]
 name = "toplevel"

{pycargoebuild-0.17.0 → pycargoebuild-0.17.2}/test/test_ebuild.py

@@ -275,7 +275,7 @@ def test_get_ebuild_no_license(real_license_mapping, crate_dir, crates):
 
 
 def test_get_ebuild_no_crates(real_license_mapping, pkg_meta):
-    assert get_ebuild(pkg_meta, [], Path(".")) == textwrap.dedent(f"""\
+    assert get_ebuild(pkg_meta, set(), Path(".")) == textwrap.dedent(f"""\
         # Copyright {datetime.date.today().year} Gentoo Authors
         # Distributed under the terms of the GNU General Public License v2
 

{pycargoebuild-0.17.0 → pycargoebuild-0.17.2}/tox.ini

@@ -1,15 +1,16 @@
 [tox]
-envlist = qa,py310,py311,py312,py313,py314
+envlist = qa,py310,py311,py312,py313,py314,py315
 isolated_build = True
 
 [testenv]
 deps =
-    mypy
+    ty
 extras =
+    pretty-log
     test
 commands =
     pytest -vv {posargs:test}
-    mypy {posargs:integration_test pycargoebuild test}
+    ty check --python-version={py_dot_ver} {posargs:integration_test pycargoebuild test}
 
 [testenv:integration]
 deps =