diff options
| author | Tomas Kulhanek <tomas.kulhanek@stfc.ac.uk> | 2019-02-25 03:59:26 -0500 |
|---|---|---|
| committer | Tomas Kulhanek <tomas.kulhanek@stfc.ac.uk> | 2019-02-25 03:59:26 -0500 |
| commit | dd9bf72ee8c7f810e9e6442105790c8950800dae (patch) | |
| tree | 042b203d34d72bc00632f9fce06f61496a984ee8 | |
| parent | fc941e0941facb9437dab667ba3350db071769da (diff) | |
| parent | 606d503f828777b11df4e959d6a5b25b4a86e0c7 (diff) | |
| download | regularization-dd9bf72ee8c7f810e9e6442105790c8950800dae.tar.gz regularization-dd9bf72ee8c7f810e9e6442105790c8950800dae.tar.bz2 regularization-dd9bf72ee8c7f810e9e6442105790c8950800dae.tar.xz regularization-dd9bf72ee8c7f810e9e6442105790c8950800dae.zip | |
Merge remote-tracking branch 'origin/newdirstructure' into newdirstructure
| -rw-r--r-- | Readme.md | 2 | ||||
| -rw-r--r-- | recipe/meta.yaml | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -110,7 +110,7 @@ conda install ccpi-regulariser -c ccpi -c conda-forge #### Python (conda-build) ``` export CIL_VERSION=19.02 - conda build Wrappers/Python/conda-recipe --numpy 1.12 --python 3.5 + conda build recipe/ --numpy 1.12 --python 3.5 conda install ccpi-regulariser=${CIL_VERSION} --use-local --force cd demos/ python demo_cpu_regularisers.py # to run CPU demo diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 61d17bd..527ad32 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,8 @@ test: files: - ../test/lena_gray_512.tif requires: - - pillow=4.1.1 + - pillow + - pillow=4.1.1 # [win] requirements: build: |