public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Benjamin A. Beasley <code@musicinmybrain.net>
To: git-commits@fedoraproject.org
Subject: [rpms/uv] rawhide: Update to 0.12.17 (close RHBZ#2536872)
Date: Mon, 21 Sep 2026 08:00:13 GMT	[thread overview]
Message-ID: <178997761314.1.9971062631244713150.rpms-uv-e41c6224436b@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/uv
Branch : rawhide
Commit : e41c6224436b5755d1f1489c22e8482a3db61876
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-09-21T08:26:06+01:00
Stats  : +149/-58 in 8 file(s)
URL    : https://src.fedoraproject.org/rpms/uv/c/e41c6224436b5755d1f1489c22e8482a3db61876?branch=rawhide

Log:
Update to 0.12.17 (close RHBZ#2536872)

---
diff --git a/0001-Downstream-Always-find-the-system-wide-uv-executable.patch b/0001-Downstream-Always-find-the-system-wide-uv-executable.patch
new file mode 100644
index 0000000..f1577c3
--- /dev/null
+++ b/0001-Downstream-Always-find-the-system-wide-uv-executable.patch
@@ -0,0 +1,36 @@
+From da9194503ab36e97a7f424edf89bbf566ae093a5 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Sun, 23 Jun 2024 16:29:05 -0400
+Subject: [PATCH 1/3] Downstream: Always find the system-wide uv executable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+“Should uv.find_uv_bin() be able to find /usr/bin/uv?”
+https://github.com/astral-sh/uv/issues/4451
+---
+ python/uv/_find_uv.py | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/python/uv/_find_uv.py b/python/uv/_find_uv.py
+index ebe6b8d5a..e25a2e28c 100644
+--- a/python/uv/_find_uv.py
++++ b/python/uv/_find_uv.py
+@@ -35,6 +35,14 @@ def find_uv_bin() -> str:
+         sysconfig.get_path("scripts", scheme=_user_scheme()),
+     ]
+ 
++    # Downstream patch: always find the system-wide uv executable
++    #
++    # “Should uv.find_uv_bin() be able to find /usr/bin/uv?”
++    #  https://github.com/astral-sh/uv/issues/4451
++    bindir_path = sysconfig.get_config_var("BINDIR")
++    if bindir_path is not None:
++        targets.insert(0, os.path.join(bindir_path, uv_exe))
++
+     seen = []
+     for target in targets:
+         if not target:
+-- 
+2.55.0
+

diff --git a/0001-Downstream-patch-always-find-the-system-wide-uv-exec.patch b/0001-Downstream-patch-always-find-the-system-wide-uv-exec.patch
deleted file mode 100644
index 1552d94..0000000
--- a/0001-Downstream-patch-always-find-the-system-wide-uv-exec.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 831cf2937a4b8b781d56d5fa18916d2bc42b244d Mon Sep 17 00:00:00 2001
-From: "Benjamin A. Beasley" <code@musicinmybrain.net>
-Date: Sun, 23 Jun 2024 16:29:05 -0400
-Subject: [PATCH] Downstream patch: always find the system-wide uv executable
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-“Should uv.find_uv_bin() be able to find /usr/bin/uv?”
-https://github.com/astral-sh/uv/issues/4451
----
- python/uv/_find_uv.py | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/python/uv/_find_uv.py b/python/uv/_find_uv.py
-index ebe6b8d5a..e25a2e28c 100644
---- a/python/uv/_find_uv.py
-+++ b/python/uv/_find_uv.py
-@@ -35,6 +35,14 @@ def find_uv_bin() -> str:
-         sysconfig.get_path("scripts", scheme=_user_scheme()),
-     ]
- 
-+    # Downstream patch: always find the system-wide uv executable
-+    #
-+    # “Should uv.find_uv_bin() be able to find /usr/bin/uv?”
-+    #  https://github.com/astral-sh/uv/issues/4451
-+    bindir_path = sysconfig.get_config_var("BINDIR")
-+    if bindir_path is not None:
-+        targets.insert(0, os.path.join(bindir_path, uv_exe))
-+
-     seen = []
-     for target in targets:
-         if not target:
--- 
-2.53.0
-

