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