From 258c7807ca5cf1c9401ad6d8951378f86629b996 Mon Sep 17 00:00:00 2001 From: Kale Franz Date: Mon, 3 Sep 2018 01:40:38 -0500 Subject: [PATCH] put meta.yaml back; it used to work Signed-off-by: Kale Franz --- conda.recipe/meta.yaml | 19 +++++++++++++------ conda/activate.py | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 0b3829f6b5e..13c5d14fdb9 100644 --- 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 index 3b37e84072d..72160d7abc7 100644 --- 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