From ba6c5455f4095dcd8a3a2262aa253fac9bb9ba09 Mon Sep 17 00:00:00 2001 From: Edoardo Pasca Date: Sat, 20 Jan 2018 22:41:24 +0000 Subject: work for conda recipes --- Wrappers/Python/conda-recipe/bld.bat | 4 ++-- Wrappers/Python/conda-recipe/meta.yaml | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) (limited to 'Wrappers/Python/conda-recipe') diff --git a/Wrappers/Python/conda-recipe/bld.bat b/Wrappers/Python/conda-recipe/bld.bat index 69491de..fe3ddae 100644 --- a/Wrappers/Python/conda-recipe/bld.bat +++ b/Wrappers/Python/conda-recipe/bld.bat @@ -4,8 +4,8 @@ exit 1 ) mkdir "%SRC_DIR%\ccpi" -xcopy /e "%RECIPE_DIR%\..\.." "%SRC_DIR%\ccpi" - +ROBOCOPY /E "%RECIPE_DIR%\..\.." "%SRC_DIR%\ccpi" +ROBOCOPY /E "%RECIPE_DIR%\..\..\..\Core" "%SRC_DIR%\Core" cd %SRC_DIR%\ccpi\Python %PYTHON% setup.py build_ext diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml index 7068e9d..c451b37 100644 --- a/Wrappers/Python/conda-recipe/meta.yaml +++ b/Wrappers/Python/conda-recipe/meta.yaml @@ -1,5 +1,5 @@ package: - name: ccpi-regularizers + name: ccpi-regularizer version: {{ environ['CIL_VERSION'] }} @@ -11,17 +11,25 @@ build: requirements: build: - - python + - python ==2.7 # [py27] + - python ==3.5 # [py35] - numpy - setuptools - - boost ==1.64 - - boost-cpp ==1.64 + - boost ==1.64.0 + - boost-cpp ==1.64.0 - cython + - cil_regularizer + - vc 14 # [win and py35] + - vc 9 # [win and py27] run: - - python + - python ==2.7 # [py27] + - python ==3.5 # [py35] - numpy - boost ==1.64 + - cil_regularizer + - vc 14 # [win and py35] + - vc 9 # [win and py27] about: -- cgit v1.2.3