Merge branch 'menpo' into 'master'

Relax pinning in menpo

Closes #60

See merge request bob/bob.conda!374

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') }}
@@ -42,7 +42,7 @@ requirements:
 
     # Scientific Python Stack
     - scipy
-    - pillow >=3.0,<5.0
+    - pillow >=3.0
 
     # Features
     - cyvlfeat >=0.4.3,<0.5

conda/menpo/relax-pins.patch

 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')