summaryrefslogtreecommitdiffstats
path: root/Wrappers/Python/conda-recipe
diff options
context:
space:
mode:
authorTomas Kulhanek <tomas.kulhanek@stfc.ac.uk>2019-01-28 13:23:52 +0000
committerGitHub <noreply@github.com>2019-01-28 13:23:52 +0000
commit73eab10a44572b117054c3cff2cc1f14c58fdfa7 (patch)
treefd9a560e080536b3afdab095bee5e962f3b41a49 /Wrappers/Python/conda-recipe
parent2739056cd99552cd740892992fa4d5c70b4839b0 (diff)
parent0d74c50c48ae518fedb44e5d04a148eaa02b485b (diff)
downloadregularization-73eab10a44572b117054c3cff2cc1f14c58fdfa7.tar.gz
regularization-73eab10a44572b117054c3cff2cc1f14c58fdfa7.tar.bz2
regularization-73eab10a44572b117054c3cff2cc1f14c58fdfa7.tar.xz
regularization-73eab10a44572b117054c3cff2cc1f14c58fdfa7.zip
Merge branch 'master' into master
Diffstat (limited to 'Wrappers/Python/conda-recipe')
-rw-r--r--Wrappers/Python/conda-recipe/meta.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml
index 9fe813d..9dd5544 100644
--- a/Wrappers/Python/conda-recipe/meta.yaml
+++ b/Wrappers/Python/conda-recipe/meta.yaml
@@ -12,7 +12,7 @@ test:
files:
- lena_gray_512.tif
requires:
- - pillow
+ - pillow=4.1.1
requirements:
build: