summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdoardo Pasca <edo.paskino@gmail.com>2019-05-07 11:18:01 +0100
committerEdoardo Pasca <edo.paskino@gmail.com>2019-05-07 11:18:01 +0100
commit1f9fd41ce81432d65c2c729eaae75a5e2d6ab50b (patch)
tree0d0c84b441a6b5d8f2ba7a254b7d1226457a9b81
parent6a8e5a212679dea33e767a2f30bac4e88bce21fe (diff)
parenta2b747b9cc0ad6597e72b7e9e5ebf00fdfca1f8f (diff)
downloadframework-1f9fd41ce81432d65c2c729eaae75a5e2d6ab50b.tar.gz
framework-1f9fd41ce81432d65c2c729eaae75a5e2d6ab50b.tar.bz2
framework-1f9fd41ce81432d65c2c729eaae75a5e2d6ab50b.tar.xz
framework-1f9fd41ce81432d65c2c729eaae75a5e2d6ab50b.zip
Merge branch 'demo_ccpi' of https://github.com/vais-ral/CCPi-Framework into demo_ccpi
-rw-r--r--Wrappers/Python/conda-recipe/conda_build_config.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/Wrappers/Python/conda-recipe/conda_build_config.yaml b/Wrappers/Python/conda-recipe/conda_build_config.yaml
index 30c8e9d..393ae18 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.11
- 1.12
- - 1.15