From d6d63f9f10f8eccee1a4cacf76d9d2de1ea93377 Mon Sep 17 00:00:00 2001
From: vagrant <vagrant@localhost.localdomain>
Date: Wed, 6 Mar 2019 11:16:25 -0500
Subject: conda recipe conditional for testing

---
 Wrappers/Python/conda-recipe/conda_build_config.yaml | 2 +-
 Wrappers/Python/conda-recipe/meta.yaml               | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'Wrappers')

diff --git a/Wrappers/Python/conda-recipe/conda_build_config.yaml b/Wrappers/Python/conda-recipe/conda_build_config.yaml
index 96a211f..30c8e9d 100644
--- a/Wrappers/Python/conda-recipe/conda_build_config.yaml
+++ b/Wrappers/Python/conda-recipe/conda_build_config.yaml
@@ -4,5 +4,5 @@ python:
   - 3.6
 numpy:
   # TODO investigage, as it doesn't currently build with cvxp, requires >1.14
-  #- 1.12
+  - 1.12
   - 1.15
diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml
index 8ded429..dd3238e 100644
--- a/Wrappers/Python/conda-recipe/meta.yaml
+++ b/Wrappers/Python/conda-recipe/meta.yaml
@@ -11,7 +11,7 @@ build:
 test:
   requires:
     - python-wget
-    - cvxpy # [not win]
+    - cvxpy # [ unix and py36 and np115 ]
 
   source_files:
     - ./test # [win]
@@ -24,8 +24,9 @@ test:
     
 requirements:
   build:
+    - {{ pin_compatible('numpy', max_pin='x.x') }}
     - python
-    - numpy {{ numpy }}
+    - numpy
     - setuptools
 
   run:
@@ -33,7 +34,7 @@ requirements:
     - python
     - numpy
     - scipy
-    - matplotlib
+    #- matplotlib
     - h5py
   
 about:
-- 
cgit v1.2.3