From 4daffa424d455b50534ccf242f9f00fe0191b457 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Sat, 7 Jul 2018 15:39:42 -0500 Subject: [PATCH 1/4] cb3 --- conda.recipe/meta.yaml | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 86bed996c8aab..6009ab235ba48 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -12,19 +12,38 @@ source: requirements: build: + - {{ compiler('c') }} + - {{ compiler('cxx') }} + host: - python + - pip - cython - - numpy 1.11.* + - numpy - setuptools >=3.3 - python-dateutil >=2.5.0 - pytz - run: - python - - numpy >=1.11.* + - {{ pin_compatible('numpy') }} - python-dateutil >=2.5.0 - pytz +outputs: + - name: pandas + type: conda + - type: wheel + build: + activate_in_script: true + requirements: + build: + - python + - pip + - cython + - numpy + - setuptools >=3.3 + - python-dateutil >=2.5.0 + - pytz + test: imports: - pandas From 5b7ef4af35b017f15f60e29d8ca288fc3b34b32d Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Sat, 7 Jul 2018 16:02:22 -0500 Subject: [PATCH 2/4] remove outputs --- conda.recipe/meta.yaml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 6009ab235ba48..c1aff3d93411b 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -28,22 +28,6 @@ requirements: - python-dateutil >=2.5.0 - pytz -outputs: - - name: pandas - type: conda - - type: wheel - build: - activate_in_script: true - requirements: - build: - - python - - pip - - cython - - numpy - - setuptools >=3.3 - - python-dateutil >=2.5.0 - - pytz - test: imports: - pandas From d510c0fd935a32765a7c865f4d5afa2ab5f80be7 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Sat, 7 Jul 2018 16:05:07 -0500 Subject: [PATCH 3/4] overrideable python --- conda.recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index c1aff3d93411b..6ceff95e690c0 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -23,7 +23,8 @@ requirements: - python-dateutil >=2.5.0 - pytz run: - - python + - python {{ python }} + - {{ pin_compatible('numpy') }} - {{ pin_compatible('numpy') }} - python-dateutil >=2.5.0 - pytz From 8ea8b73afab7f264496421e13c1f100d6e70640b Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Sat, 7 Jul 2018 16:05:44 -0500 Subject: [PATCH 4/4] fixup --- conda.recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 6ceff95e690c0..2bc42c1bd2dec 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -25,7 +25,6 @@ requirements: run: - python {{ python }} - {{ pin_compatible('numpy') }} - - {{ pin_compatible('numpy') }} - python-dateutil >=2.5.0 - pytz