diff --git a/0002-Downstream-Revert-source-code-changes-for-pre-releas.patch b/0002-Downstream-Revert-source-code-changes-for-pre-releas.patch
new file mode 100644
index 0000000..dba628d
--- /dev/null
+++ b/0002-Downstream-Revert-source-code-changes-for-pre-releas.patch
@@ -0,0 +1,25 @@
+From 2e4973f8d493686ca44bc591b2da73f379fb478c Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Mon, 21 Sep 2026 07:05:16 +0100
+Subject: [PATCH 2/3] Downstream: Revert source-code changes for pre-release
+ blake2
+
+---
+ crates/uv-extract/src/hash.rs | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/crates/uv-extract/src/hash.rs b/crates/uv-extract/src/hash.rs
+index fb3b9797a..7b4d13222 100644
+--- a/crates/uv-extract/src/hash.rs
++++ b/crates/uv-extract/src/hash.rs
+@@ -1,4 +1,6 @@
+-use sha2::{Digest as _, digest::consts::U32};
++// BLAKE2 still uses the `digest` 0.10 trait, while MD5 and SHA-2 use 0.11.
++use blake2::digest::{Digest as _, consts::U32};
++use sha2::Digest as _;
+ use std::pin::Pin;
+ use std::task::{Context, Poll};
+ use tokio::io::{AsyncReadExt, ReadBuf};
+-- 
+2.55.0
+

