put meta.yaml back; it used to work

Signed-off-by: Kale Franz <[email protected]>
MirkoPerrone · Sep 3, 2018 · 258c780 · 258c780
1 parent b756975
commit 258c780
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -20,20 +20,27 @@ build:
     - Scripts/deactivate        [win]
 
 requirements:
-  host:
+  build:
     - python
     - setuptools >=31.0.1
+    - enum34                [py<34]
+    - futures               [py<34]
+    - menuinst >=1.4.11,<2  [win]
+    - pycosat >=0.6.3
+    - pyopenssl >=16.2.0
+    - requests >=2.18.4,<3
+    - ruamel_yaml >=0.11.14,<0.16
   run:
     - python
-    - enum34               # [py<34]
-    - futures              # [py<34]
-    - menuinst >=1.4.11,<2 # [win]
+    - enum34                [py<34]
+    - futures >=3.0.0       [py<34]
+    - menuinst >=1.4.11,<2  [win]
     - pycosat >=0.6.3
     - pyopenssl >=16.2.0
-    - requests >=2.12.4,<3
+    - requests >=2.18.4,<3
     - ruamel_yaml >=0.11.14,<0.16
   run_constrained:
-    - conda-build >=2.1
+    - conda-build >=3
     - conda-env >=2.6
     - cytoolz >=0.8.1
     - setuptools >=31.0.1

diff --git a/conda/activate.py b/conda/activate.py
@@ -6,7 +6,7 @@
 from errno import ENOENT
 from glob import glob
 import os
-from os.path import abspath, basename, dirname, expanduser, expandvars, isdir, join, normcase
+from os.path import abspath, basename, dirname, expanduser, expandvars, isdir, join
 import re
 import sys
 from tempfile import NamedTemporaryFile