summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/uv')
-rw-r--r--dev-python/uv/Manifest11
-rw-r--r--dev-python/uv/uv-0.4.30-r1.ebuild (renamed from dev-python/uv/uv-0.4.10.ebuild)24
-rw-r--r--dev-python/uv/uv-0.5.1.ebuild (renamed from dev-python/uv/uv-0.4.9.ebuild)48
3 files changed, 66 insertions, 17 deletions
diff --git a/dev-python/uv/Manifest b/dev-python/uv/Manifest
index 3bef1428a9a4..7f3cc1637cf8 100644
--- a/dev-python/uv/Manifest
+++ b/dev-python/uv/Manifest
@@ -1,7 +1,8 @@
-DIST pubgrub-388685a8711092971930986644cfed152d1a1f6c.gh.tar.gz 87945 BLAKE2B 7c10db2eff97656a379e8beff9f77bf09b4ab2fdd0d5c171e36babc6f3bff08d05774c55a51a23d79144c4110a942764cefa8a1baf7c36174809d2e648f2d12d SHA512 15539076de8fe9a459f70efcf07ccb7f61ced2be9832c4eb7123e7baa2bb85f3263fd4cb5d8b277c28a70ba316d5128d74d59d6f1de96b6e55ef04321a42c4dc
-DIST reqwest-middleware-5e3eaf254b5bd481c75d2710eed055f95b756913.gh.tar.gz 40049 BLAKE2B d284947a108e2d3233a4fa7c9eb5e1a959bc5b569e754861daef076672672b0500cb737b85871d1fc0587bdbf6d5020e03e7c906cb5de34ff2f81c05b66918d1 SHA512 540a71e59a8b57e5e0bd7fad18fed265552bdae4518690a9823c94dcf23ee1d436f91b9cecf21129917b25e78b91d8d7290760edaea68053666e28af7223476e
+DIST pubgrub-95e1390399cdddee986b658be19587eb1fdb2d79.gh.tar.gz 88127 BLAKE2B 661b639a7028b7dfe4967b4e2f187c3d403e1796bb09ae4606854414547cf81a5907d7dc9c1f8c3f6fe6986b1c8c22a89fee9e93d2ca79d5241350916991cf05 SHA512 8fdcd1ca1badbd140eb386ff37dd91b26d2b81273544b25a376462b900e9b84e59523ff75a68abe4a03834d72ee0d44246f16aea5c7e9091ad5375a86d3aee70
+DIST reqwest-middleware-d95ec5a99fcc9a4339e1850d40378bbfe55ab121.gh.tar.gz 40815 BLAKE2B eb7edc4e4599635714b30e5a49b1ddf04e76a696618713320fbb06b240e5f77dafcba78e8532a7de3ada682773a65c88405a5bec2261a7da4310a7cc95b2554e SHA512 bc29f8e634cbfde9d89db3e7ac16a83b6545c15ecec1d0eb4eb2ea2c1647fb521712a9ebe98480cd0dff727fed0ecbceaaf3b23e0d85d97a0498f2e576cc9d7d
DIST rs-async-zip-011b24604fa7bc223daaad7712c0694bac8f0a87.gh.tar.gz 51706 BLAKE2B 354eb52c95ea355521e1e6a7c841102424c47c156fdb0efb62e3cac666ecf289806aeefab8a0273a7c3283429ac81502283bdb5424d5f925621e5c2b1430fd4d SHA512 6650eef354e84daf41a8572b98b29f2873b7f071dd1d6983292c70b2f580fdc50cd26762d2228a70c2b200eae2f40476e6604702aa62cc97558301195bf19eb8
DIST tl-6e25b2ee2513d75385101a8ff9f591ef51f314ec.gh.tar.gz 37106 BLAKE2B c30d1c33f6f52e2bc83823eb6319f8a3e462b7c7408fb6a08f995747857ef234f81db4135a04f9d183095fe473a4087f8f0cb89d8f87ef4400285d2ce034ec22 SHA512 4abbc4240ed129c92da8d616e27a6df0f24cdc85a0803acfdae588ca91f9e5b8d482e3ac88b2e657ff68917b1b43cef1e7ef3c887f624659b231fa5a13fcae68
-DIST uv-0.4.10.gh.tar.gz 2585899 BLAKE2B f941068e58877cc859b2eb52f3b35ea79cdf23aa33f746dc1e7e954a77d5a3f08fbbed8a8312f750143cef6a0eb812eb783750750eccf6144ef869f1f69732b3 SHA512 9582d8f97515bc182d699f9994a21f7c883203dabb338848c751d97737c864272e5efbaf3a81d08545caac6643ba9cbde2fe11769ec6b98062416d7501d022f8
-DIST uv-0.4.9-crates.tar.xz 46250584 BLAKE2B 6beb0a00885b674f3d8e35c67372d4ba04c6512306f78522fac2ff170d7cc6cb6c0702546da1d1de3dc84397f04258c56558c666b8f935130a0fea1debce01d0 SHA512 676f6a197af92bc9f6716c0e1df1f87d81b1b07dc81c591b94b34b985bbe4a49fb0b319fe8fba7f83d158124af84f64ebefe1ce0119e6238f9ae837e4652c5c0
-DIST uv-0.4.9.gh.tar.gz 2580667 BLAKE2B baadc0d950d57e224d7d4980424ab58c4e278c2d67a06e9d83d778ac5a6b561cdadfc514c5068ce365dbdb4da3b5165e4180567f7abe90f46d5597fce144b91d SHA512 d7746d71f1429df7d39c3f03c02934792124318f92d2eda03b68a255586567d053349e6d294da0910351d976844aee564334540563435d0e60f6a3792088f416
+DIST uv-0.4.30-crates.tar.xz 45786704 BLAKE2B 72a5828c5c504859248312e0d796a6505e4d0546218c8f7f99e37843afdf9496ea1ba4b1f094979299de417accca7f021e4f8971e467429e7d986ed9a3fb2008 SHA512 49abd05fa9e14b1bdb1b4d26f1e68a2038d57bd25c756440bca209b513de42fd8d33ce6e1333392dce65ab427285651809b44e024758359688af5fb87efc19ed
+DIST uv-0.4.30.gh.tar.gz 2832043 BLAKE2B 11c0d090161b9aa6d6e84d0edb15701c8eaba8281579653d6b0ba84003933f82ec5b71c3c33689e5324e51de70b7af41e4799f35fb45f57ce6d58fafa371a615 SHA512 4930c863aae71ae6e6f5b7ba20ff30ffe4c044f6980f973110d0c8c3079cb4aacbe774fe4577eb8d9c16f5d41d2cd0974c0fe63cf0d10e065c6b8d4cf553b80b
+DIST uv-0.5.0-crates.tar.xz 45831504 BLAKE2B 0a95463b47729d40cdaf852ba556626ed3a1d2122f5d5a8bc6c401b95c836fa0ac0726f2aeaceb10346d65c0aa3c5250598c3219244fc3b957d26ee16968d443 SHA512 b991d9aeeec6b4e5d3f3f11a51c66f929560cc75bfc9379f090ba75b243056d4cf174326f8cb31b7aefd7e60e445e05b6799d9d7a8021b0893de436dafb384ab
+DIST uv-0.5.1.gh.tar.gz 2839701 BLAKE2B 5b4ec310a9979583b1f75355ed7a69f9b40ee397464c031b2ec36a1852e9d60b66223719cda6d6f3edff1901e60426bd0e662da7c346082a9d8889ef8b411bec SHA512 eb60061df14a6fee3295097af92bb63b71bc61f56d422db2fe6d61b7d65eba002aed57115e1ffa9e6382fc4b29a38c2e4821e9a75e1114594751dea6e8a02d0e
diff --git a/dev-python/uv/uv-0.4.10.ebuild b/dev-python/uv/uv-0.4.30-r1.ebuild
index ae16e664c50f..4d826c5cfb40 100644
--- a/dev-python/uv/uv-0.4.10.ebuild
+++ b/dev-python/uv/uv-0.4.30-r1.ebuild
@@ -8,15 +8,18 @@ CRATES="
declare -A GIT_CRATES=(
[async_zip]='https://github.com/charliermarsh/rs-async-zip;011b24604fa7bc223daaad7712c0694bac8f0a87;rs-async-zip-%commit%'
- [pubgrub]='https://github.com/astral-sh/pubgrub;388685a8711092971930986644cfed152d1a1f6c;pubgrub-%commit%'
- [reqwest-middleware]='https://github.com/astral-sh/reqwest-middleware;5e3eaf254b5bd481c75d2710eed055f95b756913;reqwest-middleware-%commit%/reqwest-middleware'
- [reqwest-retry]='https://github.com/astral-sh/reqwest-middleware;5e3eaf254b5bd481c75d2710eed055f95b756913;reqwest-middleware-%commit%/reqwest-retry'
+ [pubgrub]='https://github.com/astral-sh/pubgrub;95e1390399cdddee986b658be19587eb1fdb2d79;pubgrub-%commit%'
+ [reqwest-middleware]='https://github.com/TrueLayer/reqwest-middleware;d95ec5a99fcc9a4339e1850d40378bbfe55ab121;reqwest-middleware-%commit%/reqwest-middleware'
+ [reqwest-retry]='https://github.com/TrueLayer/reqwest-middleware;d95ec5a99fcc9a4339e1850d40378bbfe55ab121;reqwest-middleware-%commit%/reqwest-retry'
[tl]='https://github.com/charliermarsh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
+ [version-ranges]='https://github.com/astral-sh/pubgrub;95e1390399cdddee986b658be19587eb1fdb2d79;pubgrub-%commit%/version-ranges'
)
+RUST_MIN_VER="1.80.1"
+
inherit cargo check-reqs
-CRATE_PV=0.4.9
+CRATE_PV=${PV}
DESCRIPTION="A Python package installer and resolver, written in Rust"
HOMEPAGE="
https://github.com/astral-sh/uv/
@@ -59,7 +62,6 @@ RDEPEND="
${DEPEND}
"
BDEPEND="
- >=virtual/rust-1.80
test? (
dev-lang/python:3.8
dev-lang/python:3.9
@@ -83,6 +85,7 @@ pkg_pretend() {
pkg_setup() {
check_space
+ rust_pkg_setup
}
src_prepare() {
@@ -96,7 +99,6 @@ src_prepare() {
# enable system libraries where supported
export ZSTD_SYS_USE_PKG_CONFIG=1
- sed -i -e 's:"static"::' crates/uv-extract/Cargo.toml || die
# TODO: unbundle libz-ng-sys, tikv-jemalloc-sys?
# remove unbundled sources, just in case
@@ -114,6 +116,16 @@ src_prepare() {
EOF
}
+src_configure() {
+ local myfeatures=(
+ git
+ pypi
+ python
+ )
+
+ cargo_src_configure --no-default-features
+}
+
src_compile() {
cd crates/uv || die
cargo_src_compile
diff --git a/dev-python/uv/uv-0.4.9.ebuild b/dev-python/uv/uv-0.5.1.ebuild
index ae16e664c50f..cf59953b7c5b 100644
--- a/dev-python/uv/uv-0.4.9.ebuild
+++ b/dev-python/uv/uv-0.5.1.ebuild
@@ -8,15 +8,18 @@ CRATES="
declare -A GIT_CRATES=(
[async_zip]='https://github.com/charliermarsh/rs-async-zip;011b24604fa7bc223daaad7712c0694bac8f0a87;rs-async-zip-%commit%'
- [pubgrub]='https://github.com/astral-sh/pubgrub;388685a8711092971930986644cfed152d1a1f6c;pubgrub-%commit%'
- [reqwest-middleware]='https://github.com/astral-sh/reqwest-middleware;5e3eaf254b5bd481c75d2710eed055f95b756913;reqwest-middleware-%commit%/reqwest-middleware'
- [reqwest-retry]='https://github.com/astral-sh/reqwest-middleware;5e3eaf254b5bd481c75d2710eed055f95b756913;reqwest-middleware-%commit%/reqwest-retry'
+ [pubgrub]='https://github.com/astral-sh/pubgrub;95e1390399cdddee986b658be19587eb1fdb2d79;pubgrub-%commit%'
+ [reqwest-middleware]='https://github.com/TrueLayer/reqwest-middleware;d95ec5a99fcc9a4339e1850d40378bbfe55ab121;reqwest-middleware-%commit%/reqwest-middleware'
+ [reqwest-retry]='https://github.com/TrueLayer/reqwest-middleware;d95ec5a99fcc9a4339e1850d40378bbfe55ab121;reqwest-middleware-%commit%/reqwest-retry'
[tl]='https://github.com/charliermarsh/tl;6e25b2ee2513d75385101a8ff9f591ef51f314ec;tl-%commit%'
+ [version-ranges]='https://github.com/astral-sh/pubgrub;95e1390399cdddee986b658be19587eb1fdb2d79;pubgrub-%commit%/version-ranges'
)
+RUST_MIN_VER="1.80.1"
+
inherit cargo check-reqs
-CRATE_PV=0.4.9
+CRATE_PV=0.5.0
DESCRIPTION="A Python package installer and resolver, written in Rust"
HOMEPAGE="
https://github.com/astral-sh/uv/
@@ -59,13 +62,13 @@ RDEPEND="
${DEPEND}
"
BDEPEND="
- >=virtual/rust-1.80
test? (
dev-lang/python:3.8
dev-lang/python:3.9
dev-lang/python:3.10
dev-lang/python:3.11
dev-lang/python:3.12
+ !!~dev-python/uv-0.5.0
)
"
@@ -83,6 +86,7 @@ pkg_pretend() {
pkg_setup() {
check_space
+ rust_pkg_setup
}
src_prepare() {
@@ -96,7 +100,6 @@ src_prepare() {
# enable system libraries where supported
export ZSTD_SYS_USE_PKG_CONFIG=1
- sed -i -e 's:"static"::' crates/uv-extract/Cargo.toml || die
# TODO: unbundle libz-ng-sys, tikv-jemalloc-sys?
# remove unbundled sources, just in case
@@ -114,6 +117,16 @@ src_prepare() {
EOF
}
+src_configure() {
+ local myfeatures=(
+ git
+ pypi
+ python
+ )
+
+ cargo_src_configure --no-default-features
+}
+
src_compile() {
cd crates/uv || die
cargo_src_compile
@@ -124,6 +137,8 @@ src_test() {
local -x PATH=${BROOT}/usr/lib/python-exec/python3.12:${PATH}
local -x COLUMNS=100
local -x PYTHONDONTWRITEBYTECODE=
+ # fix tests failing because of our config
+ local -x XDG_CONFIG_DIRS=${T}
cd crates/uv || die
cargo_src_test --no-fail-fast
@@ -132,4 +147,25 @@ src_test() {
src_install() {
cd crates/uv || die
cargo_src_install
+
+ insinto /etc/xdg/uv
+ newins - uv.toml <<-EOF || die
+ # By default ("automatic"), uv downloads missing Python versions
+ # automatically and keeps them in the user's home directory.
+ # Once installed, they are preferred over system Python install.
+ # Disable that because 1) autodownloading software is bad,
+ # 2) we do not want automatically downloaded Pythons to override
+ # system Pythons installed later.
+ #
+ # The user can still manually have uv download and install
+ # Python via "uv python install". We are not switching
+ # "python-preference" to allow the user to override the system
+ # Python with these explicit installs.
+ #
+ # Relevant docs:
+ # https://docs.astral.sh/uv/reference/settings/#python-downloads
+ # https://docs.astral.sh/uv/reference/settings/#python-preference
+
+ python-downloads = "manual"
+ EOF
}