commit 013faf85bb376f031f438ad6d9584be0254a76d2
Author: rpm-build <rpm-build>
Date:   Sat Mar 30 20:53:32 2019 -0600

    [PATCH] Fix toolz imports
    
    conda._vendor.toolz.__init__.py now does the dispatch to either
    the real thing or the vendored copy. But the package structure is
    flattened, so the subpackage names should not be used. Without that,
    the vendored copy was always imported.

diff --git a/conda_env/env.py b/conda_env/env.py
index b8129b1..7670b90 100644
--- a/conda_env/env.py
+++ b/conda_env/env.py
@@ -14,15 +14,10 @@ from conda.core.prefix_data import PrefixData
 from conda.models.enums import PackageType
 from conda.models.match_spec import MatchSpec
 from conda.models.prefix_graph import PrefixGraph
+from conda._vendor.toolz import concatv, groupby
 from conda_env.yaml import dump
 from . import compat, exceptions, yaml
 
-try:
-    from cytoolz.itertoolz import concatv, groupby
-except ImportError:  # pragma: no cover
-    from conda._vendor.toolz.itertoolz import concatv, groupby  # NOQA
-
-
 VALID_KEYS = ('name', 'dependencies', 'prefix', 'channels')
 
 
diff --git a/tests/base/test_context.py b/tests/base/test_context.py
index a0b7660..d54df02 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 0c726c9..c3ba3c4 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 980edd3..9ed4872 100644
--- a/tests/test_activate.py
+++ b/tests/test_activate.py
@@ -14,7 +14,7 @@ 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, main as activate_main, native_path_to_unix
 from conda.base.constants import ROOT_ENV_NAME
diff --git a/tests/test_create.py b/tests/test_create.py
index 8428fd2..b5b62f6 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