diff --git a/0003-Downstream-Work-around-test-code-that-expects-PROFIL.patch b/0003-Downstream-Work-around-test-code-that-expects-PROFIL.patch
new file mode 100644
index 0000000..1621bbb
--- /dev/null
+++ b/0003-Downstream-Work-around-test-code-that-expects-PROFIL.patch
@@ -0,0 +1,33 @@
+From 39996283168aafc2b5843ced24c567998275abc2 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Mon, 21 Sep 2026 07:01:01 +0100
+Subject: [PATCH 3/3] Downstream: Work around test code that expects `PROFILE`
+ to be set
+
+Make `git_version_info_expected` return `false` unconditionally.
+
+https://github.com/astral-sh/uv/issues/21884
+---
+ crates/uv/tests/it/version.rs | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/crates/uv/tests/it/version.rs b/crates/uv/tests/it/version.rs
+index e5b3ec7bd..80d5f3eea 100644
+--- a/crates/uv/tests/it/version.rs
++++ b/crates/uv/tests/it/version.rs
+@@ -2155,6 +2155,12 @@ fn version_get_fallback_unmanaged_short() -> Result<()> {
+ 
+ /// Whether this build should include Git metadata in its version output.
+ fn git_version_info_expected() -> bool {
++    // Downstream patch: unconditionally return false for now. See “Test helper function
++    // `git_version_info_expected` doesn’t compile with custom profile: `PROFILE` is unset,”
++    // https://github.com/astral-sh/uv/issues/21884.
++    return false;
++
++    #[cfg(false)]
+     if env!("PROFILE") != "release" && option_env!("UV_INTERNAL__BUILD_GIT_INFO") != Some("1") {
+         return false;
+     }
+-- 
+2.55.0
+

diff --git a/21883.patch b/21883.patch
new file mode 100644
index 0000000..0a2b7c9
--- /dev/null
+++ b/21883.patch
@@ -0,0 +1,24 @@
+From 3210ef497ef5d4e35141c628705b4ef9cb1754e8 Mon Sep 17 00:00:00 2001
+From: "Benjamin A. Beasley" <code@musicinmybrain.net>
+Date: Mon, 21 Sep 2026 06:34:54 +0100
+Subject: [PATCH] Gate another test on `test-pypi`
+
+The test `upgrade_uses_extra_index_url_credentials_for_registry_source`
+accesses PyPI and fails in offline builds, so gate it with the
+`test-pypi` feature.
+---
+ crates/uv/tests/it/upgrade.rs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/crates/uv/tests/it/upgrade.rs b/crates/uv/tests/it/upgrade.rs
+index a6efecf7361..627506e37a4 100644
+--- a/crates/uv/tests/it/upgrade.rs
++++ b/crates/uv/tests/it/upgrade.rs
+@@ -1717,6 +1717,7 @@ fn upgrade_allows_registry_source() -> Result<()> {
+ }
+ 
+ #[tokio::test]
++#[cfg(feature = "test-pypi")]
+ async fn upgrade_uses_extra_index_url_credentials_for_registry_source() -> Result<()> {
+     let context = uv_test::test_context!("3.12");
+     let proxy = crate::pypi_proxy::start().await;

diff --git a/sources b/sources
index b82eb0d..6d78d75 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (uv-0.12.15.tar.gz) = 7bc4c206e00ebb4540cd03b4eb70b120aebafe0392cfe652bd94dc8e003ea922eb451d2ce50c1468641f97709672cbea6c05f93739162fc822a8481fe2027089
+SHA512 (uv-0.12.17.tar.gz) = ae554aa9d096afa7e1c35a1e50ba11c0553cd182ba75e5dd425613add092d38c46b3cbd47b026f03674394d6d0852162d5953c4cacef511c7157378d1790b8a1

diff --git a/uv-0.12.1-revert-blake2-beta.patch b/uv-0.12.1-revert-blake2-beta.patch
deleted file mode 100644
index 805ef98..0000000
--- a/uv-0.12.1-revert-blake2-beta.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur uv-0.12.1-original/crates/uv-extract/src/hash.rs uv-0.12.1/crates/uv-extract/src/hash.rs
---- uv-0.12.1-original/crates/uv-extract/src/hash.rs	2026-07-31 20:05:57.000000000 +0100
-+++ uv-0.12.1/crates/uv-extract/src/hash.rs	2026-08-02 11:53:13.406289238 +0100
-@@ -1,4 +1,6 @@
--use sha2::{Digest, digest::consts::U32};
-+// BLAKE2 still uses the `digest` 0.10 trait, while MD5 and SHA-2 use 0.11.
-+use blake2::digest::{Digest as _, consts::U32};
-+use sha2::Digest;
- use std::pin::Pin;
- use std::task::{Context, Poll};
- use tokio::io::{AsyncReadExt, ReadBuf};

diff --git a/uv.spec b/uv.spec
index 5de0be3..7a2dca1 100644
--- a/uv.spec
+++ b/uv.spec
@@ -5,7 +5,7 @@
 %bcond other_python_versions %{undefined epel}
 
 Name:           uv
-Version:        0.12.15
+Version:        0.12.17
 # The uv package has a permanent exception to the Updates Policy in Fedora, so
 # it can be updated in stable releases across SemVer boundaries (subject to
 # good judgement and actual compatibility of any reverse dependencies). See
@@ -148,18 +148,31 @@ Source0:        %{url}/archive/%{version}/uv-%{version}.tar.gz
 # https://docs.astral.sh/uv/configuration/files
 Source1:        uv.toml
 
-# Downstream-only: Always find the system-wide uv executable
-# See discussion in
-#   Should uv.find_uv_bin() be able to find /usr/bin/uv?
-#   https://github.com/astral-sh/uv/issues/4451
-Patch:          0001-Downstream-patch-always-find-the-system-wide-uv-exec.patch
-# Downstream-only: revert source-code changes from “Upgrade BLAKE2 to unify
-# hashing digest versions”, https://github.com/astral-sh/uv/pull/20834. We do
-# not wish to upgrade rust-blake2 to a pre-release.
-Patch:          uv-0.12.1-revert-blake2-beta.patch
+# Downstream: Always find the system-wide uv executable
+# See discussion in “Should uv.find_uv_bin() be able to find /usr/bin/uv?”
+# https://github.com/astral-sh/uv/issues/4451
+Patch:          0001-Downstream-Always-find-the-system-wide-uv-executable.patch
+# Downstream: Revert source-code changes for pre-release blake2
+# Revert source changes from “Upgrade BLAKE2 to unify hashing digest versions”,
+# https://github.com/astral-sh/uv/pull/20834. We do not wish to upgrade
+# rust-blake2 to a pre-release.
+Patch:          0002-Downstream-Revert-source-code-changes-for-pre-releas.patch
+# Downstream: Work around test code that expects `PROFILE` to be set
+# Make `git_version_info_expected` return `false` unconditionally.
+# “Test helper function `git_version_info_expected` doesn’t compile with custom
+# profile: `PROFILE` is unset” https://github.com/astral-sh/uv/issues/21884
+Patch:          0003-Downstream-Work-around-test-code-that-expects-PROFIL.patch
+
 # Add license texts for new contents of test/ecosystem/ from PR#20068
 # https://github.com/astral-sh/uv/pull/20174
 Patch:          %{url}/pull/20174.patch
+# Gate another test on `test-pypi`
+#
+# The test `upgrade_uses_extra_index_url_credentials_for_registry_source`
+# accesses PyPI and fails in offline builds, so gate it with the `test-pypi`
+# feature.
+# https://github.com/astral-sh/uv/pull/21883
+Patch:          %{url}/pull/21883.patch
 
 BuildSystem:    pyproject
 BuildOption(install): --assert-license uv
@@ -524,6 +537,13 @@ tomcli set crates/uv/Cargo.toml del features.self-update
 tomcli set crates/uv/Cargo.toml del features.tracing-durations-export
 tomcli set crates/uv/Cargo.toml del dependencies.tracing-durations-export
 
+# Reproduce the patch we carry in the rust-rustls package:
+# - default to the ring crypto backend
+# - drop support for the aws-lc-rs crypto backend
+tomcli set Cargo.toml lists delitem workspace.dependencies.rustls.features \
+    '(aws_lc_rs|prefer-post-quantum)'
+tomcli set Cargo.toml append workspace.dependencies.rustls.features ring
+
 # We retain the following example even when there are currently no dependencies
 # that need to be adjusted.
 #

                 reply	other threads:[~2026-09-21  8:00 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178997761314.1.9971062631244713150.rpms-uv-e41c6224436b@fedoraproject.org \
    --to=code@musicinmybrain.net \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox