Update to 25.11.1

Re-enable dep on conda-libmamba-solver
Fix dependencies and bundled versions
2025-12-12 07:54:53 -07:00 · 2025-12-07 10:51:37 -07:00 · 2025-11-27 12:01:55 -07:00 · 2025-11-26 08:45:35 -07:00 · 2025-09-19 12:11:41 +02:00 · 2025-08-15 12:42:31 +02:00
17 changed files with 702 additions and 646 deletions
--- a/0001-Fix-toolz-imports.patch
+++ b/0001-Fix-toolz-imports.patch
@ -1,98 +0,0 @@
-From 5115316f1cb11b2e5fcc687361b0c9a04dfe62fb Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Sun, 18 Oct 2020 15:43:33 -0600
-Subject: [PATCH] Fix toolz imports
-
---
- conda/plan.py                   | 2 +-
- conda_env/env.py                | 5 +----
- tests/base/test_context.py      | 2 +-
- tests/core/test_path_actions.py | 2 +-
- tests/test_activate.py          | 2 +-
- tests/test_create.py            | 2 +-
- 6 files changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/conda/plan.py b/conda/plan.py
-index e0c2ec6..b87c9dc 100644
--- a/conda/plan.py
-+++ b/conda/plan.py
-@@ -371,7 +371,7 @@ def _plan_from_actions(actions, index):  # pragma: no cover
- def _inject_UNLINKLINKTRANSACTION(plan, index, prefix, axn, specs):  # pragma: no cover
-     from os.path import isdir
-     from .models.dist import Dist
-    from ._vendor.toolz.itertoolz import groupby
-+    from ._vendor.toolz import groupby
-     from .instructions import LINK, PROGRESSIVEFETCHEXTRACT, UNLINK, UNLINKLINKTRANSACTION
-     from .core.package_cache_data import ProgressiveFetchExtract
-     from .core.link import PrefixSetup, UnlinkLinkTransaction
-diff --git a/conda_env/env.py b/conda_env/env.py
-index 4e83f88..09eb1a1 100644
--- a/conda_env/env.py
-+++ b/conda_env/env.py
-@@ -22,10 +22,7 @@ from conda.models.prefix_graph import PrefixGraph
- from . import compat, exceptions
- from conda.history import History
- 
-try:
-    from cytoolz.itertoolz import concatv, groupby
-except ImportError:  # pragma: no cover
-    from conda._vendor.toolz.itertoolz import concatv, groupby  # NOQA
-+from conda._vendor.toolz import concatv, groupby  # NOQA
- 
- 
- VALID_KEYS = ('name', 'dependencies', 'prefix', 'channels', 'variables')
-diff --git a/tests/base/test_context.py b/tests/base/test_context.py
-index 264e2dc..ae0e256 100644
--- a/tests/base/test_context.py
-+++ b/tests/base/test_context.py
-@@ -11,7 +11,7 @@ import pytest
- 
- from conda._vendor.auxlib.collection import AttrDict
- from conda._vendor.auxlib.ish import dals
-from conda._vendor.toolz.itertoolz import concat
-+from conda._vendor.toolz import concat
- from conda.base.constants import PathConflict, ChannelPriority
- from conda.base.context import context, reset_context, conda_tests_ctxt_mgmt_def_pol
- from conda.common.compat import odict, iteritems
-diff --git a/tests/core/test_path_actions.py b/tests/core/test_path_actions.py
-index 02b5c5f..c9e55ba 100644
--- a/tests/core/test_path_actions.py
-+++ b/tests/core/test_path_actions.py
-@@ -11,7 +11,7 @@ from uuid import uuid4
- import pytest
- 
- from conda._vendor.auxlib.collection import AttrDict
-from conda._vendor.toolz.itertoolz import groupby
-+from conda._vendor.toolz import groupby
- from conda.base.context import context
- from conda.common.compat import PY2, on_win
- from conda.common.path import get_bin_directory_short_path, get_python_noarch_target_path, \
-diff --git a/tests/test_activate.py b/tests/test_activate.py
-index d319cd0..99658d4 100644
--- a/tests/test_activate.py
-+++ b/tests/test_activate.py
-@@ -16,7 +16,7 @@ import json
- from conda import __version__ as conda_version
- from conda import CONDA_PACKAGE_ROOT
- from conda._vendor.auxlib.ish import dals
-from conda._vendor.toolz.itertoolz import concatv
-+from conda._vendor.toolz import concatv
- from conda.activate import CmdExeActivator, CshActivator, FishActivator, PosixActivator, \
-     PowerShellActivator, XonshActivator, activator_map, _build_activator_cls, \
-     main as activate_main, native_path_to_unix
-diff --git a/tests/test_create.py b/tests/test_create.py
-index 2d230dc..3265623 100644
--- a/tests/test_create.py
-+++ b/tests/test_create.py
-@@ -6,7 +6,7 @@ from datetime import datetime
- from glob import glob
- 
- from conda._vendor.auxlib.compat import Utf8NamedTemporaryFile
-from conda._vendor.toolz.itertoolz import groupby
-+from conda._vendor.toolz import groupby
- from conda.gateways.disk.permissions import make_read_only
- from conda.models.channel import Channel
- from conda.resolve import Resolve
-- 
-2.29.0.rc2
-
--- a/0001-conda_sys_prefix.patch.patch
+++ b/0001-conda_sys_prefix.patch.patch
@ -0,0 +1,25 @@
+From 7eeb6a32d2004bc20a156dd8920964c107e99321 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Tue, 30 Jul 2024 18:00:00 -0600
+Subject: [PATCH 1/2] conda_sys_prefix.patch
+
+---
+ conda/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/conda/__init__.py b/conda/__init__.py
+index 4245cae..a436b1d 100644
+--- a/conda/__init__.py
+++ b/conda/__init__.py
+@@ -54,7 +54,7 @@ __summary__ = __doc__
+ __url__ = "https://github.com/conda/conda"
+ 
+ if os.getenv("CONDA_ROOT") is None:
+-    os.environ["CONDA_ROOT"] = sys.prefix
+    os.environ["CONDA_ROOT"] = '/usr/share/conda'
+ 
+ #: The conda package directory.
+ CONDA_PACKAGE_ROOT = abspath(dirname(__file__))
+-- 
+2.45.2
+
--- a/0002-Use-main-entry-point-for-conda-and-re-add-conda-env-.patch
+++ b/0002-Use-main-entry-point-for-conda-and-re-add-conda-env-.patch
@ -0,0 +1,26 @@
+From f8f9a23a2a7540ec39cab9606f8b95aa8b346b65 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Mon, 24 Nov 2025 17:30:20 -0700
+Subject: [PATCH 2/2] Use main entry point for conda and re-add conda-env entry
+
+---
+ pyproject.toml | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 7c8f24f..049859b 100644
+--- a/pyproject.toml
+++ b/pyproject.toml
+@@ -51,7 +51,8 @@ readme = "README.md"
+ requires-python = ">=3.10"
+ 
+ [project.scripts]
+-conda = "conda.cli.main_pip:main"
+conda = "conda.cli.main:main"
+conda-env = "conda_env.cli.main:main"
+ 
+ [project.urls]
+ changelog = "https://github.com/conda/conda/blob/main/CHANGELOG.md"
+-- 
+2.51.1
+
--- a/0003-Drop-fs-path-encoding-manipulation-under-python2.patch
+++ b/0003-Drop-fs-path-encoding-manipulation-under-python2.patch
@ -1,23 +0,0 @@
-commit 1f21cf4dd33e4d62f3dca93294bfa5508a2591ab
-Author: rpm-build <rpm-build>
-Date:   Sat Mar 30 20:59:05 2019 -0600
-
-    [PATCH] Drop fs path encoding manipulation under python2
-
-diff --git a/conda/activate.py b/conda/activate.py
-index e515c0e..3632a61 100644
--- a/conda/activate.py
-+++ b/conda/activate.py
-@@ -63,11 +63,7 @@ class _Activator(object):
-     def __init__(self, arguments=None):
-         self._raw_arguments = arguments
- 
-        if PY2:
-            self.environ = {ensure_fs_path_encoding(k): ensure_fs_path_encoding(v)
-                            for k, v in iteritems(os.environ)}
-        else:
-            self.environ = os.environ.copy()
-+        self.environ = os.environ.copy()
- 
-     # Once Python2 dies odargs can become kwargs again since dicts are ordered since 3.6.
-     def get_export_unset_vars(self, odargs):
--- a/0004-Do-not-try-to-run-usr-bin-python.patch
+++ b/0004-Do-not-try-to-run-usr-bin-python.patch
@ -1,42 +1,25 @@
-From cccc709c085890633be767a44465229d049d5941 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Wed, 13 Feb 2019 13:06:36 +0100
-Subject: [PATCH] Do not try to run /usr/bin/python
-
-On modern linux distros, /usr/bin/python will usually either
-refer to python2 or not exists at all. Use sys.executable to
-run subprocess calls with the same python executable as the
-parent process.
---
- conda/common/path.py | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/conda/common/path.py b/conda/common/path.py
-index b51f7f272d..06e0b4bc9a 100644
--- a/conda/common/path.py
-+++ b/conda/common/path.py
-@@ -6,6 +6,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
- from functools import reduce
- from logging import getLogger
- import os
-+import sys
- from os.path import abspath, basename, expanduser, expandvars, join, normcase, split, splitext
+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
+ 
 import re
- import subprocess
-@@ -155,9 +156,11 @@ def parse_entry_point_def(ep_definition):
+import sys
+ from logging import getLogger
+ from os.path import join, split, splitext
+ 
+@@ -52,9 +53,11 @@ def parse_entry_point_def(ep_definition)
 def get_python_short_path(python_version=None):
     if on_win:
         return "python.exe"
-    if python_version and '.' not in python_version:
+-    if python_version and "." not in python_version:
 +    if not python_version:
 +        return sys.executable
 +    if '.' not in python_version:
-         python_version = '.'.join(python_version)
-    return join("bin", "python%s" % (python_version or ''))
+         python_version = ".".join(python_version)
+-    return join("bin", "python%s" % (python_version or ""))
 +    return join("bin", "python" + python_version)
 
 
 def get_python_site_packages_short_path(python_version):
-- 
-2.19.2
-
--- a/0005-Fix-failing-tests-in-test_api.py.patch
+++ b/0005-Fix-failing-tests-in-test_api.py.patch
@ -1,21 +1,5 @@
-From 4bc8b4ec9579e7c015a6ad5b41031c850596e0fb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Fri, 21 Sep 2018 10:23:39 +0200
-Subject: [PATCH] Fix failing tests in test_api.py
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Based on commit 0722e2edc93ae818bddd18f23be5b18c3a2a1d55 by
-Kale Franz <kfranz@continuum.io>.
-
-Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
---
- tests/test_api.py | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
 diff --git a/tests/test_api.py b/tests/test_api.py
-index 3ca97be734..e866e82fd3 100644
+index dd6a7b9..c60d1a1 100644
 --- a/tests/test_api.py
 +++ b/tests/test_api.py
@@ -224,7 +224,7 @@ def test_PackageCacheData_return_value_contract():
@ -27,7 +11,7 @@ index 3ca97be734..e866e82fd3 100644
 
     first_writable_result = PackageCacheData.first_writable()
     assert isinstance(first_writable_result, PackageCacheData)
