From 508b5df68c7cd0e5ce3cf6b57d8a627f85d860d7 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Fri, 24 Aug 2018 12:21:29 +0200
Subject: [PATCH] Relax pinning in menpo
---
conda/menpo/meta.yaml | 2 +-
conda/menpo/relax-pins.patch | 11 +++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/conda/menpo/meta.yaml b/conda/menpo/meta.yaml
index 51128b88..6078db27 100644
--- a/conda/menpo/meta.yaml
+++ b/conda/menpo/meta.yaml
@@ -17,7 +17,7 @@ source:
- relax-pins.patch
build:
- number: 5
+ number: 6
script: python setup.py install --single-version-externally-managed --record=record.txt
run_exports:
- {{ pin_subpackage(name, max_pin='x.x') }}
diff --git a/conda/menpo/relax-pins.patch b/conda/menpo/relax-pins.patch
index 1501f6b9..b19407b6 100644
--- a/conda/menpo/relax-pins.patch
+++ b/conda/menpo/relax-pins.patch
@@ -1,16 +1,19 @@
diff --git a/setup.py b/setup.py
-index 17cae557..6c7b17ff 100644
+index 17cae557..995d375d 100644
--- a/setup.py
+++ b/setup.py
-@@ -90,12 +90,12 @@ cython_exts = cythonize(cython_modules, quiet=True)
+@@ -89,13 +89,13 @@ cython_exts = cythonize(cython_modules, quiet=True)
+
# Please see conda/meta.yaml for other binary dependencies
- install_requires = ['numpy>=1.10,<2.0',
+-install_requires = ['numpy>=1.10,<2.0',
- 'scipy>=0.16,<1.0',
- 'matplotlib>=1.4,<2.0',
+- 'pillow>=3.0,<5.0']
++install_requires = ['numpy>=1.10',
+ 'scipy>=0.16',
+ 'matplotlib>=1.4',
- 'pillow>=3.0,<5.0']
++ 'pillow>=3.0']
if sys.version_info.major == 2:
- install_requires.append('pathlib==1.0')
--
GitLab