From 2a8b688e64f37b9ae9778eb744445b49614239eb Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Tue, 10 Apr 2018 10:33:50 +0200
Subject: [PATCH] Closes #55
---
conda/menpo/meta.yaml | 4 +++-
conda/menpo/no-scipy-pin.patch | 13 +++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 conda/menpo/no-scipy-pin.patch
diff --git a/conda/menpo/meta.yaml b/conda/menpo/meta.yaml
index 24fd581a..b787f74e 100644
--- a/conda/menpo/meta.yaml
+++ b/conda/menpo/meta.yaml
@@ -11,13 +11,15 @@ source:
url: https://github.com/menpo/menpo/archive/v{{ version }}.tar.gz
sha256: {{ sha256 }}
patches:
+ # removes the pinning for scipy<1
+ - no-scipy-pin.patch
# removes the pinning for matplotlib<2
- no-matplotlib-pin.patch
# relaxes the pathlib pinning for python 2.x
- relax-pathlib-pin.patch
build:
- number: 3
+ number: 4
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/no-scipy-pin.patch b/conda/menpo/no-scipy-pin.patch
new file mode 100644
index 00000000..fa6fd705
--- /dev/null
+++ b/conda/menpo/no-scipy-pin.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index dc348290..6b4145d6 100644
+--- a/setup.py
++++ b/setup.py
+@@ -100,7 +100,7 @@ cython_exts = cythonize(cython_modules, quiet=True)
+
+ # Please see conda/meta.yaml for other binary dependencies
+ install_requires = ['numpy>=1.10,<2.0',
+- 'scipy>=0.16,<1.0',
++ 'scipy>=0.16',
+ 'matplotlib>=1.4,<3.0',
+ 'pillow>=3.0,<5.0']
+
--
GitLab