Sophie

Sophie

distrib > Mageia > 8 > i586 > by-pkgid > 54f63d93c6b6a1cf1ac85b9aacc21d75 > files > 1

conda-4.9.2-1.mga8.src.rpm

diff -up conda-4.8.4/conda_env/env.py.toolz conda-4.8.4/conda_env/env.py
--- conda-4.8.4/conda_env/env.py.toolz	2020-08-06 15:02:52.000000000 -0600
+++ conda-4.8.4/conda_env/env.py	2020-08-07 19:15:32.665971754 -0600
@@ -22,10 +22,7 @@ from conda.models.prefix_graph import Pr
 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 -up conda-4.8.4/tests/test_activate.py.toolz conda-4.8.4/tests/test_activate.py
--- conda-4.8.4/tests/test_activate.py.toolz	2020-08-06 15:02:52.000000000 -0600
+++ conda-4.8.4/tests/test_activate.py	2020-08-07 19:14:33.242033514 -0600
@@ -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 -up conda-4.8.4/conda/plan.py.toolz conda-4.8.4/conda/plan.py
--- conda-4.8.4/conda/plan.py.toolz	2020-08-07 19:18:38.055645342 -0600
+++ conda-4.8.4/conda/plan.py	2020-08-07 19:19:35.437559525 -0600
@@ -371,7 +371,7 @@ def _plan_from_actions(actions, index):
 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 -up conda-4.8.4/tests/base/test_context.py.toolz conda-4.8.4/tests/base/test_context.py
--- conda-4.8.4/tests/base/test_context.py.toolz	2020-08-06 15:02:52.000000000 -0600
+++ conda-4.8.4/tests/base/test_context.py	2020-08-07 19:19:51.541567204 -0600
@@ -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 -up conda-4.8.4/tests/core/test_path_actions.py.toolz conda-4.8.4/tests/core/test_path_actions.py
--- conda-4.8.4/tests/core/test_path_actions.py.toolz	2020-08-06 15:02:52.000000000 -0600
+++ conda-4.8.4/tests/core/test_path_actions.py	2020-08-07 19:20:13.387588336 -0600
@@ -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 -up conda-4.8.4/tests/test_create.py.toolz conda-4.8.4/tests/test_create.py
--- conda-4.8.4/tests/test_create.py.toolz	2020-08-06 15:02:52.000000000 -0600
+++ conda-4.8.4/tests/test_create.py	2020-08-07 19:20:05.486574208 -0600
@@ -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