diff options
| author | Daniil Kazantsev <dkazanc@hotmail.com> | 2019-02-23 21:49:04 +0000 |
|---|---|---|
| committer | Daniil Kazantsev <dkazanc@hotmail.com> | 2019-02-23 21:49:04 +0000 |
| commit | 606d503f828777b11df4e959d6a5b25b4a86e0c7 (patch) | |
| tree | 853f893eaec899179928e57be08b4f431303330d | |
| parent | 5a2fd376130ea2c7c4ac1704bc9d2f087522855d (diff) | |
| download | regularization-606d503f828777b11df4e959d6a5b25b4a86e0c7.tar.gz regularization-606d503f828777b11df4e959d6a5b25b4a86e0c7.tar.bz2 regularization-606d503f828777b11df4e959d6a5b25b4a86e0c7.tar.xz regularization-606d503f828777b11df4e959d6a5b25b4a86e0c7.zip | |
supp created, pillow dependency corrected in yaml
| -rw-r--r-- | Readme.md | 2 | ||||
| -rw-r--r-- | recipe/meta.yaml | 3 | ||||
| -rw-r--r-- | src/Python/ccpi/supp/__init__.py (renamed from Wrappers/Python/ccpi/supp/__init__.py) | 0 | ||||
| -rw-r--r-- | src/Python/ccpi/supp/qualitymetrics.py (renamed from Wrappers/Python/ccpi/supp/qualitymetrics.py) | 0 |
4 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: diff --git a/Wrappers/Python/ccpi/supp/__init__.py b/src/Python/ccpi/supp/__init__.py index e69de29..e69de29 100644 --- a/Wrappers/Python/ccpi/supp/__init__.py +++ b/src/Python/ccpi/supp/__init__.py diff --git a/Wrappers/Python/ccpi/supp/qualitymetrics.py b/src/Python/ccpi/supp/qualitymetrics.py index f44d832..f44d832 100644 --- a/Wrappers/Python/ccpi/supp/qualitymetrics.py +++ b/src/Python/ccpi/supp/qualitymetrics.py |