mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-python/dulwich: drop 0.23.0, 0.23.1, 0.23.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
@@ -2,8 +2,6 @@ DIST autocfg-1.4.0.crate 17712 BLAKE2B 7f7300439899be03d001dd32b7e797bc4b9a58103
|
||||
DIST autocfg-1.5.0.crate 18729 BLAKE2B 27580e39b366c6fca02c9db09997b6415c409f12068f1249184268bf96fd85ba659e25ec730f99e10caf452f96c486f3d7442bf09c4552b5f39519b21d6f88cc SHA512 f279856f234d39d369623576acf9546a1ca24d7fe449f36d4fb93ea75a7efaf2c4015b9616a69bbbed358c5e5882e16b045352f046aa4c049b3d13b1e8257b08
|
||||
DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
|
||||
DIST dulwich-0.22.8.tar.gz 466542 BLAKE2B 2cec02b49e2ceb6a681e950454a2e84486a3ccc854c107fc0a051bbed99d77211760b3bf188bee065ac728b449e767f69148678412bcad49534d0d39b468c897 SHA512 bc38e79c9287357afc64324b0c52ff5b1db39138bf4f29062bb3a8b351f7000782c1c50f5284f6a6e4e2ff39cb3b811f7ee7ce4d2fd2302dd7d89c07faa19754
|
||||
DIST dulwich-0.23.0.tar.gz 575116 BLAKE2B 35d5945f32a2e8b53fe350820082cbe1c55241df7393384a3388d73a8589607926eaac3ed27133113227ae2b480dbed55c99ec8df04dbfcea3692e53a62bc0ec SHA512 d24ea390ee6aba420aaa34e60bd53bca864c1e5ca5a44f9ccb1154e5fd2de3cd1e1a90cd50ee0331b726cb4f1c9267e849058a00de4ed16ade0f6a5054b7c081
|
||||
DIST dulwich-0.23.1.tar.gz 649787 BLAKE2B ee2e6ca0b0338d34999a3c96528f944a487f418e09ec50e9712fed5beca1a0ad8efe475e6dcad23fb76065d3ec21948cb3f0f2d92a195a20054928025f98a471 SHA512 dfb5f7a101ee27476ac59d01ec8c269c70ce7141455e8b994b7d0c71edab881f088e7bdf2fcaea2f7e3b7516923d808acef75edde7bebcc7e112a0004ca2f2ea
|
||||
DIST dulwich-0.23.2.tar.gz 704361 BLAKE2B 2ba377c86a96069efa93f0e227297ba679bf04b346fe799f7b36a54bb38b51b9178c407d373a5f3e4adc4188d268ac3705a16ef98e84758cc3b8c2eaff1f5ecd SHA512 b3da400f7b89b0afd1ad14623a2a8765f2c36131f2b401ed2267637d961a65e9be32c6bb56c555d7c649d8d828088a83b433a66669b48e2a295b782fffcf9c22
|
||||
DIST heck-0.5.0.crate 11517 BLAKE2B 5365ec43b2239a76b33a174f1a4292ece4147f9d382a68c6c60db78fdc8bad0afb1d51a65bcb25e96675372faa4ea37c318265030b0546ba51942f7c929e1835 SHA512 f044fc9c3d22466629fd8f772ec0555350fd611c0cfadca51d99a3d2f10e155f77c1091916c8a95a6b9b499f366c2e99a5fbf45b010f988bfb9b2501bf9f6a76
|
||||
DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f
|
||||
|
||||
@@ -1,119 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
CARGO_OPTIONAL=1
|
||||
DISTUTILS_EXT=1
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{11..13} )
|
||||
|
||||
CRATES="
|
||||
autocfg@1.4.0
|
||||
heck@0.5.0
|
||||
indoc@2.0.5
|
||||
libc@0.2.170
|
||||
memchr@2.7.5
|
||||
memoffset@0.9.1
|
||||
once_cell@1.20.3
|
||||
portable-atomic@1.11.0
|
||||
proc-macro2@1.0.93
|
||||
pyo3-build-config@0.25.1
|
||||
pyo3-ffi@0.25.1
|
||||
pyo3-macros-backend@0.25.1
|
||||
pyo3-macros@0.25.1
|
||||
pyo3@0.25.1
|
||||
quote@1.0.38
|
||||
syn@2.0.98
|
||||
target-lexicon@0.13.2
|
||||
unicode-ident@1.0.17
|
||||
unindent@0.2.3
|
||||
"
|
||||
|
||||
inherit cargo distutils-r1 pypi
|
||||
|
||||
DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
|
||||
HOMEPAGE="
|
||||
https://github.com/jelmer/dulwich/
|
||||
https://pypi.org/project/dulwich/
|
||||
"
|
||||
SRC_URI+="
|
||||
native-extensions? (
|
||||
${CARGO_CRATE_URIS}
|
||||
)
|
||||
"
|
||||
|
||||
LICENSE="GPL-2+ Apache-2.0"
|
||||
LICENSE+=" native-extensions? ("
|
||||
# Dependent crate licenses
|
||||
LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0"
|
||||
LICENSE+=" )"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="doc examples +native-extensions test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-python/urllib3-1.25[${PYTHON_USEDEP}]
|
||||
"
|
||||
BDEPEND="
|
||||
native-extensions? (
|
||||
${RUST_DEPEND}
|
||||
dev-python/setuptools-rust[${PYTHON_USEDEP}]
|
||||
)
|
||||
test? (
|
||||
${RDEPEND}
|
||||
app-crypt/gpgme[python,${PYTHON_USEDEP}]
|
||||
dev-python/fastimport[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
|
||||
distutils_enable_sphinx docs
|
||||
|
||||
QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/dulwich/_.*.so"
|
||||
|
||||
PATCHES=(
|
||||
# https://github.com/jelmer/dulwich/pull/1607
|
||||
"${FILESDIR}/${P}-assert.patch"
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
# avoid rust_pkg_setup which will die when there's no Rust found
|
||||
if use native-extensions ; then
|
||||
rust_pkg_setup # implicitly inherited through cargo
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
cargo_src_unpack
|
||||
}
|
||||
|
||||
python_compile() {
|
||||
unset PURE
|
||||
# TODO: enable Rust extensions
|
||||
if ! use native-extensions; then
|
||||
local -x PURE=1
|
||||
fi
|
||||
|
||||
distutils-r1_python_compile
|
||||
}
|
||||
|
||||
python_test() {
|
||||
# remove interference from the tests that do stuff like user.name
|
||||
unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
|
||||
unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE
|
||||
unset EMAIL
|
||||
# Do not use make check which rebuilds the extension and uses -Werror,
|
||||
# causing unexpected failures.
|
||||
"${EPYTHON}" -m unittest -v tests.test_suite ||
|
||||
die "tests failed with ${EPYTHON}"
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
if use examples; then
|
||||
docompress -x "/usr/share/doc/${PF}/examples"
|
||||
dodoc -r examples
|
||||
fi
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
@@ -1,114 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
CARGO_OPTIONAL=1
|
||||
DISTUTILS_EXT=1
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{11..13} )
|
||||
|
||||
CRATES="
|
||||
autocfg@1.5.0
|
||||
heck@0.5.0
|
||||
indoc@2.0.6
|
||||
libc@0.2.174
|
||||
memchr@2.7.5
|
||||
memoffset@0.9.1
|
||||
once_cell@1.21.3
|
||||
portable-atomic@1.11.1
|
||||
proc-macro2@1.0.95
|
||||
pyo3-build-config@0.25.1
|
||||
pyo3-ffi@0.25.1
|
||||
pyo3-macros-backend@0.25.1
|
||||
pyo3-macros@0.25.1
|
||||
pyo3@0.25.1
|
||||
quote@1.0.40
|
||||
syn@2.0.104
|
||||
target-lexicon@0.13.2
|
||||
unicode-ident@1.0.18
|
||||
unindent@0.2.4
|
||||
"
|
||||
|
||||
inherit cargo distutils-r1 pypi
|
||||
|
||||
DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
|
||||
HOMEPAGE="
|
||||
https://github.com/jelmer/dulwich/
|
||||
https://pypi.org/project/dulwich/
|
||||
"
|
||||
SRC_URI+="
|
||||
native-extensions? (
|
||||
${CARGO_CRATE_URIS}
|
||||
)
|
||||
"
|
||||
|
||||
LICENSE="GPL-2+ Apache-2.0"
|
||||
LICENSE+=" native-extensions? ("
|
||||
# Dependent crate licenses
|
||||
LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0"
|
||||
LICENSE+=" )"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="doc examples +native-extensions test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-python/urllib3-1.25[${PYTHON_USEDEP}]
|
||||
"
|
||||
BDEPEND="
|
||||
native-extensions? (
|
||||
${RUST_DEPEND}
|
||||
dev-python/setuptools-rust[${PYTHON_USEDEP}]
|
||||
)
|
||||
test? (
|
||||
${RDEPEND}
|
||||
app-crypt/gpgme[python,${PYTHON_USEDEP}]
|
||||
dev-python/fastimport[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
|
||||
distutils_enable_sphinx docs
|
||||
|
||||
QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/dulwich/_.*.so"
|
||||
|
||||
pkg_setup() {
|
||||
# avoid rust_pkg_setup which will die when there's no Rust found
|
||||
if use native-extensions ; then
|
||||
rust_pkg_setup # implicitly inherited through cargo
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
cargo_src_unpack
|
||||
}
|
||||
|
||||
python_compile() {
|
||||
unset PURE
|
||||
# TODO: enable Rust extensions
|
||||
if ! use native-extensions; then
|
||||
local -x PURE=1
|
||||
fi
|
||||
|
||||
distutils-r1_python_compile
|
||||
}
|
||||
|
||||
python_test() {
|
||||
# remove interference from the tests that do stuff like user.name
|
||||
unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
|
||||
unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE
|
||||
unset EMAIL
|
||||
# Do not use make check which rebuilds the extension and uses -Werror,
|
||||
# causing unexpected failures.
|
||||
"${EPYTHON}" -m unittest -v tests.test_suite ||
|
||||
die "tests failed with ${EPYTHON}"
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
if use examples; then
|
||||
docompress -x "/usr/share/doc/${PF}/examples"
|
||||
dodoc -r examples
|
||||
fi
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
@@ -1,114 +0,0 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
CARGO_OPTIONAL=1
|
||||
DISTUTILS_EXT=1
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{11..13} )
|
||||
|
||||
CRATES="
|
||||
autocfg@1.5.0
|
||||
heck@0.5.0
|
||||
indoc@2.0.6
|
||||
libc@0.2.174
|
||||
memchr@2.7.5
|
||||
memoffset@0.9.1
|
||||
once_cell@1.21.3
|
||||
portable-atomic@1.11.1
|
||||
proc-macro2@1.0.95
|
||||
pyo3-build-config@0.25.1
|
||||
pyo3-ffi@0.25.1
|
||||
pyo3-macros-backend@0.25.1
|
||||
pyo3-macros@0.25.1
|
||||
pyo3@0.25.1
|
||||
quote@1.0.40
|
||||
syn@2.0.104
|
||||
target-lexicon@0.13.2
|
||||
unicode-ident@1.0.18
|
||||
unindent@0.2.4
|
||||
"
|
||||
|
||||
inherit cargo distutils-r1 pypi
|
||||
|
||||
DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
|
||||
HOMEPAGE="
|
||||
https://github.com/jelmer/dulwich/
|
||||
https://pypi.org/project/dulwich/
|
||||
"
|
||||
SRC_URI+="
|
||||
native-extensions? (
|
||||
${CARGO_CRATE_URIS}
|
||||
)
|
||||
"
|
||||
|
||||
LICENSE="GPL-2+ Apache-2.0"
|
||||
LICENSE+=" native-extensions? ("
|
||||
# Dependent crate licenses
|
||||
LICENSE+=" Apache-2.0-with-LLVM-exceptions MIT Unicode-3.0"
|
||||
LICENSE+=" )"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="doc examples +native-extensions test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-python/urllib3-1.25[${PYTHON_USEDEP}]
|
||||
"
|
||||
BDEPEND="
|
||||
native-extensions? (
|
||||
${RUST_DEPEND}
|
||||
dev-python/setuptools-rust[${PYTHON_USEDEP}]
|
||||
)
|
||||
test? (
|
||||
${RDEPEND}
|
||||
app-crypt/gpgme[python,${PYTHON_USEDEP}]
|
||||
dev-python/fastimport[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
|
||||
distutils_enable_sphinx docs
|
||||
|
||||
QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/dulwich/_.*.so"
|
||||
|
||||
pkg_setup() {
|
||||
# avoid rust_pkg_setup which will die when there's no Rust found
|
||||
if use native-extensions ; then
|
||||
rust_pkg_setup # implicitly inherited through cargo
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
cargo_src_unpack
|
||||
}
|
||||
|
||||
python_compile() {
|
||||
unset PURE
|
||||
# TODO: enable Rust extensions
|
||||
if ! use native-extensions; then
|
||||
local -x PURE=1
|
||||
fi
|
||||
|
||||
distutils-r1_python_compile
|
||||
}
|
||||
|
||||
python_test() {
|
||||
# remove interference from the tests that do stuff like user.name
|
||||
unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
|
||||
unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE
|
||||
unset EMAIL
|
||||
# Do not use make check which rebuilds the extension and uses -Werror,
|
||||
# causing unexpected failures.
|
||||
"${EPYTHON}" -m unittest -v tests.test_suite ||
|
||||
die "tests failed with ${EPYTHON}"
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
if use examples; then
|
||||
docompress -x "/usr/share/doc/${PF}/examples"
|
||||
dodoc -r examples
|
||||
fi
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
From 1d38f872e0aee83713b94b96a7c810719243ac38 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= <jelmer@jelmer.uk>
|
||||
Date: Sun, 22 Jun 2025 23:15:16 +0100
|
||||
Subject: [PATCH] fix: Convert assertion to ApplyDeltaError in apply_delta
|
||||
function
|
||||
|
||||
apply_delta was raising AssertionError instead of ApplyDeltaError in the
|
||||
pure Python implementation when the Rust extension was not available.
|
||||
|
||||
Fixes #1606
|
||||
---
|
||||
NEWS | 6 ++++++
|
||||
dulwich/pack.py | 5 ++++-
|
||||
2 files changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dulwich/pack.py b/dulwich/pack.py
|
||||
index a12830a59..2f1c35e07 100644
|
||||
--- a/dulwich/pack.py
|
||||
+++ b/dulwich/pack.py
|
||||
@@ -2516,7 +2516,10 @@ def get_delta_header_size(delta, index):
|
||||
|
||||
src_size, index = get_delta_header_size(delta, index)
|
||||
dest_size, index = get_delta_header_size(delta, index)
|
||||
- assert src_size == len(src_buf), f"{src_size} vs {len(src_buf)}"
|
||||
+ if src_size != len(src_buf):
|
||||
+ raise ApplyDeltaError(
|
||||
+ f"Unexpected source buffer size: {src_size} vs {len(src_buf)}"
|
||||
+ )
|
||||
while index < delta_length:
|
||||
cmd = ord(delta[index : index + 1])
|
||||
index += 1
|
||||
Reference in New Issue
Block a user