fix conda#6837 require at least futures 3.0.0 and avoid passing gener…

…ator expressions to as_completed
mbargull · Feb 8, 2018 · 2fee9a1 · 2fee9a1
1 parent fcc2996
commit 2fee9a1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -33,7 +33,7 @@ requirements:
     - python
     - conda-env >=2.6
     - enum34               [py<34]
-    - futures              [py<34]
+    - futures >=3.0.0      [py<34]
     - menuinst             [win]
     - pycosat >=0.6.3
     - pyopenssl >=16.2.0

diff --git a/conda/core/index.py b/conda/core/index.py
@@ -182,7 +182,7 @@ def get_reduced_index(prefix, channels, subdirs, specs):
         pending_track_features = set()
 
         def query_all(spec):
-            futures = (executor.submit(sd.query, spec) for sd in subdir_datas)
+            futures = tuple(executor.submit(sd.query, spec) for sd in subdir_datas)
             return tuple(concat(future.result() for future in as_completed(futures)))
 
         def push_spec(spec):

diff --git a/conda/core/repodata.py b/conda/core/repodata.py
@@ -80,7 +80,7 @@ def query_all(channels, subdirs, package_ref_or_match_spec):
         channel_urls = all_channel_urls(channels, subdirs=subdirs)
         check_whitelist(channel_urls)
         with ThreadLimitedThreadPoolExecutor() as executor:
-            futures = (executor.submit(
+            futures = tuple(executor.submit(
                 SubdirData(Channel(url)).query, package_ref_or_match_spec
             ) for url in channel_urls)
             return tuple(concat(future.result() for future in as_completed(futures)))