pycargoebuild 0.15.2__tar.gz → 0.16.0__tar.gz

{pycargoebuild-0.15.2 → pycargoebuild-0.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycargoebuild
-Version: 0.15.2
+Version: 0.16.0
 Summary: A generator for Rust/Cargo ebuilds written in Python
 Author-email: Michał Górny <mgorny@gentoo.org>
 Requires-Python: >=3.10

pycargoebuild-0.16.0/integration_test/fish-shell-4.8.0.ebuild

@@ -0,0 +1,204 @@
+# Copyright 2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.15.3
+
+EAPI=8
+
+CRATES="
+	aho-corasick@1.1.4
+	allocator-api2@0.2.21
+	anstream@1.0.0
+	anstyle-parse@1.0.0
+	anstyle-query@1.1.5
+	anstyle-wincon@3.0.11
+	anstyle@1.0.14
+	anyhow@1.0.102
+	assert_matches@1.5.0
+	autocfg@1.5.1
+	bitflags@2.11.1
+	block-buffer@0.10.4
+	bstr@1.12.1
+	cc@1.2.63
+	cfg-if@1.0.4
+	cfg_aliases@0.2.1
+	chacha20@0.10.0
+	clap@4.6.1
+	clap_builder@4.6.0
+	clap_complete@4.6.5
+	clap_derive@4.6.1
+	clap_lex@1.1.0
+	colorchoice@1.0.5
+	cpufeatures@0.2.17
+	cpufeatures@0.3.0
+	crossbeam-deque@0.8.6
+	crossbeam-epoch@0.9.18
+	crossbeam-utils@0.8.21
+	crypto-common@0.1.7
+	digest@0.10.7
+	dirs-sys@0.5.0
+	dirs@6.0.0
+	displaydoc@0.2.6
+	either@1.16.0
+	equivalent@1.0.2
+	errno@0.3.14
+	fastrand@2.4.1
+	find-msvc-tools@0.1.9
+	fluent-langneg@0.13.1
+	foldhash@0.1.5
+	foldhash@0.2.0
+	generic-array@0.14.7
+	getrandom@0.2.17
+	getrandom@0.3.4
+	getrandom@0.4.2
+	globset@0.4.18
+	hashbrown@0.15.5
+	hashbrown@0.17.1
+	heck@0.5.0
+	id-arena@2.3.0
+	ignore@0.4.25
+	indexmap@2.14.0
+	intl_pluralrules@7.0.2
+	is_executable@1.0.5
+	is_terminal_polyfill@1.70.2
+	itertools@0.14.0
+	itoa@1.0.18
+	jobserver@0.1.34
+	leb128fmt@0.1.0
+	libc@0.2.186
+	libredox@0.1.17
+	lock_api@0.4.14
+	log@0.4.30
+	lru@0.18.0
+	macro_rules_attribute-proc_macro@0.2.2
+	macro_rules_attribute@0.2.2
+	memchr@2.8.1
+	nix@0.30.1
+	nix@0.31.3
+	num-traits@0.2.19
+	once_cell@1.21.4
+	once_cell_polyfill@1.70.2
+	option-ext@0.2.0
+	parking_lot@0.12.5
+	parking_lot_core@0.9.12
+	paste@1.0.15
+	phf@0.13.1
+	phf_codegen@0.13.1
+	phf_generator@0.13.1
+	phf_shared@0.13.1
+	pkg-config@0.3.33
+	portable-atomic@1.13.1
+	prettyplease@0.2.37
+	proc-macro2@1.0.106
+	quote@1.0.45
+	r-efi@5.3.0
+	r-efi@6.0.0
+	rand@0.10.1
+	rand_core@0.10.1
+	redox_syscall@0.5.18
+	redox_users@0.5.2
+	regex-automata@0.4.14
+	regex-syntax@0.8.10
+	rsconf@0.3.0
+	rust-embed-impl@8.11.0
+	rust-embed-utils@8.11.0
+	rust-embed@8.11.0
+	rustc-hash@2.1.2
+	rustc_version@0.4.1
+	same-file@1.0.6
+	scc@2.4.0
+	scopeguard@1.2.0
+	sdd@3.0.10
+	self_cell@1.2.2
+	semver@1.0.28
+	serde@1.0.228
+	serde_core@1.0.228
+	serde_derive@1.0.228
+	serde_json@1.0.150
+	serial_test@3.4.0
+	serial_test_derive@3.4.0
+	sha2@0.10.9
+	shellexpand@3.1.2
+	shlex@1.3.0
+	shlex@2.0.1
+	siphasher@1.0.3
+	smallvec@1.15.1
+	strsim@0.11.1
+	strum_macros@0.28.0
+	syn@2.0.117
+	thiserror-impl@2.0.18
+	thiserror@2.0.18
+	tinystr@0.8.3
+	type-map@0.5.1
+	typenum@1.20.1
+	unic-langid-impl@0.9.6
+	unic-langid@0.9.6
+	unicode-ident@1.0.24
+	unicode-segmentation@1.13.2
+	unicode-width@0.2.2
+	unicode-xid@0.2.6
+	unix_path@1.0.1
+	unix_str@1.0.0
+	utf8parse@0.2.2
+	version_check@0.9.5
+	walkdir@2.5.0
+	wasi@0.11.1+wasi-snapshot-preview1
+	wasip2@1.0.1+wasi-0.2.4
+	wasip3@0.4.0+wasi-0.3.0-rc-2026-01-06
+	wasm-encoder@0.244.0
+	wasm-metadata@0.244.0
+	wasmparser@0.244.0
+	widestring@1.2.1
+	winapi-util@0.1.11
+	windows-link@0.2.1
+	windows-sys@0.60.2
+	windows-sys@0.61.2
+	windows-targets@0.53.5
+	windows_aarch64_gnullvm@0.53.1
+	windows_aarch64_msvc@0.53.1
+	windows_i686_gnu@0.53.1
+	windows_i686_gnullvm@0.53.1
+	windows_i686_msvc@0.53.1
+	windows_x86_64_gnu@0.53.1
+	windows_x86_64_gnullvm@0.53.1
+	windows_x86_64_msvc@0.53.1
+	wit-bindgen-core@0.51.0
+	wit-bindgen-rust-macro@0.51.0
+	wit-bindgen-rust@0.51.0
+	wit-bindgen@0.46.0
+	wit-bindgen@0.51.0
+	wit-component@0.244.0
+	wit-parser@0.244.0
+	xterm-color@1.0.2
+	zerofrom@0.1.8
+	zerovec@0.11.6
+	zmij@1.0.21
+"
+
+declare -A GIT_CRATES=(
+	[fluent-bundle]='https://github.com/danielrainer/fluent-rs;cf712bced280b217b6307edabc2089b3e57204ab;fluent-rs-%commit%/fluent-bundle'
+	[fluent-ftl-tools]='https://codeberg.org/danielrainer/fluent-ftl-tools;5917664c8f2e4928ef1e480ff5c13bbe1e226066;fluent-ftl-tools;gitea'
+	[fluent-syntax]='https://github.com/danielrainer/fluent-rs;cf712bced280b217b6307edabc2089b3e57204ab;fluent-rs-%commit%/fluent-syntax'
+	[fluent]='https://github.com/danielrainer/fluent-rs;cf712bced280b217b6307edabc2089b3e57204ab;fluent-rs-%commit%/fluent'
+	[gettext-po-file-parser]='https://codeberg.org/danielrainer/fluent-ftl-tools;5917664c8f2e4928ef1e480ff5c13bbe1e226066;fluent-ftl-tools/crates/gettext-po-file-parser;gitea'
+	[intl-memoizer]='https://github.com/danielrainer/fluent-rs;cf712bced280b217b6307edabc2089b3e57204ab;fluent-rs-%commit%/intl-memoizer'
+	[pcre2-sys]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%/pcre2-sys'
+	[pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%'
+)
+
+inherit cargo
+
+DESCRIPTION="proc-macro for extracting IDs for fluent translation"
+HOMEPAGE=""
+SRC_URI="
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="GPL-2 LGPL-2+ MIT PSF-2"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0 MIT MPL-2.0 Unicode-3.0 ZLIB
+	|| ( AGPL-3 GPL-2 )
+"
+SLOT="0"
+KEYWORDS="~amd64"

{pycargoebuild-0.15.2 → pycargoebuild-0.16.0}/integration_test/license-mapping.conf

@@ -10,14 +10,18 @@ BSL-1.0 = Boost-1.0
 CC0-1.0 = CC0-1.0
 EPL-2.0 = EPL-2.0
 ISC = ISC
+GPL-2.0-only = GPL-2
 GPL-3.0-only = GPL-3
 GPL-3.0-or-later = GPL-3+
+LGPL-2.0-or-later = LGPL-2+
 LGPL-3.0-only = LGPL-3
 MIT = MIT
 MIT-0 = MIT-0
 MPL-2.0 = MPL-2.0
 OFL-1.1 = OFL-1.1
+PSF-2.0 = PSF-2
 Ubuntu-font-1.0 = UbuntuFontLicense-1.0
+Unicode-3.0 = Unicode-3.0
 Unicode-DFS-2016 = Unicode-DFS-2016
 Unlicense = Unlicense
 Zlib = ZLIB

{pycargoebuild-0.15.2 → pycargoebuild-0.16.0}/integration_test/test_integration.py

@@ -131,7 +131,7 @@ PACKAGES = {
         uses_license_file=True,
         uses_plus_fallback=True),
     "rustls-0.20.7.ebuild": Package(
-        url="https://crates.io/api/v1/crates/rustls/0.20.7/download",
+        url="https://static.crates.io/crates/rustls/0.20.7/download",
         checksum="539a2bfe908f471bfa933876bd1eb6a1"
                  "9cf2176d375f82ef7f99530a40e48c2c",
         directories=["rustls-0.20.7"],
@@ -175,6 +175,13 @@ PACKAGES = {
         has_crates_without_license=True,
         uses_license_file=True,
         use_features=True),
+    "fish-shell-4.8.0.ebuild": Package(
+        url="https://github.com/fish-shell/fish-shell/archive/"
+            "refs/tags/4.8.0.tar.gz",
+        checksum="c27e91e3812608d70654cd0640670438"
+                 "60f39d9e3fa1171e3af326c852f3e209",
+        directories=["fish-shell-4.8.0/crates/fluent-extraction"],
+        expected_filename="fish-fluent-extraction-0.0.0.ebuild"),
 }
 
 

{pycargoebuild-0.15.2 → pycargoebuild-0.16.0}/pycargoebuild/__init__.py

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

{pycargoebuild-0.15.2 → pycargoebuild-0.16.0}/pycargoebuild/cargo.py

@@ -49,7 +49,7 @@ class FileCrate(Crate):
 
     @property
     def download_url(self) -> str:
-        return (f"https://crates.io/api/v1/crates/{self.name}/{self.version}/"
+        return (f"https://static.crates.io/crates/{self.name}/{self.version}/"
                 "download")
 
     @property
@@ -61,6 +61,7 @@ class GitHost(enum.Enum):
     GITHUB = enum.auto()
     GITLAB = enum.auto()
     GITLAB_SELFHOSTED = enum.auto()
+    GITEA = enum.auto()
 
 
 @dataclasses.dataclass(frozen=True)
@@ -79,6 +80,8 @@ class GitCrate(Crate):
             return GitHost.GITLAB
         if self.repository.startswith("https://gitlab."):
             return GitHost.GITLAB_SELFHOSTED
+        if self.repository.startswith("https://codeberg.org/"):
+            return GitHost.GITEA
         raise RuntimeError("Unsupported git crate source: "
                            f"{self.repository}")
 
@@ -96,13 +99,15 @@ class GitCrate(Crate):
                 return ".gl"
             case GitHost.GITLAB_SELFHOSTED:
                 return ""
+            case GitHost.GITEA:
+                return ".gt"
             case _ as host:
                 typing.assert_never(host)
 
     @property
     def download_url(self) -> str:
         match self.repo_host:
-            case GitHost.GITHUB:
+            case GitHost.GITHUB | GitHost.GITEA:
                 return f"{self.repository}/archive/{self.commit}.tar.gz"
             case GitHost.GITLAB | GitHost.GITLAB_SELFHOSTED:
                 return (f"{self.repository}/-/archive/{self.commit}/"
@@ -165,6 +170,8 @@ class GitCrate(Crate):
         match self.repo_host:
             case GitHost.GITHUB | GitHost.GITLAB:
                 return f"{self.repository};{self.commit};{subdir}"
+            case GitHost.GITEA:
+                return f"{self.repository};{self.commit};{subdir};gitea"
             case GitHost.GITLAB_SELFHOSTED:
                 crate_uri = self.download_url.replace(self.commit, "%commit%")
                 return f"{crate_uri};{self.commit};{subdir}"

{pycargoebuild-0.15.2 → pycargoebuild-0.16.0}/test/test_cargo.py

@@ -69,6 +69,12 @@ CARGO_LOCK_TOML = b'''
     version = "0.8.0"
     source = """git+https://gitlab.freedesktop.org/pipewire/pipewire-rs\\
                 ?tag=v0.8.0#449bf53f5d5edc8d0be6c0c80bc19d882f712dd7"""
+
+    [[package]]
+    name = "fluent-ftl-tools"
+    version = "0.1.0"
+    source = """git+https://codeberg.org/danielrainer/fluent-ftl-tools\\
+                #1234567890abcdef1234567890abcdef12345678"""
 '''
 
 PREHISTORIC_CARGO_LOCK_TOML = b"""
@@ -126,6 +132,9 @@ CRATES = [
     GitCrate("pipewire", "0.8.0",
              "https://gitlab.freedesktop.org/pipewire/pipewire-rs",
              "449bf53f5d5edc8d0be6c0c80bc19d882f712dd7"),
+    GitCrate("fluent-ftl-tools", "0.1.0",
+             "https://codeberg.org/danielrainer/fluent-ftl-tools",
+             "1234567890abcdef1234567890abcdef12345678"),
 ]
 
 
@@ -265,6 +274,35 @@ license = "MIT"
 """
 
 
+@pytest.mark.parametrize(
+    "repository,commit,download_url,filename",
+    [("https://github.com/01mf02/regex", "90eebbdb",
+      "https://github.com/01mf02/regex/archive/90eebbdb.tar.gz",
+      "regex-90eebbdb.gh.tar.gz"),
+     ("https://gitlab.com/virtio-fs/virtiofsd", "af439fbf",
+      ("https://gitlab.com/virtio-fs/virtiofsd/-/archive/af439fbf/"
+       "virtiofsd-af439fbf.tar.gz"),
+      "virtiofsd-af439fbf.gl.tar.gz"),
+     ("https://gitlab.freedesktop.org/pipewire/pipewire-rs", "449bf53f",
+      ("https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/archive/449bf53f/"
+       "pipewire-rs-449bf53f.tar.gz"),
+      "pipewire-rs-449bf53f.tar.gz"),
+     ("https://codeberg.org/danielrainer/fluent-ftl-tools", "12345678",
+      ("https://codeberg.org/danielrainer/fluent-ftl-tools/archive/"
+       "12345678.tar.gz"),
+      "fluent-ftl-tools-12345678.gt.tar.gz"),
+     ])
+def test_git_crate_urls(repository, commit, download_url, filename):
+    crate = GitCrate("test", "0.1", repository, commit)
+    assert crate.download_url == download_url
+    assert crate.filename == filename
+
+
+def test_git_crate_unsupported_host():
+    with pytest.raises(RuntimeError):
+        GitCrate("test", "0.1", "https://example.com/foo/bar", "0123abcd")
+
+
 @pytest.mark.parametrize(
     "name,expected",
     [("toplevel", ""),
@@ -274,7 +312,7 @@ license = "MIT"
 def test_git_crate_package_directory(tmp_path, name, expected):
     commit = "5ace474ad2e92da836de60afd9014cbae7bdd481"
     crate = GitCrate(name, "0.1",
-                     "https://github.com/projg2/pycargoebuild",
+                     "https://github.com/gentoo/pycargoebuild",
                      commit)
     basename = f"pycargoebuild-{commit}"
 
@@ -298,7 +336,7 @@ def test_git_crate_package_directory(tmp_path, name, expected):
 def test_git_crate_root_directory(tmp_path, have_lock):
     commit = "5ace474ad2e92da836de60afd9014cbae7bdd481"
     crate = GitCrate("pycargoebuild", "0.1",
-                     "https://github.com/projg2/pycargoebuild",
+                     "https://github.com/gentoo/pycargoebuild",
                      commit)
     basename = f"pycargoebuild-{commit}"
 
@@ -314,3 +352,29 @@ def test_git_crate_root_directory(tmp_path, have_lock):
             tarf.addfile(tar_info, io.BytesIO(b""))
 
     assert crate.get_root_directory(tmp_path) == PurePath(basename)
+
+
+@pytest.mark.parametrize(
+    "repository,expected",
+    [("https://github.com/gentoo/pycargoebuild",
+      "https://github.com/gentoo/pycargoebuild;{commit};{basename}/sub"),
+     ("https://codeberg.org/gentoo/pycargoebuild",
+      ("https://codeberg.org/gentoo/pycargoebuild;{commit};{basename}/sub;"
+       "gitea")),
+     ])
+def test_git_crate_entry(tmp_path, repository, expected):
+    commit = "5ace474ad2e92da836de60afd9014cbae7bdd481"
+    crate = GitCrate("subpkg", "0.1", repository, commit)
+    basename = f"pycargoebuild-{commit}"
+
+    with tarfile.open(tmp_path / crate.filename, "x:gz") as tarf:
+        tar_info = tarfile.TarInfo(f"{basename}/Cargo.toml")
+        tar_info.size = len(TOP_CARGO_TOML)
+        tarf.addfile(tar_info, io.BytesIO(TOP_CARGO_TOML))
+        tar_info = tarfile.TarInfo(f"{basename}/sub/Cargo.toml")
+        tar_info.size = len(SUB_CARGO_TOML)
+        tarf.addfile(tar_info, io.BytesIO(SUB_CARGO_TOML))
+
+    assert (crate.get_git_crate_entry(tmp_path) ==
+            expected.format(commit=commit,
+                            basename="pycargoebuild-%commit%"))