-@@ -269,20 +269,21 @@ def test_PrefixData_contract():
+@@ -265,13 +265,14 @@ def test_PrefixData_contract():
 def test_PrefixData_return_value_contract():
     pd = PrefixData(context.conda_prefix)
 
@ -39,16 +23,17 @@ index 3ca97be734..e866e82fd3 100644
 +        get_result = pd.get(PackageRecord.from_objects(single_prefix_rec))
 +        assert isinstance(get_result, PrefixRecord)
 
-    query_result = pd.query('openssl')
+-    query_result = pd.query("openssl")
 -    assert isinstance(query_result, tuple)
 -    assert all(isinstance(prefix_rec, PrefixRecord) for prefix_rec in query_result)
-+        query_result = pd.query('openssl')
+        query_result = pd.query("openssl")
 +        assert isinstance(query_result, tuple)
 +        assert all(isinstance(prefix_rec, PrefixRecord) for prefix_rec in query_result)
 
     iter_records_result = pd.iter_records()
     assert isiterable(iter_records_result)
-     assert all(isinstance(prefix_rec, PrefixRecord) for prefix_rec in iter_records_result)
+@@ -280,7 +281,7 @@ def test_PrefixData_return_value_contract():
+     )
 
     is_writable_result = pd.is_writable
 -    assert is_writable_result is True or is_writable_result is False
@ -56,6 +41,3 @@ index 3ca97be734..e866e82fd3 100644
 
     reload_result = pd.reload()
     assert isinstance(reload_result, PrefixData)
-- 
-2.19.2
-
--- a/0006-shell-assume-shell-plugins-are-in-etc.patch
+++ b/0006-shell-assume-shell-plugins-are-in-etc.patch
@ -1,32 +1,72 @@
 diff --git a/conda/activate.py b/conda/activate.py
-index e1b1812..567140f 100644
+index f79a03f..951bed4 100644
 --- a/conda/activate.py
 +++ b/conda/activate.py
-@@ -825,7 +825,7 @@ class PosixActivator(_Activator):
-         self.set_var_tmpl = "%s='%s'"
-         self.run_script_tmpl = '. "%s"'
+@@ -914,13 +914,7 @@ class PosixActivator(_Activator):
+     set_var_tmpl = "%s='%s'"
+     run_script_tmpl = ". \"`cygpath '%s'`\"" if on_win else '. "%s"'
 
-        self.hook_source_path = join(CONDA_PACKAGE_ROOT, 'shell', 'etc', 'profile.d', 'conda.sh')
-+        self.hook_source_path = '/etc/profile.d/conda.sh'
+-    hook_source_path = Path(
+-        CONDA_PACKAGE_ROOT,
+-        "shell",
+-        "etc",
+-        "profile.d",
+-        "conda.sh",
+-    )
+    hook_source_path = Path("/etc/profile.d/conda.sh")
+     inline_hook_source = True
 
-         super(PosixActivator, self).__init__(arguments)
+     def _update_prompt(self, set_vars, conda_prompt_modifier):
+@@ -956,13 +950,7 @@ class CshActivator(_Activator):
+     set_var_tmpl = "set %s='%s'"
+     run_script_tmpl = "source \"`cygpath '%s'`\"" if on_win else 'source "%s"'
 
-@@ -882,7 +882,7 @@ class CshActivator(_Activator):
-         self.set_var_tmpl = "set %s='%s'"
-         self.run_script_tmpl = 'source "%s"'
+-    hook_source_path = Path(
+-        CONDA_PACKAGE_ROOT,
+-        "shell",
+-        "etc",
+-        "profile.d",
+-        "conda.csh",
+-    )
+    hook_source_path = Path("/etc/profile.d/conda.csh")
+     # TCSH/CSH removes newlines when doing command substitution (see `man tcsh`),
+     # source conda.csh directly and use line terminators to separate commands
+     inline_hook_source = False
+@@ -1001,7 +989,7 @@ class XonshActivator(_Activator):
+         else 'source-bash --suppress-skip-message -n "%s"'
+     )
 
-        self.hook_source_path = join(CONDA_PACKAGE_ROOT, 'shell', 'etc', 'profile.d', 'conda.csh')
-+        self.hook_source_path = '/etc/profile.d/conda.csh'
+-    hook_source_path = Path(CONDA_PACKAGE_ROOT, "shell", "conda.xsh")
+    hook_source_path = Path("/etc/profile.d/conda.xsh")
+     inline_hook_source = True
 
-         super(CshActivator, self).__init__(arguments)
+     def template_path_var(self, key: str, value: str) -> str:
+@@ -1055,14 +1043,7 @@ class FishActivator(_Activator):
+     set_var_tmpl = 'set -g %s "%s"'
+     run_script_tmpl = 'source "%s"'
 
-@@ -993,8 +993,7 @@ class FishActivator(_Activator):
-         self.set_var_tmpl = 'set -g %s "%s"'
-         self.run_script_tmpl = 'source "%s"'
+-    hook_source_path = Path(
+-        CONDA_PACKAGE_ROOT,
+-        "shell",
+-        "etc",
+-        "fish",
+-        "conf.d",
+-        "conda.fish",
+-    )
+    hook_source_path = Path("/etc/fish/conf.d/conda.fish")
+     inline_hook_source = True
 
-        self.hook_source_path = join(CONDA_PACKAGE_ROOT, 'shell', 'etc', 'fish', 'conf.d',
-                                     'conda.fish')
-+        self.hook_source_path = '/etc/fish/conf.d/conda.fish'
 
-         super(FishActivator, self).__init__(arguments)
+diff --git a/conda/base/context.py b/conda/base/context.py
+index adf6d6e..612ea4a 100644
+--- a/conda/base/context.py
+++ b/conda/base/context.py
+@@ -848,7 +848,7 @@ class Context(Configuration):
+     def av_data_dir(self) -> PathType:
+         """Where critical artifact verification data (e.g., various public keys) can be found."""
+         # TODO (AV): Find ways to make this user configurable?
+-        return join(self.conda_prefix, "etc", "conda")
+        return '/etc/conda'
 
+     @property
+     def signing_metadata_url_base(self) -> str | None:
--- a/0007-Fix-import-of-collections.abc.Iterable.patch
+++ b/0007-Fix-import-of-collections.abc.Iterable.patch
@ -1,43 +0,0 @@
-From d0d6e937582d673d7b319ff9f26d55a39c3b6b7f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Tue, 4 Feb 2020 14:15:35 +0100
-Subject: [PATCH] Fix import of collections.abc.Iterable
-
-Required for python3.9 compatibility.
---
- conda/_vendor/auxlib/compat.py | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/conda/_vendor/auxlib/compat.py b/conda/_vendor/auxlib/compat.py
-index 2cd720e0e5..efb4c111bf 100644
--- a/conda/_vendor/auxlib/compat.py
-+++ b/conda/_vendor/auxlib/compat.py
-@@ -2,7 +2,6 @@
- from __future__ import absolute_import, division, print_function
- 
- import codecs
-import collections
- from itertools import chain
- import os
- import sys
-@@ -17,6 +16,11 @@ from shlex import split
- from functools import partial
- from tempfile import NamedTemporaryFile, template
- 
-+try:
-+    from collections.abc import Iterable          # NOQA
-+except ImportError:
-+    from collections import Iterable              # NOQA
-+
- try:
-     from collections import OrderedDict as odict  # NOQA
- except ImportError:
-@@ -34,7 +38,7 @@ def isiterable(obj):
-                 and not isinstance(obj, string_types)
-                 and type(obj) is not type)
-     else:
-        return not isinstance(obj, string_types) and isinstance(obj, collections.Iterable)
-+        return not isinstance(obj, string_types) and isinstance(obj, Iterable)
- 
- 
- # shlex.split() is a poor function to use for anything general purpose (like calling subprocess).
--- a/202
+++ b/202
@ -0,0 +1,202 @@
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+ 
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 4.10.1-2
+- Rebuilt for Python 3.10
+
+* Thu Apr 15 2021 Orion Poplawski <orion@nwra.com> - 4.10.1-1
+- Update to 4.10.1
+
+* Fri Apr 02 2021 Orion Poplawski <orion@nwra.com> - 4.10.0-1
+- Update to 4.10.0
+
+* Tue Jan 26 2021 Orion Poplawski <orion@nwra.com> - 4.9.2-3
+- Add patch to support python 3.10
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Nov 11 2020 Orion Poplawski <orion@nwra.com> - 4.9.2-1
+- Update to 4.9.2
+
+* Tue Oct 27 2020 Orion Poplawski <orion@nwra.com> - 4.9.1-1
+- Update to 4.9.1
+
+* Sun Oct 18 2020 Orion Poplawski <orion@nwra.com> - 4.9.0-1
+- Update to 4.9.0
+
+* Mon Sep 21 2020 Orion Poplawski <orion@nwra.com> - 4.8.5-2
+- Add note to description about base environment
+
+* Mon Sep 14 2020 Orion Poplawski <orion@nwra.com> - 4.8.5-1
+- Update to 4.8.5
+- Install conda.fish (bz#1878306)
+
+* Sat Aug 08 2020 Orion Poplawski <orion@nwra.com> - 4.8.4-1
+- Update to 4.8.4
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.3-4
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 4.8.3-2
+- Rebuilt for Python 3.9
+
+* Sun Mar 15 2020 Orion Poplawski <orion@nwra.com> - 4.8.3-1
+- Update to 4.8.3
+
+* Tue Feb  4 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.8.2-2
+- Fix import for python3.9 compatiblity (#1797691)
+
+* Tue Jan 28 2020 Orion Poplawski <orion@nwra.com> - 4.8.2-1
+- Update to 4.8.2 (#1785658)
+- Obtain bash completion file from github - tartansandal/conda-bash-completion
+
+* Mon Jan 20 2020 Orion Poplawski <orion@nwra.com> - 4.8.0-2
+- Install bash completion file (bz#1791068)
+
+* Sat Dec 14 2019 Orion Poplawski <orion@nwra.com> - 4.8.0-1
+- Update to 4.8.0
+- Make "conda shell.bash hook" work (bz#1737165)
+- Unbundle more libraries
+
+* Sat Sep 14 2019 Orion Poplawski <orion@nwra.com> - 4.7.12-1
+- Update to 4.7.12
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 4.7.11-2
+- Rebuilt for Python 3.8
+
+* Fri Aug 16 2019 Orion Poplawski <orion@nwra.com> - 4.7.11-1
+- Update to 4.7.11
+- Use system py-cpuinfo
+
+* Fri Aug 16 2019 Orion Poplawski <orion@nwra.com> - 4.7.10-2
+- Cleanup requires some (drop crypto, yaml; add pyOpenSSL; 
+  add versions for requests and ruamel-yaml
+
+* Sat Aug  3 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.7.10-1
+- Fix 'conda shell.* hook' invocations (#1737165)
+
+* Wed Jul 31 2019 Orion Poplawski <orion@nwra.com> - 4.7.10-1
+- Update to 4.7.10
+
+* Mon Jul 29 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.7.6-1
+- Update to latest version (#1678578)
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jun 11 2019 Orion Poplawski <orion@nwra.com> - 4.7.2-1
+- Update to 4.7.2
+
+* Sun Jun  9 2019 Orion Poplawski <orion@nwra.com> - 4.7.1-1
+- Update to 4.7.1
+
+* Tue Apr 16 2019 Orion Poplawski <orion@nwra.com> - 4.6.13-1
+- Update to 4.6.13
+
+* Thu Apr  4 2019 Orion Poplawski <orion@nwra.com> - 4.6.11-1
+- Update to 4.6.11
+
+* Tue Apr  2 2019 Orion Poplawski <orion@nwra.com> - 4.6.9-2
+- Fix conda profile scripts
+- Do not build for python2 on EPEL
+- Ignore test failures on EPEL7
+
+* Sat Mar 30 2019 Orion Poplawski <orion@nwra.com> - 4.6.9-1
+- Update to 4.6.9
+
+* Wed Feb 13 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.6.5-1
+- Update to latest upstream version (#1668145)
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Dec 31 2018 Orion Poplawski <orion@nwra.com> - 4.5.12-1
+- Update to 4.5.12
+
+* Mon Dec 31 2018 Orion Poplawski <orion@nwra.com> - 4.5.11-2
+- EPEL7 compatability
+
+* Fri Sep 21 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.5.11-1
+- Update to latest stable version (#1570217)
+- Disable python2 subpackage on F30+
+
+* Fri Jul 13 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.4.11-4
+- Pull in python[23]-cytoolz to replace bundled toolz
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 4.4.11-3
+- Rebuilt for Python 3.7
+
+* Wed Apr 18 2018 Orion Poplawski <orion@nwra.com> - 4.4.11-2
+- Set _CONDA_ROOT in /etc/profile.d/conda.csh
+- Fix python2 requires
+- Require pycosat >= 0.6.3
+
+* Sat Apr 14 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.4.11-1
+- Update to latest upstream version in the 4.4.x branch (#1544046)
+
+* Wed Feb  7 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.4.9-1
+- Update to v4.4.9 (#1542874)
+- conda-activate binary rpm is retired. The new way to activate the environment
+  is to say 'conda activate'. See
+  https://github.com/conda/conda/releases/tag/4.4.0 for more information.
+
+* Wed Feb 07 2018 Iryna Shcherbina <ishcherb@redhat.com> - 4.3.24-5
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.24-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.3.24-3
+- Install just one version of the executables (python 2 or 3)
+
+* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.3.24-2
+- Add all licenses to the License tag
+- Add Provides: bundled(...) for all the "vendored" dependencies
+- Update descriptions and simplify the spec file a bit
+- Move condarc.d directory under /usr/share/conda
+
+* Thu Aug  3 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.3.24-1
+- Update to latest version
+- Switch /usr/bin/conda to python3
+
+* Thu Jul 21 2016 Orion Poplawski <orion@cora.nwra.com> - 4.1.6-1
+- Update to 4.1.6
+
+* Thu Dec 31 2015 Orion Poplawski <orion@cora.nwra.com> - 3.19.0-1
+- Update to 3.19.0
+
+* Thu Dec 31 2015 Orion Poplawski <orion@cora.nwra.com> - 3.18.8-2
+- Add python 3 version
+
+* Mon Dec 7 2015 Orion Poplawski <orion@cora.nwra.com> - 3.18.8-1
+- Update to 3.18.8
+
+* Thu Sep 24 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-6
+- Do not create broken symlinks if activate/deactivate are not installed
+- Do not create /usr/conda-meta to prevent accidental installs into system
+
+* Thu Sep 24 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-5
+- Non-bootstrap build
+
+* Wed Sep 23 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-4
+- Add patch to support rootless mode
+- Require python-crypto
+- Create /usr/conda-meta, /usr/.condarc, /var/cache/conda
+
+* Tue Sep 22 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-3
+- Require python-requests, python-yaml
+
+* Tue Sep 22 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-2
+- Add patch to allow overriding pkgs_dirs in .condarc
+
+* Mon Sep 21 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-1
+- Initial package
--- a/59
+++ b/59
@ -37,8 +37,9 @@ function __comp_conda_ensure_root() {
        :    import conda
        :    print(os.path.dirname(conda.__file__))
        "
+        script="${script//        :    /}"
        # don't assume an active base environment
-        CONDA_SOURCE=$(conda activate base; python -c "${script//        :    /}")
+        CONDA_SOURCE=$(conda activate base; python -c "$script")
    fi
 }

@ -51,40 +52,49 @@ function __comp_conda_commands () {
    echo activate deactivate

    # check commands from full anaconda install
-    for f in $CONDA_SOURCE/cli/main_*.py
+    for f in "$CONDA_SOURCE"/cli/main_*.py
    do
        # skip pip -- not a sub-command
-        [[ $f == */main_pip.py ]] && continue
-        \expr match "$f" '.*_\([a-z]\+\)\.py$'
+        [[ "$f" == */main_pip.py ]] && continue
+        if [[ "$f" =~ .*_([a-z]+)\.py$ ]]; then
+            echo "${BASH_REMATCH[1]}"
+        fi
    done

    # check extra pluggins
-    for f in $CONDA_ROOT/bin/conda-*
+    for f in "$CONDA_ROOT"/bin/conda-*
    do
        if [[ -x "$f" && ! -d "$f" ]]
        then
-            \expr match "$f" '^.*/conda-\(.*\)'
+            if [[ "$f" =~ .*/conda-(.*) ]]; then
+                echo "${BASH_REMATCH[1]}"
+            fi
        fi
    done
 }

 function __comp_conda_env_commands() {
-    for f in $CONDA_SOURCE/../conda_env/cli/main_*.py
+    for f in "$CONDA_SOURCE"/../conda_env/cli/main_*.py
    do
-        \expr match "$f" '.*_\([a-z]\+\)\.py$'
+        [[ "$f" == */main_vars.py ]] && continue
+        if [[ "$f" =~ .*_([a-z]+)\.py$ ]]; then
+            echo "${BASH_REMATCH[1]}"
+        fi
    done
 }

 function __comp_conda_envs() {
    \local script="
-    :    from __future__ import print_function;
-    :    import json, os, sys;
-    :    from os.path import isdir, join;
+    :    from __future__ import print_function
+    :    import json, os, sys
+    :    from os.path import isdir, join
    :    print('\n'.join(
    :       d for ed in json.load(sys.stdin)['envs_dirs'] if isdir(ed)
-    :       for d in os.listdir(ed) if isdir(join(ed, d))));
+    :       for d in os.listdir(ed) if isdir(join(ed, d)))
+    :    )
    "
-    conda config --json --show envs_dirs | python -c "${script//    :    /}"
+    script="${script//    :    /}"
+    conda config --json --show envs_dirs | $CONDA_PYTHON_EXE -c "$script"
 }

 function __comp_conda_packages() {
@ -95,13 +105,13 @@ function __comp_conda_cmds_str() {
    # get a list of commands, skipping options
    \local cmd
    \local -a cmds
-    for cmd in $*; do
+    for cmd in "$@"; do
        case "$cmd" in
            -*) continue ;;
-            *) cmds+=($cmd) ;;
+            *) cmds+=("$cmd") ;;
        esac
    done
-    echo "${cmds[*]}"
+    echo "${cmds[@]}"
 }

 # helper for debugging issues with the cache
@ -135,7 +145,7 @@ function __comp_conda_option_lookup() {
    else
        word_list=${__comp_conda_cache[$cmd_key]}
    fi
-    echo $word_list
+    echo "$word_list"
 }

 # cache conda subcommand help lookups for the duration of the shell
@ -149,6 +159,7 @@ __comp_conda_ensure_root 2>/dev/null || :

 _comp_conda()
 {
+    # shellcheck disable=SC2034
    \local cur prev words cword
    _init_completion || return

@ -157,7 +168,7 @@ _comp_conda()
    \local word_list cmd_str
    if [[ $cur == -* ]]; then
        # get the current list of commands as a string sans options
-        cmd_str="$(__comp_conda_cmds_str ${words[@]})"
+        cmd_str=$(__comp_conda_cmds_str "${words[@]}")
        word_list=$(__comp_conda_option_lookup "$cmd_str")
    else
        case "$prev" in
@ -168,8 +179,12 @@ _comp_conda()
                word_list=$(__comp_conda_env_commands 2>/dev/null)
                ;;
            activate)
-                _filedir -d                     # environment directories
-                word_list=$(__comp_conda_envs 2>/dev/null)
+                if [[ $cur == */* ]]
+                then
+                    _filedir -d  # environment directories
+                else
+                    word_list=$(__comp_conda_envs 2>/dev/null)
+                fi
                ;;
            remove|uninstall|upgrade|update)
                word_list=$(__comp_conda_packages 2>/dev/null)
@ -193,7 +208,9 @@ _comp_conda()
        esac
    fi
    if [[ -n $word_list ]]; then
-        COMPREPLY+=( $(compgen -W "$word_list" -- "$cur") )
+        # append completion suggestions to COMPREPLY
+        mapfile -t -O "${#COMPREPLY[@]}" COMPREPLY < \
+            <(compgen -W "$word_list" -- "$cur")
    fi
 } &&
 complete -F _comp_conda conda
--- a/conda-32bit.patch
+++ b/conda-32bit.patch
@ -1,20 +0,0 @@
-diff -up conda-4.8.4/tests/core/test_solve.py.32bit conda-4.8.4/tests/core/test_solve.py
--- conda-4.8.4/tests/core/test_solve.py.32bit	2020-08-06 15:02:52.000000000 -0600
-+++ conda-4.8.4/tests/core/test_solve.py	2020-08-07 19:12:28.240154100 -0600
-@@ -284,14 +284,14 @@ def test_cuda_fail_1(tmpdir):
-     if sys.platform == "darwin":
-         plat = "osx-64"
-     elif sys.platform == "linux":
-        plat = "linux-64"
-+        plat = "linux-%s" % platform.architecture()[0][0:2]
-     elif sys.platform == "win32":
-         if platform.architecture()[0] == "32bit":
-             plat = "win-32"
-         else:
-             plat = "win-64"
-     else:
-        plat = "linux-64"
-+        plat = "linux-%s" % platform.architecture()[0][0:2]
- 
-     assert str(exc.value).strip() == dals("""The following specifications were found to be incompatible with your system:
- 
--- a/conda-cpuinfo.patch
+++ b/conda-cpuinfo.patch
@ -1,12 +0,0 @@
-diff -up conda-4.7.11/conda/base/context.py.cpuinfo conda-4.7.11/conda/base/context.py
--- conda-4.7.11/conda/base/context.py.cpuinfo	2019-08-06 13:23:55.000000000 -0600
-+++ conda-4.7.11/conda/base/context.py	2019-08-16 21:31:01.947610667 -0600
-@@ -1328,7 +1328,7 @@ conda_tests_ctxt_mgmt_def_pol = replace_
- @memoize
- def _get_cpu_info():
-     # DANGER: This is rather slow
-    from .._vendor.cpuinfo import get_cpu_info
-+    from cpuinfo import get_cpu_info
-     return frozendict(get_cpu_info())
- 
- 
--- a/conda.spec
+++ b/conda.spec
@ -1,31 +1,22 @@
-%{!?_with_bootstrap: %global bootstrap 0}
+%bcond_without tests

 Name:           conda
-Version:        4.10.1
-Release:        2%{?dist}
+Version:        25.11.1
+Release:        %autorelease
 Summary:        Cross-platform, Python-agnostic binary package manager

-License:        BSD and ASL 2.0 and LGPLv2+ and MIT
-# The conda code is BSD
-# progressbar is LGPLv2+
-# six is MIT/X11
-# adapters/ftp.py is ASL 2.0
+License:        BSD-3-Clause AND Apache-2.0 
+# The conda code is BSD-3-Clause
+# adapters/ftp.py is Apache-2.0

 URL:            http://conda.pydata.org/docs/
 Source0:        https://github.com/conda/conda/archive/%{version}/%{name}-%{version}.tar.gz
 # bash completion script moved to a separate project
-Source1:        https://raw.githubusercontent.com/tartansandal/conda-bash-completion/1.5/conda
-Patch0:         conda_sys_prefix.patch
-Patch1:         conda_gateways_disk_create.patch
-Patch2:         setup.patch
-# Use system cpuinfo
-Patch3:         conda-cpuinfo.patch
-# Fix tests on 32bit
-# https://github.com/conda/conda/pull/9759
-Patch4:         conda-32bit.patch
+Source1:        https://raw.githubusercontent.com/tartansandal/conda-bash-completion/1.7/conda
+Patch0:         0001-conda_sys_prefix.patch.patch
+# Use main entry point for conda and re-add conda-env entry point, no need to run conda init
+Patch1:         0002-Use-main-entry-point-for-conda-and-re-add-conda-env-.patch

-Patch10001:     0001-Fix-toolz-imports.patch
-Patch10003:     0003-Drop-fs-path-encoding-manipulation-under-python2.patch
 Patch10004:     0004-Do-not-try-to-run-usr-bin-python.patch
 Patch10005:     0005-Fix-failing-tests-in-test_api.py.patch
 Patch10006:     0006-shell-assume-shell-plugins-are-in-etc.patch
@ -35,13 +26,13 @@ BuildArch:      noarch
 BuildRequires:  pkgconfig(bash-completion)
 %global bash_completionsdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null || echo '/etc/bash_completion.d')
 BuildRequires:  sed
+# For man pages
+BuildRequires:  python-conda-sphinx-theme

 Requires:       python%{python3_pkgversion}-conda = %{version}-%{release}
 # Removed upstream in favour of calling "conda activate" in version 4.4.0
 Obsoletes:      conda-activate < 4.4

-%?python_enable_dependency_generator
-

 %global _description %{expand:
 Conda is a cross-platform, Python-agnostic binary package manager. It
@ -57,78 +48,54 @@ can only use conda to create and manage new environments.}

 %description %_description

-%global _py3_reqs \
-        python%{python3_pkgversion}-cpuinfo \
-        python%{python3_pkgversion}-conda-package-handling >= 1.3.0 \
-        python%{python3_pkgversion}-distro >= 1.0.4 \
-        python%{python3_pkgversion}-frozendict >= 1.2 \
-        python%{python3_pkgversion}-pycosat >= 0.6.3 \
-        python%{python3_pkgversion}-pyOpenSSL >= 16.2.0 \
-        python%{python3_pkgversion}-requests >= 2.18.4 \
-        python%{python3_pkgversion}-ruamel-yaml >= 0.11.14 \
-        python%{python3_pkgversion}-tqdm >= 4.22.0 \
-        python%{python3_pkgversion}-urllib3 >= 1.19.1
-%global py3_reqs %(c="%_py3_reqs"; echo "$c" | xargs)
+
+%package tests
+Summary:        conda tests
+
+%description tests
+Data for conda tests.  Set CONDA_TEST_DATA_DIR to
+%{_datadir}/conda/tests/data.


 %package -n python%{python3_pkgversion}-conda
 Summary:        %{summary}

 BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python%{python3_pkgversion}-setuptools
-BuildRequires:  %py3_reqs
-# When this is present, vendored toolz should not be used
-%if 0%{?fedora} || 0%{?rhel} >= 8
-# EPEL7 does not have new enough cytoolz
-BuildRequires:  python%{python3_pkgversion}-cytoolz >= 0.8.2
-%endif
 # For tests
 BuildRequires:  python-unversioned-command
-BuildRequires:  python%{python3_pkgversion}-mock
-BuildRequires:  python%{python3_pkgversion}-pytest-cov
+BuildRequires:  python%{python3_pkgversion}-boltons
+BuildRequires:  python%{python3_pkgversion}-boto3
+BuildRequires:  python%{python3_pkgversion}-conda-libmamba-solver
+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-mock
+BuildRequires:  python%{python3_pkgversion}-pytest-rerunfailures
+BuildRequires:  python%{python3_pkgversion}-pytest-split
+BuildRequires:  python%{python3_pkgversion}-pytest-timeout
+BuildRequires:  python%{python3_pkgversion}-pytest-xprocess
 BuildRequires:  python%{python3_pkgversion}-responses

-Requires:       %py3_reqs
-%if 0%{?fedora} || 0%{?rhel} >= 8
-# EPEL does not have new enough cytoolz
-Requires:       python%{python3_pkgversion}-cytoolz >= 0.8.2
-%endif
-Provides:       bundled(python%{python3_pkgversion}-appdirs) = 1.2.0
-Provides:       bundled(python%{python3_pkgversion}-auxlib)
-Provides:       bundled(python%{python3_pkgversion}-boltons) = 18.0.0
-Provides:       bundled(python%{python3_pkgversion}-six) = 1.10.0
-Provides:       bundled(python%{python3_pkgversion}-toolz) = 0.8.2
-
-%{?python_provide:%python_provide python%{python3_pkgversion}-conda}
+# conda uses a modified version of auxlib
+Provides:       bundled(python%{python3_pkgversion}-auxlib) = 0.0.43

 %description -n python%{python3_pkgversion}-conda %_description

 %prep
 %autosetup -p1

-sed -r -i 's/^(__version__ = ).*/\1"%{version}"/' conda/__init__.py
+# Re-enable dep on conda-libmamba-solver
+sed -i -e '/"conda-libmamba-solver/s/# *//' pyproject.toml

-# delete interpreter line, the user can always call the file
-# explicitly as python3 /usr/lib/python3.6/site-packages/conda/_vendor/appdirs.py
-# or so.
-sed -r -i '1 {/#![/]usr[/]bin[/]env/d}' conda/_vendor/appdirs.py
+# Do not restrict upper bound of ruamel-yaml
+sed -i -e '/ruamel.yaml/s/,<[0-9.]*//' pyproject.toml

-# Use Fedora's cpuinfo since it supports more arches
-rm conda/_vendor/cpuinfo.py
+# pytest-split/xdoctest not packaged, store-duration not needed
+sed -i -e '/splitting-algorithm/d' -e '/store-durations/d' -e '/xdoctest/d' pyproject.toml

-# Replaced by cytools, byte compilation fails under python3.7
-%if 0%{?fedora} || 0%{?rhel} >= 8
-# EPEL does not have new enough cytoolz
-# We need to keep __init__.py which does the dispatch between vendored and non-vendored
-rm conda/_vendor/toolz/[a-zA-Z]*
-%endif
-
-# Use system versions
-# TODO - urllib3 - results in test failures: https://github.com/conda/conda/issues/9512
-#rm -r conda/_vendor/{distro.py,frozendict.py,tqdm,urllib3}
-#find conda -name \*.py | xargs sed -i -e 's/^\( *\)from .*_vendor\.\(\(distro\|frozendict\|tqdm\|urllib3\).*\) import/\1from \2 import/'
-rm -r conda/_vendor/{distro.py,frozendict.py,tqdm}
-find conda -name \*.py | xargs sed -i -e 's/^\( *\)from .*_vendor\.\(\(distro\|frozendict\|tqdm\).*\) import/\1from \2 import/'
+# Unpackaged - really only applicable for macOS/Windows?
+sed -i -e '/"truststore *>/d' pyproject.toml

 %ifnarch x86_64
 # Tests on 32-bit
@ -139,40 +106,54 @@ cp -a tests/data/conda_format_repo/{linux-64,%{python3_platform}}
 sed -i -e s/linux-64/%{python3_platform}/ tests/data/conda_format_repo/%{python3_platform}/*json
 %endif

+# Do not run coverage in pytest
+sed -i -e '/"--cov/d' pyproject.toml
+
+%generate_buildrequires
+# When not testing, we don't need runtime dependencies.
+# Normally, we would still BuildRequire them to not accidentally build an uninstallable package,
+# but there is a runtime dependency loop with python3-conda-libmamba-solver.
+%pyproject_buildrequires %{!?with_tests:-R}

 %build
-# build conda executable
-%define py_setup utils/setup-testing.py
-%py3_build
+%pyproject_wheel

 %install
-# install conda executable
-%define py_setup utils/setup-testing.py
-%py3_install
+%pyproject_install
+#py3_shebang_fix %{buildroot}%{python3_sitelib}/conda/shell/bin/conda
+%pyproject_save_files conda*

+mkdir -p %{buildroot}%{_sysconfdir}/conda/condarc.d
 mkdir -p %{buildroot}%{_datadir}/conda/condarc.d
 cat >%{buildroot}%{_datadir}/conda/condarc.d/defaults.yaml <<EOF
+channels:
+ - https://conda.anaconda.org/conda-forge
 pkgs_dirs:
 - /var/cache/conda/pkgs
 - ~/.conda/pkgs
 EOF

+mv %{buildroot}%{python3_sitelib}/tests %{buildroot}%{_datadir}/conda/
+cp -rp tests/data %{buildroot}%{_datadir}/conda/tests/
+
 mkdir -p %{buildroot}%{_localstatedir}/cache/conda/pkgs/cache

 # install does not create the directory on EL7
 install -m 0644 -Dt %{buildroot}/etc/profile.d/ conda/shell/etc/profile.d/conda.{sh,csh}
-sed -r -i '1i CONDA_EXE=%{_bindir}/conda' %{buildroot}/etc/profile.d/conda.sh
+sed -r -i -e '1i [ -z "$CONDA_EXE" ] && CONDA_EXE=%{_bindir}/conda' \
+          -e '/PATH=.*condabin/s|PATH=|[ -d $(dirname "$CONDA_EXE")/condabin ] \&\& PATH=|' %{buildroot}/etc/profile.d/conda.sh
 sed -r -i -e '1i set _CONDA_EXE=%{_bindir}/conda\nset _CONDA_ROOT=' \
          -e 's/CONDA_PFX=.*/CONDA_PFX=/' %{buildroot}/etc/profile.d/conda.csh
-install -m 0644 -Dt %{buildroot}/etc/fish/conf.d/ conda/shell/etc/fish/conf.d/conda.fish
+install -m 0644 -Dt %{buildroot}%{_datadir}/fish/vendor_conf.d/ conda/shell/etc/fish/conf.d/conda.fish
 sed -r -i -e '1i set -gx CONDA_EXE "/usr/bin/conda"\nset _CONDA_ROOT "/usr"\nset _CONDA_EXE "/usr/bin/conda"\nset -gx CONDA_PYTHON_EXE "/usr/bin/python3"' \
-          %{buildroot}/etc/fish/conf.d/conda.fish
+          %{buildroot}%{_datadir}/fish/vendor_conf.d/conda.fish

 # Install bash completion script
 install -m 0644 -Dt %{buildroot}%{bash_completionsdir}/ %SOURCE1


 %check
+%if %{with tests}
 export PATH=%{buildroot}%{_bindir}:$PATH
 PYTHONPATH=%{buildroot}%{python3_sitelib} conda info

@ -183,243 +164,291 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} conda info
 # test_cli.py::TestRun.test_run_returns_int
 # test_cli.py::TestRun.test_run_returns_nonzero_errorlevel
 # test_cli.py::TestRun.test_run_returns_zero_errorlevel
-
 # test_ProgressiveFetchExtract_prefers_conda_v2_format, test_subdir_data_prefers_conda_to_tar_bz2,
 # test_use_only_tar_bz2 fail in F31 koji, but not with mock --enablerepo=local. Let's disable
 # them for now.
+# tests/base/test_context.py::test_default_activation_prefix - conda.exceptions.CondaHTTPError
+# tests/cli/test_all_commands.py::test_denylist_channels - conda.exceptions.EnvironmentLocationNotFound: Not a conda environment: /usr
+# tests/cli/test_cli_install.py::test_frozen_env_cep22[libmamba] - conda.exceptions.CondaHTTPError
+# tests/cli/test_cli_install.py::test_frozen_env_cep22[classic] - conda.exceptions.CondaHTTPError
+# Unsure - but perhaps config does not has a subdir?
+# tests/cli/test_common.py::test_validate_subdir_config - TypeError: expected str, bytes or os.PathLike object, not NoneType
+# tests/cli/test_common.py::test_validate_subdir_config_invalid_subdir - TypeError: argument should be a str or an os.PathLike object where __fspath__ returns a str, not 'NoneType'
+# Would need an installed conda to test
+# tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[bash-expected_patterns0] - FileNotFoundError: [Errno 2] No such file or directory: '/etc/profile.d/conda.sh'
+# tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[zsh-expected_patterns1] - FileNotFoundError: [Errno 2] No such file or directory: '/etc/profile.d/conda.sh'
+# tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[fish-expected_patterns2] - FileNotFoundError: [Errno 2] No such file or directory: '/etc/fish/conf.d/conda.fish'
+# tests/cli/test_main.py::test_main_sourced_unix_shells_no_line_ending_fix[xonsh-expected_patterns5] - FileNotFoundError: [Errno 2] No such file or directory: '/etc/profile.d/conda.xsh'
+# tests/cli/test_main_export.py::test_export_preserves_channels_from_installed_packages - AssertionError: Expected to find conda-forge or defaults in channels: ['https://conda.anaconda.org/conda-forge']
+# tests/cli/test_main_export.py::test_export_package_alphabetical_ordering - AssertionError: Should have multiple packages for ordering test
+# tests/cli/test_main_export.py::test_export_no_builds_format - AssertionError: Should have conda packages to test
+# tests/cli/test_main_export.py::test_export_regular_format_consistency - AssertionError: Should have conda packages to test
+# tests/cli/test_main_export.py::test_export_pip_dependencies_handling[environment-yaml-yaml_safe_load] - AssertionError: Should have conda dependencies
+# tests/cli/test_main_export.py::test_export_pip_dependencies_handling[environment-json-loads] - AssertionError: Should have conda dependencies
+# tests/cli/test_main_export.py::test_export_with_pip_dependencies_integration[YAML--yaml_safe_load] - conda.exceptions.CondaHTTPError
+# tests/cli/test_main_export.py::test_export_with_pip_dependencies_integration[JSON---format=json-loads] - conda.exceptions.CondaHTTPError
+# tests/cli/test_main_export.py::test_export_explicit_format_validation_errors - conda.exceptions.CondaHTTPError
+# tests/cli/test_main_export.py::test_export_multiple_platforms - conda.exceptions.CondaHTTPError
+# tests/cli/test_main_export.py::test_export_single_platform_different_platform - conda.exceptions.CondaHTTPError
+# The /usr base env does not have last_modified
+# tests/cli/test_main_info.py::test_info_json - AssertionError: assert False
+# tests/cli/test_main_install.py::test_build_version_shows_as_changed - conda.exceptions.CondaHTTPError
+# tests/cli/test_main_list.py::test_fields_all - conda.exceptions.DirectoryNotACondaEnvironmentError: The target directory exists, but it is not a conda environment.
+# tests/cli/test_main_list.py::test_fields_invalid - conda.exceptions.DirectoryNotACondaEnvironmentError: The target directory exists, but it is not a conda environment.
+# tests/cli/test_main_list.py::test_exit_codes - conda.exceptions.DirectoryNotACondaEnvironmentError: The target directory exists, but it is not a conda environment.
+# tests/cli/test_main_update.py::test_update - conda.exceptions.CondaHTTPError
+# tests/cli/test_main_update.py::test_dont_update_packages_with_version_constraints - conda.exceptions.NoBaseEnvironmentError: This conda installation has no default base environment. Use
+# tests/core/test_prefix_data.py::test_get_packages_behavior_with_interoperability - conda.exceptions.CondaHTTPError
+# tests/core/test_prefix_data.py::test_empty_environment_package_methods - conda.exceptions.CondaHTTPError
+# tests/core/test_prefix_data.py::test_pinned_specs_conda_meta_pinned - conda.exceptions.CondaHTTPError
+# tests/core/test_solve.py::test_pinned_specs_conda_meta_pinned[libmamba] - conda.exceptions.CondaHTTPError
+# tests/core/test_solve.py::test_pinned_specs_condarc[libmamba] - conda.exceptions.CondaHTTPError
+# tests/core/test_solve.py::test_pinned_specs_all[libmamba] - conda.exceptions.CondaHTTPError
+# These are HTTP errors
+# tests/env/installers/test_conda_installer_explicit.py::test_installer_installs_explicit - conda.CondaMultiError
+# tests/env/specs/test_explicit.py::test_environment - conda.CondaMultiError
+# tests/env/test_create.py::test_create_env_from_non_existent_plugin - conda.exceptions.CondaHTTPError
+# tests/models/test_environment.py::test_extrapolate - conda.exceptions.CondaHTTPError
+# tests/models/test_environment.py::test_explicit_packages - conda.CondaMultiError
+# tests/plugins/subcommands/doctor/test_health_checks.py::test_pinned_will_formatted_check[-\u2705] - conda.exceptions.CondaHTTPError
+# tests/plugins/subcommands/doctor/test_health_checks.py::test_pinned_will_formatted_check[conda 1.11-\u2705] - conda.exceptions.CondaHTTPError
+# tests/plugins/subcommands/doctor/test_health_checks.py::test_pinned_will_formatted_check[conda 1.11, otherpackages==1-\u274c] - conda.exceptions.CondaHTTPError
+# tests/plugins/subcommands/doctor/test_health_checks.py::test_pinned_will_formatted_check["conda"-\u274c] - conda.exceptions.CondaHTTPError
+# tests/plugins/subcommands/doctor/test_health_checks.py::test_pinned_will_formatted_check[imnotinstalledyet-\u274c] - conda.exceptions.CondaHTTPError
+# tests/plugins/subcommands/doctor/test_health_checks.py::test_file_locking_supported[True] - conda.exceptions.DirectoryNotACondaEnvironmentError: The target directory exists, but it is not a conda environment.
+# tests/plugins/subcommands/doctor/test_health_checks.py::test_file_locking_supported[False] - conda.exceptions.DirectoryNotACondaEnvironmentError: The target directory exists, but it is not a conda environment.
+# tests/plugins/subcommands/doctor/test_health_checks.py::test_file_locking_not_supported - conda.exceptions.DirectoryNotACondaEnvironmentError: The target directory exists, but it is not a conda environment.
+# tests/plugins/test_transaction_hooks.py::test_transaction_hooks_invoked - conda.exceptions.CondaHTTPError
+# These are network errors
+# tests/plugins/test_transaction_hooks.py::test_pre_transaction_raises_exception - AssertionError: Regex pattern did not match.
+# tests/plugins/test_transaction_hooks.py::test_post_transaction_raises_exception - AssertionError: Regex pattern did not match.
+# tests/cli/test_conda_argparse.py::test_list_through_python_api does not recognize /usr as a conda environment
+# tests/cli/test_main_{clean,info,install,list,list_reverse,rename}.py tests require network access
+# tests/cli/test_main_notices.py::test_notices_appear_once_when_running_decorated_commands needs a conda_build fixture that we remove
+# tests/cli/test_main_notices.py::test_notices_cannot_read_cache_files - TypeError: '<' not supported between instances of 'MagicMock' and 'int'
+# tests/cli/test_main_run.py require /usr/bin/conda to be installed
+# tests/cli/test_subcommands.py tests require network access
+# tests/cli/test_subcommands.py::test_doctor- conda.exceptions.EnvironmentLocationNotFound: Not a conda environment: /usr
+# tests/cli/test_subcommands.py::test_rename seems to need an active environment
+# tests/env/test_create.py::test_create_env_json requires network access
+# tests/env/test_create.py::test_create_update_remote_env_file requires network access
+# tests/env/test_create.py::test_protected_dirs_error_for_env_create - requires network access
+# tests/test_activate.py::test_activate_same_environment - requries network
+# tests/test_activate.py::test_build_activate_dont_activate_unset_var - requires network
+# tests/test_activate.py::test_build_activate_restore_unset_env_vars - requries network
+# tests/test_activate.py::test_build_activate_shlvl_warn_clobber_vars - requries network
+# tests/test_activate.py::test_build_activate_shlvl_0 - requries network
+# tests/test_activate.py::test_build_activate_shlvl_1 - requries network
+# tests/test_activate.py::test_build_deactivate_shlvl_2_from_stack - requries network
+# tests/test_activate.py::test_build_deactivate_shlvl_2_from_activate - requries network
+# tests/test_activate.py::test_build_deactivate_shlvl_1 - requries network
+# tests/test_activate.py::test_build_stack_shlvl_1 - requries network
+# tests/test_activate.py::test_get_env_vars_big_whitespace/test_get_env_vars_empty_file require network access
+# tests/test_activate.py::test_pre_post_command_invoked[hook] - requires conda to be installed
+# tests/test_activate.py::test_pre_post_command_raises[hook] - requires conda to be installed
+# tests/test_misc.py::test_explicit_missing_cache_entries requires network access
 # tests/core/test_initialize.py tries to unlink /usr/bin/python3 and fails when python is a release candidate
 # tests/core/test_solve.py::test_cuda_fail_1 fails on non-x86_64
-py.test-%{python3_version} -vv -m "not integration" \
+# tests/core/test_solve.py libmamba - some depsolving differences - TODO
+# tests/core/test_solve.py libmamba - some depsolving differences - TODO
+# tests/core/test_prefix_graph.py libmamba - some depsolving differences - TODO
+# tests/plugins/subcommands/doctor/test_cli.py::test_conda_doctor_happy_path - conda.exceptions.EnvironmentLocationNotFound: Not a conda environment: /usr
+# tests/plugins/subcommands/doctor/test_cli.py::test_conda_doctor_happy_path_verbose - conda.exceptions.EnvironmentLocationNotFound: Not a conda environment: /usr
+# tests/plugins/test_health_checks.py::test_health_check_ran - conda.exceptions.EnvironmentLocationNotFound: Not a conda environment: /usr
+# tests/plugins/test_subcommands.py::test_help - Difference in whitespace
+# tests/testing/test_fixtures.py::test_tmp_env - requires network access
+# tests/testing/test_fixtures.py::test_session_tmp_env - requires network access
+# tests/testing/test_fixtures.py::test_env - requires network tests to succeed
+# tests/testing/test_fixtures.py::test_tmp_channel - requires network access
+# tests/trust/test_signature_verification.py requires conda_content_trust - not yet packaged
+py.test-%{python3_version} -vv -rfs -m "not integration" \
+    --deselect=tests/test_activate.py::test_activate_same_environment \
+    --deselect=tests/test_activate.py::test_build_activate_dont_activate_unset_var \
+    --deselect=tests/test_activate.py::test_build_activate_dont_use_PATH \
+    --deselect=tests/test_activate.py::test_build_activate_restore_unset_env_vars \
+    --deselect=tests/test_activate.py::test_build_activate_shlvl_warn_clobber_vars \
+    --deselect=tests/test_activate.py::test_build_activate_shlvl_0 \
+    --deselect=tests/test_activate.py::test_build_activate_shlvl_1 \
+    --deselect=tests/test_activate.py::test_build_deactivate_dont_use_PATH \
+    --deselect=tests/test_activate.py::test_build_deactivate_shlvl_2_from_stack \
+    --deselect=tests/test_activate.py::test_build_deactivate_shlvl_2_from_activate \
+    --deselect=tests/test_activate.py::test_build_deactivate_shlvl_1 \
+    --deselect=tests/test_activate.py::test_build_stack_shlvl_1 \
+    --deselect=tests/test_activate.py::test_get_env_vars_big_whitespace \
+    --deselect=tests/test_activate.py::test_get_env_vars_empty_file \
+    --deselect=tests/test_activate.py::test_pre_post_command_invoked[hook] \
+    --deselect=tests/test_activate.py::test_pre_post_command_raises[hook] \
    --deselect=tests/test_cli.py::TestJson::test_list \
-    --deselect=tests/test_cli.py::TestRun::test_run_returns_int \
-    --deselect=tests/test_cli.py::TestRun::test_run_returns_nonzero_errorlevel \
-    --deselect=tests/test_cli.py::TestRun::test_run_returns_zero_errorlevel \
+    --deselect=tests/test_cli.py::test_run_returns_int \
+    --deselect=tests/test_cli.py::test_run_returns_nonzero_errorlevel \
+    --deselect=tests/test_cli.py::test_run_returns_zero_errorlevel \
+    --deselect=tests/test_cli.py::test_run_readonly_env \
+    --deselect=tests/test_install.py::test_conda_pip_interop_dependency_satisfied_by_pip \
+    --deselect=tests/test_install.py::test_install_from_extracted_package \
+    --deselect=tests/test_install.py::test_install_mkdir \
+    --deselect=tests/test_misc.py::test_explicit_missing_cache_entries \
+    --ignore=tests/env/specs/test_binstar.py \
+    --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_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_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 \
+    --deselect=tests/cli/test_main_export.py::test_export_regular_format_consistency \
+    --deselect=tests/cli/test_main_export.py::test_export_pip_dependencies_handling[environment-yaml-yaml_safe_load] \
+    --deselect=tests/cli/test_main_export.py::test_export_pip_dependencies_handling[environment-json-loads] \
+    --deselect=tests/cli/test_main_export.py::test_export_with_pip_dependencies_integration[YAML--yaml_safe_load] \
+    --deselect=tests/cli/test_main_export.py::test_export_with_pip_dependencies_integration[JSON---format=json-loads] \
+    --deselect=tests/cli/test_main_export.py::test_export_explicit_format_validation_errors \
+    --deselect=tests/cli/test_main_export.py::test_export_multiple_platforms \
+    --deselect=tests/cli/test_main_export.py::test_export_single_platform_different_platform \
+    --deselect=tests/cli/test_main_install.py::test_build_version_shows_as_changed \
+    --deselect=tests/cli/test_main_list.py::test_fields_all \
+    --deselect=tests/cli/test_main_list.py::test_fields_invalid \
+    --deselect=tests/cli/test_main_list.py::test_exit_codes \
+    --deselect=tests/cli/test_main_update.py::test_update \
+    --deselect=tests/cli/test_main_update.py::test_dont_update_packages_with_version_constraints \
+    --deselect=tests/core/test_prefix_data.py::test_get_packages_behavior_with_interoperability \
+    --deselect=tests/core/test_prefix_data.py::test_empty_environment_package_methods \
+    --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 \
+    --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] \
+    --deselect=tests/env/installers/test_conda_installer_explicit.py::test_installer_installs_explicit \
+    --deselect=tests/env/specs/test_explicit.py::test_environment \
+    --deselect=tests/env/test_create.py::test_create_env_from_non_existent_plugin \
+    --deselect=tests/models/test_environment.py::test_extrapolate \
+    --deselect=tests/models/test_environment.py::test_explicit_packages \
+    --deselect=tests/plugins/subcommands/doctor/test_health_checks.py::test_pinned_will_formatted_check \
+    --deselect=tests/plugins/subcommands/doctor/test_health_checks.py::test_file_locking_supported[True] \
+    --deselect=tests/plugins/subcommands/doctor/test_health_checks.py::test_file_locking_supported[False] \
+    --deselect=tests/plugins/subcommands/doctor/test_health_checks.py::test_file_locking_not_supported \
+    --deselect=tests/plugins/test_transaction_hooks.py::test_transaction_hooks_invoked \
+    --deselect=tests/plugins/test_transaction_hooks.py::test_pre_transaction_raises_exception \
+    --deselect=tests/plugins/test_transaction_hooks.py::test_post_transaction_raises_exception \
+    --deselect=tests/cli/test_all_commands.py::test_denylist_channels \
+    --deselect='tests/cli/test_common.py::test_is_active_prefix[active_prefix-True]' \
+    --deselect=tests/cli/test_config.py::test_conda_config_describe \
+    --deselect=tests/cli/test_config.py::test_conda_config_validate \
+    --deselect=tests/cli/test_config.py::test_conda_config_validate_sslverify_truststore \
+    --deselect=tests/cli/test_conda_argparse.py::test_list_through_python_api \
+    --deselect=tests/cli/test_main_clean.py \
+    --deselect=tests/cli/test_main_info.py::test_info_python_output \
+    --deselect=tests/cli/test_main_info.py::test_info_conda_json \
+    --deselect=tests/cli/test_main_info.py::test_info_json \
+    --deselect=tests/cli/test_main_install.py::test_conda_pip_interop_dependency_satisfied_by_pip \
+    --deselect=tests/cli/test_main_install.py::test_install_from_extracted_package \
+    --deselect=tests/cli/test_main_install.py::test_install_mkdir \
+    --deselect=tests/cli/test_main_list.py::test_list \
+    --deselect=tests/cli/test_main_list.py::test_list_reverse \
+    --deselect=tests/cli/test_main_notices.py::test_notices_appear_once_when_running_decorated_commands \
+    --deselect=tests/cli/test_main_notices.py::test_notices_cannot_read_cache_files \
+    --deselect=tests/cli/test_main_remove.py::test_remove_all \
+    --deselect=tests/cli/test_main_remove.py::test_remove_all_keep_env \
+    --deselect=tests/cli/test_main_rename.py \
+    --deselect=tests/cli/test_main_run.py \
+    --deselect=tests/cli/test_subcommands.py::test_create[libmamba] \
+    --deselect=tests/cli/test_subcommands.py::test_doctor \
+    --deselect=tests/cli/test_subcommands.py::test_env_create \
+    --deselect=tests/cli/test_subcommands.py::test_env_update \
+    --deselect=tests/cli/test_subcommands.py::test_init \
+    --deselect=tests/cli/test_subcommands.py::test_install \
+    --deselect=tests/cli/test_subcommands.py::test_list \
+    --deselect=tests/cli/test_subcommands.py::test_notices \
+    --deselect=tests/cli/test_subcommands.py::test_remove_all_json[remove] \
+    --deselect=tests/cli/test_subcommands.py::test_remove_all_json[uninstall] \
+    --deselect=tests/cli/test_subcommands.py::test_rename \
+    --deselect=tests/cli/test_subcommands.py::test_run \
+    --deselect=tests/cli/test_subcommands.py::test_search \
+    --deselect=tests/cli/test_subcommands.py::test_update[libmamba-update] \
+    --deselect=tests/cli/test_subcommands.py::test_update[libmamba-upgrade] \
+    --deselect=tests/cli/test_subcommands.py::test_update[update] \
+    --deselect=tests/cli/test_subcommands.py::test_update[upgrade] \
    --deselect=tests/core/test_package_cache_data.py::test_ProgressiveFetchExtract_prefers_conda_v2_format \
    --deselect=tests/core/test_subdir_data.py::test_subdir_data_prefers_conda_to_tar_bz2 \
    --deselect=tests/core/test_subdir_data.py::test_use_only_tar_bz2 \
    --deselect=tests/core/test_initialize.py \
-    --deselect=tests/core/test_solve.py::test_cuda_fail_1
-
+    --deselect=tests/core/test_solve.py::test_cuda_fail_1 \
+    --deselect=tests/core/test_solve.py::test_conda_downgrade[libmamba] \
+    --deselect=tests/core/test_solve.py::test_python2_update[libmamba] \
+    --deselect=tests/core/test_solve.py::test_update_deps_2[libmamba] \
+    --deselect=tests/core/test_solve.py::test_fast_update_with_update_modifier_not_set[libmamba] \
+    --deselect=tests/core/test_solve.py::test_timestamps_1[libmamba] \
+    --deselect=tests/core/test_solve.py::test_remove_with_constrained_dependencies[libmamba] \
+    --deselect=tests/env/test_create.py::test_create_env_json[example/environment.yml] \
+    --deselect=tests/env/test_create.py::test_create_env_json[example/environment_with_pip.yml] \
+    --deselect=tests/env/test_create.py::test_create_update_remote_env_file \
+    --deselect=tests/env/test_create.py::test_protected_dirs_error_for_env_create \
+    --deselect=tests/gateways/test_jlap.py::test_download_and_hash \
+    --deselect=tests/gateways/test_jlap.py::test_jlap_fetch_ssl[True] \
+    --deselect=tests/gateways/test_jlap.py::test_jlap_fetch_ssl[False] \
+    --deselect=tests/test_plan.py::test_pinned_specs_conda_meta_pinned \
+    --deselect=tests/test_plan.py::test_pinned_specs_condarc \
+    --deselect=tests/test_plan.py::test_pinned_specs_all \
+    --deselect=tests/cli/test_subcommands.py::test_compare[libmamba] \
+    --deselect=tests/cli/test_subcommands.py::test_package[libmamba] \
+    --deselect=tests/cli/test_subcommands.py::test_remove[libmamba-remove] \
+    --deselect=tests/cli/test_subcommands.py::test_remove[libmamba-uninstall] \
+    --deselect=tests/cli/test_subcommands.py::test_remove_all_json[libmamba-remove] \
+    --deselect=tests/cli/test_subcommands.py::test_remove_all_json[libmamba-uninstall] \
+    --deselect=tests/cli/test_subcommands.py::test_remove_all_json[classic-remove] \
+    --deselect=tests/cli/test_subcommands.py::test_remove_all_json[classic-uninstall] \
+    --deselect=tests/cli/test_subcommands.py::test_update[classic-update] \
+    --deselect=tests/cli/test_subcommands.py::test_update[classic-upgrade] \
+    --deselect=tests/cli/test_subcommands.py::test_env_remove[libmamba] \
+    --deselect=tests/cli/test_subcommands.py::test_env_config_vars[libmamba] \
+    --deselect=tests/core/test_subdir_data.py::test_subdir_data_coverage \
+    --deselect=tests/models/test_prefix_graph.py::test_prefix_graph_1[libmamba] \
+    --deselect=tests/models/test_prefix_graph.py::test_prefix_graph_2[libmamba] \
+    --deselect=tests/models/test_prefix_graph.py::test_remove_youngest_descendant_nodes_with_specs[libmamba] \
+    --deselect=tests/models/test_prefix_graph.py::test_deep_cyclical_dependency[libmamba] \
+    --deselect=tests/plugins/test_pre_solves.py::test_pre_solve_invoked \
+    --deselect=tests/plugins/test_post_solves.py::test_post_solve_action_raises_exception \
+    --deselect=tests/plugins/test_post_solves.py::test_post_solve_invoked \
+    --deselect=tests/plugins/subcommands/doctor/test_cli.py::test_conda_doctor_happy_path \
+    --deselect=tests/plugins/subcommands/doctor/test_cli.py::test_conda_doctor_happy_path_verbose \
+    --deselect=tests/plugins/subcommands/doctor/test_cli.py::test_conda_doctor_with_test_environment \
+    --deselect=tests/plugins/test_health_checks.py::test_health_check_ran \
+    --deselect=tests/plugins/test_subcommands.py::test_help \
+    --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/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/trust \
+    conda tests
+%endif

 %files
+%{_sysconfdir}/conda/
 %{_bindir}/conda
 %{_bindir}/conda-env
 %{bash_completionsdir}/conda
-# TODO - better ownership/requires for fish
-%dir /etc/fish
-%dir /etc/fish/conf.d
-/etc/fish/conf.d/conda.fish
+# TODO - better ownership for fish/vendor_conf.d
+%dir %{_datadir}/fish/vendor_conf.d
+%{_datadir}/fish/vendor_conf.d/conda.fish
 /etc/profile.d/conda.sh
 /etc/profile.d/conda.csh

-%files -n python%{python3_pkgversion}-conda
-%license LICENSE.txt
-%doc CHANGELOG.md README.rst
-%{python3_sitelib}/conda/
-%{python3_sitelib}/conda_env/
-%{python3_sitelib}/*.egg-info
-%exclude %{python3_sitelib}/test_data/
+%files tests
+%{_datadir}/conda/tests/
+
+%files -n python%{python3_pkgversion}-conda -f %pyproject_files
+%doc CHANGELOG.md README.md
 %{_localstatedir}/cache/conda/
-%{_datadir}/conda/
+%dir %{_datadir}/conda/
+%{_datadir}/conda/condarc.d/


 %changelog
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 4.10.1-2
- Rebuilt for Python 3.10
-
-* Thu Apr 15 2021 Orion Poplawski <orion@nwra.com> - 4.10.1-1
- Update to 4.10.1
-
-* Fri Apr 02 2021 Orion Poplawski <orion@nwra.com> - 4.10.0-1
- Update to 4.10.0
-
-* Tue Jan 26 2021 Orion Poplawski <orion@nwra.com> - 4.9.2-3
- Add patch to support python 3.10
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Nov 11 2020 Orion Poplawski <orion@nwra.com> - 4.9.2-1
- Update to 4.9.2
-
-* Tue Oct 27 2020 Orion Poplawski <orion@nwra.com> - 4.9.1-1
- Update to 4.9.1
-
-* Sun Oct 18 2020 Orion Poplawski <orion@nwra.com> - 4.9.0-1
- Update to 4.9.0
-
-* Mon Sep 21 2020 Orion Poplawski <orion@nwra.com> - 4.8.5-2
- Add note to description about base environment
-
-* Mon Sep 14 2020 Orion Poplawski <orion@nwra.com> - 4.8.5-1
- Update to 4.8.5
- Install conda.fish (bz#1878306)
-
-* Sat Aug 08 2020 Orion Poplawski <orion@nwra.com> - 4.8.4-1
- Update to 4.8.4
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.3-4
- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 4.8.3-2
- Rebuilt for Python 3.9
-
-* Sun Mar 15 2020 Orion Poplawski <orion@nwra.com> - 4.8.3-1
- Update to 4.8.3
-
-* Tue Feb  4 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.8.2-2
- Fix import for python3.9 compatiblity (#1797691)
-
-* Tue Jan 28 2020 Orion Poplawski <orion@nwra.com> - 4.8.2-1
- Update to 4.8.2 (#1785658)
- Obtain bash completion file from github - tartansandal/conda-bash-completion
-
-* Mon Jan 20 2020 Orion Poplawski <orion@nwra.com> - 4.8.0-2
- Install bash completion file (bz#1791068)
-
-* Sat Dec 14 2019 Orion Poplawski <orion@nwra.com> - 4.8.0-1
- Update to 4.8.0
- Make "conda shell.bash hook" work (bz#1737165)
- Unbundle more libraries
-
-* Sat Sep 14 2019 Orion Poplawski <orion@nwra.com> - 4.7.12-1
- Update to 4.7.12
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 4.7.11-2
- Rebuilt for Python 3.8
-
-* Fri Aug 16 2019 Orion Poplawski <orion@nwra.com> - 4.7.11-1
- Update to 4.7.11
- Use system py-cpuinfo
-
-* Fri Aug 16 2019 Orion Poplawski <orion@nwra.com> - 4.7.10-2
- Cleanup requires some (drop crypto, yaml; add pyOpenSSL; 
-  add versions for requests and ruamel-yaml
-
-* Sat Aug  3 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.7.10-1
- Fix 'conda shell.* hook' invocations (#1737165)
-
-* Wed Jul 31 2019 Orion Poplawski <orion@nwra.com> - 4.7.10-1
- Update to 4.7.10
-
-* Mon Jul 29 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.7.6-1
- Update to latest version (#1678578)
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jun 11 2019 Orion Poplawski <orion@nwra.com> - 4.7.2-1
- Update to 4.7.2
-
-* Sun Jun  9 2019 Orion Poplawski <orion@nwra.com> - 4.7.1-1
- Update to 4.7.1
-
-* Tue Apr 16 2019 Orion Poplawski <orion@nwra.com> - 4.6.13-1
- Update to 4.6.13
-
-* Thu Apr  4 2019 Orion Poplawski <orion@nwra.com> - 4.6.11-1
- Update to 4.6.11
-
-* Tue Apr  2 2019 Orion Poplawski <orion@nwra.com> - 4.6.9-2
- Fix conda profile scripts
- Do not build for python2 on EPEL
- Ignore test failures on EPEL7
-
-* Sat Mar 30 2019 Orion Poplawski <orion@nwra.com> - 4.6.9-1
- Update to 4.6.9
-
-* Wed Feb 13 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.6.5-1
- Update to latest upstream version (#1668145)
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Dec 31 2018 Orion Poplawski <orion@nwra.com> - 4.5.12-1
- Update to 4.5.12
-
-* Mon Dec 31 2018 Orion Poplawski <orion@nwra.com> - 4.5.11-2
- EPEL7 compatability
-
-* Fri Sep 21 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.5.11-1
- Update to latest stable version (#1570217)
- Disable python2 subpackage on F30+
-
-* Fri Jul 13 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.4.11-4
- Pull in python[23]-cytoolz to replace bundled toolz
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.11-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 4.4.11-3
- Rebuilt for Python 3.7
-
-* Wed Apr 18 2018 Orion Poplawski <orion@nwra.com> - 4.4.11-2
- Set _CONDA_ROOT in /etc/profile.d/conda.csh
- Fix python2 requires
- Require pycosat >= 0.6.3
-
-* Sat Apr 14 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.4.11-1
- Update to latest upstream version in the 4.4.x branch (#1544046)
-
-* Wed Feb  7 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.4.9-1
- Update to v4.4.9 (#1542874)
- conda-activate binary rpm is retired. The new way to activate the environment
-  is to say 'conda activate'. See
-  https://github.com/conda/conda/releases/tag/4.4.0 for more information.
-
-* Wed Feb 07 2018 Iryna Shcherbina <ishcherb@redhat.com> - 4.3.24-5
- Update Python 2 dependency declarations to new packaging standards
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.24-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.3.24-3
- Install just one version of the executables (python 2 or 3)
-
-* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.3.24-2
- Add all licenses to the License tag
- Add Provides: bundled(...) for all the "vendored" dependencies
- Update descriptions and simplify the spec file a bit
- Move condarc.d directory under /usr/share/conda
-
-* Thu Aug  3 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.3.24-1
- Update to latest version
- Switch /usr/bin/conda to python3
-
-* Thu Jul 21 2016 Orion Poplawski <orion@cora.nwra.com> - 4.1.6-1
- Update to 4.1.6
-
-* Thu Dec 31 2015 Orion Poplawski <orion@cora.nwra.com> - 3.19.0-1
- Update to 3.19.0
-
-* Thu Dec 31 2015 Orion Poplawski <orion@cora.nwra.com> - 3.18.8-2
- Add python 3 version
-
-* Mon Dec 7 2015 Orion Poplawski <orion@cora.nwra.com> - 3.18.8-1
- Update to 3.18.8
-
-* Thu Sep 24 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-6
- Do not create broken symlinks if activate/deactivate are not installed
- Do not create /usr/conda-meta to prevent accidental installs into system
-
-* Thu Sep 24 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-5
- Non-bootstrap build
-
-* Wed Sep 23 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-4
- Add patch to support rootless mode
- Require python-crypto
- Create /usr/conda-meta, /usr/.condarc, /var/cache/conda
-
-* Tue Sep 22 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-3
- Require python-requests, python-yaml
-
-* Tue Sep 22 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-2
- Add patch to allow overriding pkgs_dirs in .condarc
-
-* Mon Sep 21 2015 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-1
- Initial package
+%autochangelog
--- a/conda_gateways_disk_create.patch
+++ b/conda_gateways_disk_create.patch
@ -1,22 +0,0 @@
-diff -up conda-4.7.0/conda/gateways/disk/create.py.orig conda-4.7.0/conda/gateways/disk/create.py
--- conda-4.7.0/conda/gateways/disk/create.py.orig	2019-05-17 11:08:48.000000000 -0600
-+++ conda-4.7.0/conda/gateways/disk/create.py	2019-05-18 19:46:11.428298209 -0600
-@@ -28,7 +28,7 @@ from ...base.context import context
- from ...common.compat import on_win
- from ...common.path import ensure_pad, expand, win_path_double_escape, win_path_ok
- from ...common.serialize import json_dump
-from ...exceptions import BasicClobberError, CondaOSError, maybe_raise
-+from ...exceptions import BasicClobberError, CondaOSError, maybe_raise, NotWritableError
- from ...models.enums import FileMode, LinkType
- 
- 
-@@ -438,6 +438,9 @@ def create_package_cache_directory(pkgs_
-         sudo_safe = expand(pkgs_dir).startswith(expand('~'))
-         touch(join(pkgs_dir, PACKAGE_CACHE_MAGIC_FILE), mkdir=True, sudo_safe=sudo_safe)
-         touch(join(pkgs_dir, 'urls'), sudo_safe=sudo_safe)
-+    except NotWritableError:
-+        log.trace("cannot create package cache directory '%s'", pkgs_dir)
-+        return False
-     except (IOError, OSError) as e:
-         if e.errno in (EACCES, EPERM, EROFS):
-             log.trace("cannot create package cache directory '%s'", pkgs_dir)
--- a/conda_sys_prefix.patch
+++ b/conda_sys_prefix.patch
@ -1,14 +0,0 @@
-diff --git a/conda/__init__.py b/conda/__init__.py
-index 342f3ce..debf943 100644
--- a/conda/__init__.py
-+++ b/conda/__init__.py
-@@ -35,8 +35,7 @@ __copyright__ = "Copyright (c) 2012, Anaconda, Inc."
- __summary__ = __doc__
- __url__ = "https://github.com/conda/conda"
- 
-if os.getenv('CONDA_ROOT') is None:
-    os.environ[str('CONDA_ROOT')] = sys.prefix
-+os.environ['CONDA_ROOT'] = '/usr/share/conda'
- 
- CONDA_PACKAGE_ROOT = abspath(dirname(__file__))
- 
--- a/setup.patch
+++ b/setup.patch
@ -1,16 +0,0 @@
-diff --git a/utils/setup-testing.py b/utils/setup-testing.py
-index 7036d44..19793f8 100755
--- a/utils/setup-testing.py
-+++ b/utils/setup-testing.py
-@@ -3,10 +3,7 @@
- from __future__ import absolute_import, division, print_function, unicode_literals
- import os
- import sys
-if 'develop' in sys.argv:
-    from setuptools import setup
-else:
-    from distutils.core import setup
-+from setuptools import setup
- 
- if not (sys.version_info[:2] == (2, 7) or sys.version_info[:2] >= (3, 3)):
-     sys.exit("conda is only meant for Python 2.7 or 3.3 and up.  "
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (conda-4.10.1.tar.gz) = 75796b580abcc91c449461302cecb98cd067285ef03d6630c882177b0b0f8f9df56101480943d5a14855ecfca10c5ea7dcb57c569a3ff538add713f82772a6f0
+SHA512 (conda-25.11.1.tar.gz) = ce04c8805ca51047cf1e1ebb945fcce1fbb559fe472d4f5fb4217d49b93b67c8e38baf735c6a9244b31d559247ec10d46e1e33caf8ac7fedc105ce3645121609
Author	SHA1	Message	Date
Orion Poplawski	5867b044fe	Update to 25.11.1	2025-12-12 07:54:53 -07:00
Orion Poplawski	c81db4c15e	Re-enable dep on conda-libmamba-solver	2025-12-07 10:51:37 -07:00
Orion Poplawski	3d686dc69a	Fix dependencies and bundled versions	2025-11-27 12:01:55 -07:00
Orion Poplawski	dd5dca4cb9	Update to 25.11.0 (rhbz#2356170)	2025-11-26 08:45:35 -07:00
Python Maint	0884a0436b	Rebuilt for Python 3.14.0rc3 bytecode	2025-09-19 12:11:41 +02:00
Python Maint	14d9eba336	Rebuilt for Python 3.14.0rc2 bytecode	2025-08-15 12:42:31 +02:00
Fedora Release Engineering	1b5bb91b02	Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild	2025-07-23 18:36:22 +00:00
Python Maint	76ff27954e	Unbootstrap for Python 3.14	2025-07-21 11:29:50 +02:00
Python Maint	b7b10a0b9b	Bootstrap for Python 3.14.0b3 bytecode	2025-06-18 15:50:46 +02:00
Python Maint	d7c8539d8c	Bootstrap for Python 3.14	2025-06-06 16:44:31 +02:00
Orion Poplawski	5f82b139a5	Update to 24.11.3	2025-01-20 17:14:43 -07:00
Fedora Release Engineering	021e812451	Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild	2025-01-16 14:23:14 +00:00
Orion Poplawski	ba451f3238	Update to 24.11.2	2024-12-20 22:01:51 -07:00
Orion Poplawski	983031fe72	Update to 24.11.1	2024-12-11 20:33:50 -07:00
Orion Poplawski	f8dda64679	Update to 24.11.0	2024-11-30 13:54:57 -07:00
Orion Poplawski	66a66b0a76	Update to 24.9.2	2024-10-17 07:47:42 -06:00
Orion Poplawski	c03d4ab444	Set default channel to conda-forge (rhbz#2279958)	2024-10-08 21:05:19 -06:00
Orion Poplawski	f349058d4f	Update to 24.9.1	2024-10-08 20:00:16 -06:00
Orion Poplawski	5095af4c04	Update to 24.7.1 - Add patch to support python 3.13	2024-08-03 17:02:48 -06:00
Fedora Release Engineering	c2c4383abe	Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild	2024-07-17 19:52:48 +00:00
Python Maint	fc7da1f8ec	Rebuilt for Python 3.13	2024-06-29 23:36:55 +02:00
Python Maint	dd6335a03e	Bootstrap for Python 3.13	2024-06-09 02:47:14 +02:00
Orion Poplawski	5925ee3a61	Update to 24.4.0	2024-04-26 17:02:51 -06:00
Orion Poplawski	1abcd0c13a	Update to 24.3.0	2024-03-19 18:54:18 -06:00
Orion Poplawski	e5e74076ca	Update to 24.1.2	2024-02-20 19:53:45 -07:00
Orion Poplawski	0a64905122	Update to 24.1.1	2024-02-15 19:20:07 -07:00
Fedora Release Engineering	78bf0073f1	Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild	2024-01-24 07:55:14 +00:00
Fedora Release Engineering	f6bec6937d	Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild	2024-01-19 16:04:24 +00:00
Karolina Surma	38bdf2c17d	Avoid circular dependency on python3-conda-libmamba-solver	2023-12-24 04:06:41 +00:00
Orion Poplawski	beff4ff623	Preserve hook_source_path as a Path object	2023-12-23 20:48:14 -07:00
Orion Poplawski	d51b3ca326	Update to 23.11.0	2023-12-08 07:46:21 -07:00
Orion Poplawski	5d67702950	Update to 23.10 - Use vendor_conf.d for fish	2023-12-06 18:11:58 -07:00
Orion Poplawski	4f44ec26f1	Use proper entry point for conda-env	2023-12-04 06:52:51 -07:00
Orion Poplawski	f48b2e379f	Ship tests sub-package	2023-12-02 11:59:15 -07:00
Orion Poplawski	d6bd3ebed6	Use automatic BuildRequires/Requires, cleanup deps. Relax ruamel.yaml upper bound (bz#2246608)	2023-10-27 18:59:41 -06:00
Orion Poplawski	2a5edff621	Use main entry point for conda and re-add conda-env entry point, no need to run conda init (partial fix for bz#2242585)	2023-10-08 20:01:24 -06:00
Orion Poplawski	d288339a2e	Update to 23.9.0	2023-10-08 08:17:12 -06:00
Orion Poplawski	ccc45b8c77	Update to 23.7.4	2023-09-13 21:47:51 -06:00
Orion Poplawski	f512f6086d	Update to 23.7.3	2023-08-23 12:44:15 -06:00
Orion Poplawski	b39e038d74	Update to 23.7.2	2023-07-30 16:18:49 -06:00
Fedora Release Engineering	07ddfb5c29	Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2023-07-19 16:15:51 +00:00
Orion Poplawski	f443f948ad	Update to 23.5.2	2023-07-18 08:40:47 -06:00
Python Maint	8a2e41454d	Rebuilt for Python 3.12	2023-07-04 12:25:56 +02:00
Orion Poplawski	0c6ca773a8	Update to 23.3.1	2023-04-05 20:12:38 -06:00
Orion Poplawski	51a2a1966d	Add BR on python flask	2023-03-16 19:45:38 -06:00
Orion Poplawski	d3264fcda5	Update to 23.3.0	2023-03-16 19:24:12 -06:00
Orion Poplawski	2c30bc9319	Add requirement on pluggy >= 1.0.0	2023-01-21 22:01:37 -07:00
Orion Poplawski	a56955c152	Update to 23.1.0	2023-01-21 21:05:38 -07:00
Fedora Release Engineering	66f60a75ed	Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2023-01-19 00:24:13 +00:00
Orion Poplawski	a3e9a773e8	Fix /etc/profile.d/conda.sh	2022-12-15 20:27:16 -07:00
Orion Poplawski	026f7b9c2f	Update to 22.11.1	2022-12-07 21:51:11 -07:00
Orion Poplawski	cc586cc6eb	test_notices_appear_once_when_running_decorated_commands fails due to a fixture that we remove	2022-12-05 07:54:28 -07:00
Orion Poplawski	1b65af4df7	Set av_dir to /etc/conda; Do not add /usr/condabin to PATH	2022-12-04 13:55:41 -07:00
Orion Poplawski	34903a8f9c	Update to 22.11.0 (Fixes FTBFS bz#135403) Update licensing, use SPDX Cleanup bundled provides	2022-12-04 10:53:24 -07:00
Orion Poplawski	b97864cf23	Update to 4.14.0	2022-08-05 18:31:58 -06:00
Fedora Release Engineering	81e7a35c1a	Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2022-07-20 23:28:29 +00:00
Orion Poplawski	d4dc86856b	Add patch to use new (0.15) ruamel-yaml API	2022-07-17 21:15:25 -06:00
Python Maint	caf664805d	Rebuilt for Python 3.11	2022-06-21 00:53:10 +02:00
Orion Poplawski	608afc8bf8	Ship and own %{_sysconfdir}/conda/condard.c	2022-05-20 16:38:08 -06:00
Orion Poplawski	7133dfe685	local build	2022-05-19 20:13:37 -06:00
Orion Poplawski	a4af2ad2be	Update to 4.12.0	2022-03-10 20:42:23 -07:00
Orion Poplawski	bfeb5e5e00	Do not run coverage tests; Fix mock import	2022-02-08 20:08:14 -07:00
Fedora Release Engineering	fcfb159283	- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2022-01-19 23:44:07 +00:00
Orion Poplawski	33083815ea	Update to 4.11.0	2021-11-29 20:58:32 -07:00
Orion Poplawski	a2c598f820	Remove unused patch	2021-10-11 20:38:31 -06:00
Zbigniew Jędrzejewski-Szmek	d8bc1af66e	Version 4.10.3 (#1977150 ) New --dry-run option for conda env create and other bugfixes.	2021-09-12 21:47:11 +02:00
Zbigniew Jędrzejewski-Szmek	4020096a13	Add --without tests option for quicker builds Also drop unused define for bootstrap.	2021-09-12 21:47:11 +02:00
Zbigniew Jędrzejewski-Szmek	33ff6c759d	Convert to rpmautospec	2021-09-12 09:56:36 +02:00
Fedora Release Engineering	2bf0751bf4	- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2021-07-21 19:56:48 +00:00
Fedora Release Engineering	0f49319fd5	- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2021-07-21 14:58:23 +00:00