public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/conda-build] rawhide: Fix compatibility with packaging 26.3
@ 2026-08-13 13:41 Lumir Balhar
  0 siblings, 0 replies; only message in thread
From: Lumir Balhar @ 2026-08-13 13:41 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/conda-build
            Branch : rawhide
            Commit : 6c70a059011539c3d772c95e83ff7f3a885f1222
            Author : Lumir Balhar <lbalhar@redhat.com>
            Date   : 2026-08-13T13:46:24+02:00
            Stats  : +33/-0 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/conda-build/c/6c70a059011539c3d772c95e83ff7f3a885f1222?branch=rawhide

            Log:
            Fix compatibility with packaging 26.3

Proposed upstream: https://github.com/conda/conda-build/pull/6092

---
diff --git a/6092.patch b/6092.patch
new file mode 100644
index 0000000..389c517
--- /dev/null
+++ b/6092.patch
@@ -0,0 +1,31 @@
+From 95ec8b7d3cfe634583ca63f460497bff726dc171 Mon Sep 17 00:00:00 2001
+From: Lumir Balhar <lbalhar@redhat.com>
+Date: Thu, 13 Aug 2026 13:37:13 +0200
+Subject: [PATCH] Expect InvalidVersion from packaging if version is not string
+
+Fixes: https://github.com/conda/conda-build/issues/6091
+---
+ conda_build/deprecations.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/conda_build/deprecations.py b/conda_build/deprecations.py
+index ba09f3633d..9e130d61c7 100644
+--- a/conda_build/deprecations.py
++++ b/conda_build/deprecations.py
+@@ -8,6 +8,7 @@
+ import warnings
+ from argparse import Action
+ from functools import wraps
++from packaging.version import InvalidVersion
+ from types import ModuleType
+ from typing import TYPE_CHECKING
+ 
+@@ -75,7 +76,7 @@ def _version_less_than(self: Self, version: str) -> bool:
+         if self._version_object is None:
+             try:
+                 self._version_object = parse(self._version)  # type: ignore[arg-type]
+-            except TypeError:
++            except (TypeError, InvalidVersion):
+                 # TypeError: self._version could not be parsed
+                 self._version_object = parse("0.0.0.dev0+placeholder")
+         return self._version_object < parse(version)

diff --git a/conda-build.spec b/conda-build.spec
index 1328d07..498b9b5 100644
--- a/conda-build.spec
+++ b/conda-build.spec
@@ -8,6 +8,8 @@ Summary:        Commands and tools for building conda packages
 License:        BSD-3-Clause AND BSD-2-Clause
 URL:            https://github.com/conda/conda-build
 Source0:        https://github.com/conda/conda-build/archive/%{version}/%{name}-%{version}.tar.gz
+# Compatibility with packaging 26.3
+Patch:          https://github.com/conda/conda-build/pull/6092.patch
 BuildArch:      noarch
 BuildRequires:  make
 Requires:       python%{python3_pkgversion}-conda-build = %{version}-%{release}

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-13 13:41 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-13 13:41 [rpms/conda-build] rawhide: Fix compatibility with packaging 26.3 Lumir Balhar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox