diff --git a/0001-Fix-toolz-imports.patch b/0001-Fix-toolz-imports.patch deleted file mode 100644 index e2e9e0b..0000000 --- a/0001-Fix-toolz-imports.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/conda/plan.py b/conda/plan.py -index 091ab89..855cacc 100644 ---- a/conda/plan.py -+++ b/conda/plan.py -@@ -370,7 +370,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 27393a4..cdb16ef 100644 ---- a/conda_env/env.py -+++ b/conda_env/env.py -@@ -22,10 +22,7 @@ from conda.models.match_spec import MatchSpec - from conda.models.prefix_graph import PrefixGraph - 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 5d19c8d..9f4e7ac 100644 ---- a/tests/base/test_context.py -+++ b/tests/base/test_context.py -@@ -15,7 +15,7 @@ import pytest - - from conda.auxlib.collection import AttrDict - from conda.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, -diff --git a/tests/core/test_path_actions.py b/tests/core/test_path_actions.py -index 5c6b283..7cffdd6 100644 ---- a/tests/core/test_path_actions.py -+++ b/tests/core/test_path_actions.py -@@ -16,7 +16,7 @@ from uuid import uuid4 - import pytest - - from conda.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 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 c36a9e3..6fbddec 100644 ---- a/tests/test_activate.py -+++ b/tests/test_activate.py -@@ -22,7 +22,7 @@ import pytest - from conda import __version__ as conda_version - from conda import CONDA_PACKAGE_ROOT, CONDA_SOURCE_ROOT - from conda.auxlib.ish import dals --from conda._vendor.toolz.itertoolz import concatv -+from conda._vendor.toolz import concatv - from conda.activate import ( - CmdExeActivator, - CshActivator, -diff --git a/tests/test_create.py b/tests/test_create.py -index 952d38d..7888f33 100644 ---- a/tests/test_create.py -+++ b/tests/test_create.py -@@ -8,7 +8,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera - from glob import glob - - from conda.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.gateways.disk.create import compile_multiple_pyc - from conda.models.channel import Channel diff --git a/0002-Go-back-to-ruamel_yaml.patch b/0002-Go-back-to-ruamel_yaml.patch deleted file mode 100644 index 078a526..0000000 --- a/0002-Go-back-to-ruamel_yaml.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index 16f338f..a7419c3 100644 ---- a/setup.py -+++ b/setup.py -@@ -36,7 +36,7 @@ source. - install_requires = [ - "pycosat >=0.6.3", - "requests >=2.20.1", -- "ruamel_yaml_conda >=0.11.14", -+ "ruamel_yaml >=0.11.14", - "menuinst ; platform_system=='Windows'", - ] - 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 7a055a5..e183da7 100644 --- a/0004-Do-not-try-to-run-usr-bin-python.patch +++ b/0004-Do-not-try-to-run-usr-bin-python.patch @@ -1,16 +1,16 @@ diff --git a/conda/common/path.py b/conda/common/path.py -index 510f15f..e9e3195 100644 +index 41084ec..11282f3 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 lru_cache, reduce - from logging import getLogger - import os -+import sys +@@ -9,6 +9,7 @@ import os from os.path import abspath, basename, expanduser, expandvars, join, normcase, split, splitext import re import subprocess -@@ -155,9 +156,11 @@ def parse_entry_point_def(ep_definition): ++import sys + from typing import Iterable, Sequence + from urllib.parse import urlsplit + import warnings +@@ -166,9 +167,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/0006-shell-assume-shell-plugins-are-in-etc.patch b/0006-shell-assume-shell-plugins-are-in-etc.patch index 790aeb6..e275fa9 100644 --- a/0006-shell-assume-shell-plugins-are-in-etc.patch +++ b/0006-shell-assume-shell-plugins-are-in-etc.patch @@ -1,32 +1,42 @@ diff --git a/conda/activate.py b/conda/activate.py -index e1b1812..567140f 100644 +index 74e0527..67b0ea3 100644 --- a/conda/activate.py +++ b/conda/activate.py -@@ -825,7 +825,7 @@ class PosixActivator(_Activator): +@@ -829,7 +829,7 @@ class PosixActivator(_Activator): self.set_var_tmpl = "%s='%s'" self.run_script_tmpl = '. "%s"' -- self.hook_source_path = join(CONDA_PACKAGE_ROOT, 'shell', 'etc', 'profile.d', 'conda.sh') +- self.hook_source_path = join(CONDA_PACKAGE_ROOT, "shell", "etc", "profile.d", "conda.sh") + self.hook_source_path = '/etc/profile.d/conda.sh' - super(PosixActivator, self).__init__(arguments) + super().__init__(arguments) -@@ -882,7 +882,7 @@ class CshActivator(_Activator): +@@ -883,7 +883,7 @@ class CshActivator(_Activator): self.set_var_tmpl = "set %s='%s'" self.run_script_tmpl = 'source "%s"' -- self.hook_source_path = join(CONDA_PACKAGE_ROOT, 'shell', 'etc', 'profile.d', 'conda.csh') +- self.hook_source_path = join(CONDA_PACKAGE_ROOT, "shell", "etc", "profile.d", "conda.csh") + self.hook_source_path = '/etc/profile.d/conda.csh' - super(CshActivator, self).__init__(arguments) + super().__init__(arguments) -@@ -993,8 +993,7 @@ class FishActivator(_Activator): +@@ -952,7 +952,7 @@ class XonshActivator(_Activator): + self.script_extension = ".sh" + self.run_script_tmpl = 'source-bash --suppress-skip-message "%s"' + +- self.hook_source_path = join(CONDA_PACKAGE_ROOT, "shell", "conda.xsh") ++ self.hook_source_path = "/etc/profile.d/conda.xsh" + + super().__init__(arguments) + +@@ -999,9 +999,7 @@ class FishActivator(_Activator): self.set_var_tmpl = 'set -g %s "%s"' self.run_script_tmpl = 'source "%s"' -- 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' +- 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) + super().__init__(arguments) diff --git a/11632.patch b/11632.patch deleted file mode 100644 index 9cc23dd..0000000 --- a/11632.patch +++ /dev/null @@ -1,112 +0,0 @@ -From c4b3c8976c7eeeaf960f6116af0fbf5af7cd3b3e Mon Sep 17 00:00:00 2001 -From: Orion Poplawski -Date: Sun, 17 Jul 2022 21:05:34 -0600 -Subject: [PATCH] Use updated ruamel.yaml API - ---- - conda/common/serialize.py | 52 +++++++++++++++++++++++++-------------- - conda_env/env.py | 6 +---- - 2 files changed, 34 insertions(+), 24 deletions(-) - -diff --git a/conda/common/serialize.py b/conda/common/serialize.py -index d850ce6700..43153f1bcd 100644 ---- a/conda/common/serialize.py -+++ b/conda/common/serialize.py -@@ -20,14 +20,15 @@ def get_yaml(): - except ImportError: # pragma: no cover - try: - import ruamel.yaml as yaml -+ from ruamel.yaml.compat import StringIO - except ImportError: - raise ImportError("No yaml library available.\n" - "To proceed, conda install " - "ruamel_yaml") -- return yaml -+ return (yaml, StringIO) - - --yaml = get_yaml() -+(yaml, StringIO) = get_yaml() - - - def represent_ordereddict(dumper, data): -@@ -47,7 +48,8 @@ def represent_ordereddict(dumper, data): - - - def yaml_round_trip_load(string): -- return yaml.round_trip_load(string, version="1.2") -+ yinst = yaml.YAML(typ='rt') -+ return yinst.load(string) - - - def yaml_safe_load(string): -@@ -57,22 +59,34 @@ def yaml_safe_load(string): - {'key': 'value'} - - """ -- return yaml.safe_load(string, version="1.2") -- -- --def yaml_round_trip_dump(object): -- """dump object to string""" -- return yaml.round_trip_dump( -- object, block_seq_indent=2, default_flow_style=False, indent=2 -- ) -- -- --def yaml_safe_dump(object): -- """dump object to string""" -- return yaml.safe_dump( -- object, block_seq_indent=2, default_flow_style=False, indent=2 -- ) -- -+ yinst=yaml.YAML(typ='safe', pure=True) -+ return yinst.load(string) -+ -+ -+def yaml_round_trip_dump(object, stream=None): -+ """dump object to string or stream""" -+ yinst = yaml.YAML(typ='rt') -+ yinst.indent(mapping=2, offset=2, sequence=4) -+ inefficient = False -+ if stream is None: -+ inefficient = True -+ stream = StringIO() -+ yinst.dump(object, stream) -+ if inefficient: -+ return stream.getvalue() -+ -+def yaml_safe_dump(object, stream=None): -+ """dump object to string or stream""" -+ yinst=yaml.YAML(typ='safe', pure=True) -+ yinst.indent(mapping=2, offset=2, sequence=4) -+ yinst.default_flow_style = False -+ inefficient = False -+ if stream is None: -+ inefficient = True -+ stream = StringIO() -+ yinst.dump(object, stream) -+ if inefficient: -+ return stream.getvalue() - - def json_load(string): - return json.loads(string) -diff --git a/conda_env/env.py b/conda_env/env.py -index c494b3d855..142731ada9 100644 ---- a/conda_env/env.py -+++ b/conda_env/env.py -@@ -257,13 +257,9 @@ def to_dict(self, stream=None): - - def to_yaml(self, stream=None): - d = self.to_dict() -- out = yaml_safe_dump(d) -+ out = yaml_safe_dump(d, stream) - if stream is None: - return out -- try: -- stream.write(bytes(out, encoding="utf-8")) -- except TypeError: -- stream.write(out) - - def save(self): - with open(self.filename, "wb") as fp: diff --git a/conda-32bit.patch b/conda-32bit.patch index b40d819..1f8d710 100644 --- a/conda-32bit.patch +++ b/conda-32bit.patch @@ -1,9 +1,10 @@ -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" +diff --git a/tests/core/test_solve.py b/tests/core/test_solve.py +index 81aef85..ef322a0 100644 +--- a/tests/core/test_solve.py ++++ b/tests/core/test_solve.py +@@ -187,14 +187,14 @@ def test_cuda_fail_1(tmpdir, clear_cuda_version): + else: + plat = "osx-64" elif sys.platform == "linux": - plat = "linux-64" + plat = "linux-%s" % platform.architecture()[0][0:2] diff --git a/conda-cpuinfo.patch b/conda-cpuinfo.patch index 3ba2119..88f1bee 100644 --- a/conda-cpuinfo.patch +++ b/conda-cpuinfo.patch @@ -11,3 +11,16 @@ index 74758d8..ccfb426 100644 return frozendict(get_cpu_info()) +diff --git a/tests/core/test_solve.py b/tests/core/test_solve.py +index ef322a0..0b062fa 100644 +--- a/tests/core/test_solve.py ++++ b/tests/core/test_solve.py +@@ -23,7 +23,7 @@ from conda.resolve import MatchSpec + from conda.testing.helpers import add_subdir_to_iter, get_solver, get_solver_2, get_solver_4, \ + get_solver_aggregate_1, get_solver_aggregate_2, get_solver_cuda, get_solver_must_unfreeze, \ + convert_to_dist_str, CHANNEL_DIR +-from conda._vendor.cpuinfo import get_cpu_info ++from cpuinfo import get_cpu_info + + + def test_solve_1(tmpdir): diff --git a/conda-mock.patch b/conda-mock.patch deleted file mode 100644 index 87b275f..0000000 --- a/conda-mock.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/tests/test_cli.py b/tests/test_cli.py -index eaa9b7e..dc8d027 100644 ---- a/tests/test_cli.py -+++ b/tests/test_cli.py -@@ -7,7 +7,7 @@ import unittest - import uuid - import os - import stat --from mock import patch -+from unittest.mock import patch - - import pytest - -diff -up conda-4.14.0/tests/cli/test_main_rename.py.mock conda-4.14.0/tests/cli/test_main_rename.py ---- conda-4.14.0/tests/cli/test_main_rename.py.mock 2022-08-03 15:00:36.000000000 -0600 -+++ conda-4.14.0/tests/cli/test_main_rename.py 2022-08-05 17:55:40.679594723 -0600 -@@ -4,7 +4,7 @@ - from __future__ import annotations - - import json --import mock -+from unittest import mock - import os.path - import pathlib - import tempfile diff --git a/conda.spec b/conda.spec index 846b72f..695ab31 100644 --- a/conda.spec +++ b/conda.spec @@ -1,21 +1,20 @@ %bcond_without tests Name: conda -Version: 4.14.0 +Version: 22.11.0 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 +# https://github.com/conda/conda/pull/12151 Patch1: conda_gateways_disk_create.patch # Do not test with conda-build Patch2: conda-conda-build.patch @@ -24,17 +23,11 @@ Patch3: conda-cpuinfo.patch # Fix tests on 32bit # https://github.com/conda/conda/pull/9759 Patch4: conda-32bit.patch -# Fix mock import -Patch5: conda-mock.patch -# Use new (0.15) ruamel-yaml API -Patch6: https://patch-diff.githubusercontent.com/raw/conda/conda/pull/11632.patch -Patch10001: 0001-Fix-toolz-imports.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 Patch10007: 0001-Add-back-conda-and-conda_env-entry-point.patch -Patch10008: 0002-Go-back-to-ruamel_yaml.patch BuildArch: noarch @@ -92,6 +85,7 @@ BuildRequires: python%{python3_pkgversion}-cytoolz >= 0.8.2 # For tests BuildRequires: python-unversioned-command BuildRequires: python%{python3_pkgversion}-boto3 +BuildRequires: python%{python3_pkgversion}-pytest-mock BuildRequires: python%{python3_pkgversion}-pytest-rerunfailures BuildRequires: python%{python3_pkgversion}-pytest-timeout BuildRequires: python%{python3_pkgversion}-pytest-xprocess @@ -103,10 +97,8 @@ Requires: %py3_reqs 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}-auxlib) = 0.0.43 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} @@ -130,14 +122,10 @@ rm -r conda/_vendor/cpuinfo # 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]* +rm -r conda/_vendor/toolz %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,tqdm} find conda -name \*.py | xargs sed -i -e 's/^\( *\)from .*_vendor\.\(\(distro\|frozendict\|tqdm\).*\) import/\1from \2 import/' @@ -201,23 +189,29 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} conda info # 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/conda_env/test_create.py::test_create_update_remote_env_file requires network access # tests/cli/test_main_{clean,rename}.py tests require network access +# tests/cli/test_main_notices.py::test_notices_appear_once_when_running_decorated_commands https://github.com/conda/conda/issues/12150 +# 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" \ - --ignore conda/auxlib/_vendor \ --deselect=tests/test_cli.py::TestJson::test_list \ --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_misc.py::test_explicit_missing_cache_entries \ + --deselect=tests/conda_env/test_create.py::test_create_update_remote_env_file \ --deselect=tests/cli/test_main_clean.py \ + --deselect=tests/cli/test_main_notices.py::test_notices_appear_once_when_running_decorated_commands \ --deselect=tests/cli/test_main_rename.py \ --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 \ + conda tests %endif %files diff --git a/conda_gateways_disk_create.patch b/conda_gateways_disk_create.patch index 713698f..3ba4cf3 100644 --- a/conda_gateways_disk_create.patch +++ b/conda_gateways_disk_create.patch @@ -1,22 +1,21 @@ -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 +diff -up conda-22.11.0/conda/gateways/disk/create.py.orig conda-22.11.0/conda/gateways/disk/create.py +--- conda-22.11.0/conda/gateways/disk/create.py.orig 2022-12-03 23:09:09.024907747 -0700 ++++ conda-22.11.0/conda/gateways/disk/create.py 2022-12-04 08:57:20.200192700 -0700 +@@ -23,7 +23,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 + from ...models.enums import LinkType -@@ -438,6 +438,9 @@ def create_package_cache_directory(pkgs_ +@@ -432,7 +432,7 @@ 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: +- except OSError as e: ++ except NotWritableError as e: if e.errno in (EACCES, EPERM, EROFS): log.trace("cannot create package cache directory '%s'", pkgs_dir) + return False diff --git a/conda_sys_prefix.patch b/conda_sys_prefix.patch index e2b0cdc..5bf76b7 100644 --- a/conda_sys_prefix.patch +++ b/conda_sys_prefix.patch @@ -1,13 +1,13 @@ diff --git a/conda/__init__.py b/conda/__init__.py -index 65040e6..c57a162 100644 +index 923ccde..2b64a72 100644 --- a/conda/__init__.py +++ b/conda/__init__.py -@@ -39,7 +39,7 @@ __summary__ = __doc__ +@@ -28,7 +28,7 @@ __summary__ = __doc__ __url__ = "https://github.com/conda/conda" - if os.getenv('CONDA_ROOT') is None: -- os.environ[str('CONDA_ROOT')] = sys.prefix -+ os.environ[str('CONDA_ROOT')] = '/usr/share/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__)) diff --git a/sources b/sources index 6d1d093..5b143d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (conda-4.13.0.tar.gz) = be2b5ea639332ac5bb1b7d92a9af854ccc657d1a64b1eb5c31c50f5d86b954e0d454db1746771a6549e6c7111f827bcd2e6f30e77fc3b0cd10e3c96e258a3abd +SHA512 (conda-22.11.0.tar.gz) = 520a716161f2c774fc8b4bb7043acfc4b2526583bfe8b595a1d18790142adf14864500956ab288b6c581d44d16a06671c73c28fabb84f68c146fd41e9224710d