public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/conda] rawhide: Update to 26.5.3
@ 2026-06-21 22:44 Orion Poplawski
0 siblings, 0 replies; only message in thread
From: Orion Poplawski @ 2026-06-21 22:44 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/conda
Branch : rawhide
Commit : 267825c6c09ad53f259962443bc988135b8aa59a
Author : Orion Poplawski <orion@nwra.com>
Date : 2026-06-21T16:30:01-06:00
Stats : +25/-8 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/conda/c/267825c6c09ad53f259962443bc988135b8aa59a?branch=rawhide
Log:
Update to 26.5.3
---
diff --git a/0004-Do-not-try-to-run-usr-bin-python.patch b/0004-Do-not-try-to-run-usr-bin-python.patch
index f747eb0..f14db52 100644
--- a/0004-Do-not-try-to-run-usr-bin-python.patch
+++ b/0004-Do-not-try-to-run-usr-bin-python.patch
@@ -1,15 +1,16 @@
-diff -up conda-24.9.1/conda/common/path/python.py.python conda-24.9.1/conda/common/path/python.py
---- conda-24.9.1/conda/common/path/python.py.python 2024-10-01 15:11:32.000000000 -0600
-+++ conda-24.9.1/conda/common/path/python.py 2024-10-07 21:43:44.951895698 -0600
-@@ -5,6 +5,7 @@
- from __future__ import annotations
+diff --git a/conda/common/path/python.py b/conda/common/path/python.py
+index b99cf0b..8c73d96 100644
+--- a/conda/common/path/python.py
++++ b/conda/common/path/python.py
+@@ -6,6 +6,7 @@ from __future__ import annotations
+ import keyword
import re
+import sys
from logging import getLogger
from os.path import join, split, splitext
-@@ -52,9 +53,11 @@ def parse_entry_point_def(ep_definition)
+@@ -86,9 +87,11 @@ def parse_entry_point_def(ep_definition):
def get_python_short_path(python_version=None):
if on_win:
return "python.exe"
diff --git a/conda.spec b/conda.spec
index f96b05f..63ee7f1 100644
--- a/conda.spec
+++ b/conda.spec
@@ -1,7 +1,7 @@
%bcond bootstrap 1
Name: conda
-Version: 26.1.1
+Version: 26.5.3
Release: %autorelease
Summary: Cross-platform, Python-agnostic binary package manager
@@ -72,6 +72,7 @@ BuildRequires: python%{python3_pkgversion}-flask
BuildRequires: python%{python3_pkgversion}-jsonpatch
BuildRequires: python%{python3_pkgversion}-libmambapy
BuildRequires: python%{python3_pkgversion}-pexpect
+BuildRequires: python%{python3_pkgversion}-pytest-benchmark
BuildRequires: python%{python3_pkgversion}-pytest-mock
BuildRequires: python%{python3_pkgversion}-pytest-rerunfailures
BuildRequires: python%{python3_pkgversion}-pytest-split
@@ -273,6 +274,13 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} conda info
--deselect=tests/cli/test_main_export.py::test_export_ignore_channels_flag[True] \
--deselect=tests/cli/test_main_export.py::test_export_ignore_channels_flag[False] \
--deselect=tests/cli/test_main_export.py::test_export_override_channels_and_ignore_channels_independence \
+ --ignore=tests/cli/test_main_export.py \
+ --deselect=tests/cli/test_main_export.py::test_export_warnings"[default behavior raises warning]" \
+ --deselect=tests/cli/test_main_export.py::test_export_warnings"[JSON format with `--format` flag]" \
+ --deselect=tests/cli/test_main_export.py::test_export_warnings"[JSON format with `--json` flag]" \
+ --deselect=tests/cli/test_main_export.py::test_export_warnings"[warns with `--file` flag alone]" \
+ --deselect=tests/cli/test_main_export.py::test_export_warnings"[suppress warning with `--quiet`]" \
+ --deselect=tests/cli/test_main_export.py::test_export_warnings"[suppress warning with `--json` and `--file`]" \
--deselect=tests/cli/test_main_info.py::test_info_license \
--deselect=tests/cli/test_main_info.py::test_info_root \
--deselect=tests/plugins/test_pre_solves.py::test_pre_solve_action_raises_exception \
@@ -306,12 +314,14 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} conda info
--deselect=tests/base/test_context.py::test_default_activation_prefix \
--deselect=tests/cli/test_cli_install.py::test_frozen_env_cep22[libmamba] \
--deselect=tests/cli/test_cli_install.py::test_frozen_env_cep22[classic] \
+ --deselect=tests/cli/test_cli_install.py::test_reinstall_args[classic] \
--deselect=tests/cli/test_common.py::test_validate_subdir_config \
--deselect=tests/cli/test_common.py::test_validate_subdir_config_invalid_subdir \
--deselect=tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[bash-expected_patterns0] \
--deselect=tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[zsh-expected_patterns1] \
--deselect=tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[fish-expected_patterns2] \
--deselect=tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[xonsh-expected_patterns5] \
+ --deselect=tests/cli/test_main_export.py::test_export_non_pip_env_warnings \
--deselect=tests/cli/test_main_export.py::test_export_preserves_channels_from_installed_packages \
--deselect=tests/cli/test_main_export.py::test_export_package_alphabetical_ordering \
--deselect=tests/cli/test_main_export.py::test_export_no_builds_format \
@@ -336,6 +346,7 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} conda info
--deselect=tests/core/test_prefix_data.py::test_pinned_specs_conda_meta_pinned \
--deselect=tests/core/test_prefix_data.py::test_unset_reserved_env_vars \
--deselect=tests/core/test_prefix_data.py::test_warn_setting_reserved_env_vars \
+ --ignore=tests/core/test_solve.py \
--deselect=tests/core/test_solve.py::test_pinned_specs_conda_meta_pinned[libmamba] \
--deselect=tests/core/test_solve.py::test_pinned_specs_condarc[libmamba] \
--deselect=tests/core/test_solve.py::test_pinned_specs_all[libmamba] \
@@ -345,6 +356,7 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} conda info
--deselect=tests/gateways/test_repodata_gateway.py::test_repodata_fetch_jsondecodeerror \
--deselect=tests/models/test_environment.py::test_extrapolate \
--deselect=tests/models/test_environment.py::test_explicit_packages \
+ --deselect=tests/models/test_environment.py::test_from_prefix_behavior_with_pip_interoperability \
--deselect=tests/plugins/subcommands/doctor/health_checks/test_file_locking.py::test_file_locking_supported[True] \
--deselect=tests/plugins/subcommands/doctor/health_checks/test_file_locking.py::test_file_locking_supported[False] \
--deselect=tests/plugins/subcommands/doctor/health_checks/test_file_locking.py::test_file_locking_not_supported \
@@ -440,10 +452,14 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} conda info
--deselect=tests/core/test_prefix_data.py::test_get_environment_env_vars \
--deselect=tests/core/test_prefix_data.py::test_set_unset_environment_env_vars \
--deselect=tests/core/test_prefix_data.py::test_set_unset_environment_env_vars_no_exist \
+ --deselect=tests/shards/test_shards_subset.py::test_traversal_algorithms_match[devops_automation] \
+ --deselect=tests/shards/test_shards_subset.py::test_traversal_algorithms_match[python] \
--deselect=tests/testing/test_fixtures.py::test_tmp_env \
--deselect=tests/testing/test_fixtures.py::test_session_tmp_env \
--deselect=tests/testing/test_fixtures.py::test_env \
--deselect=tests/testing/test_fixtures.py::test_tmp_channel \
+ --ignore=tests/shards/test_shardfetch.py \
+ --ignore=tests/shards/test_shards.py \
--ignore=tests/trust \
conda tests
diff --git a/sources b/sources
index fbb6ece..a32dc3e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (conda-26.1.1.tar.gz) = 1c49b2878aa840e3f88070fe6ce9dc3ceccfb671e5691a2e1d802f6d43a3c4f8c7b6e666f10d366fb771c6ab0a7e8d7588b867e452312194cca39f3f60e420cf
+SHA512 (conda-26.5.3.tar.gz) = aa3ed3a89fa170581c0aa9234a70d94dddafd3a3c059be5947b3246b98d12f0044ed9309b386a6d87d8ca72fbfee51fd8f7101273b85e49c23a236718863ac0c
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-21 22:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-21 22:44 [rpms/conda] rawhide: Update to 26.5.3 Orion Poplawski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox