Skip to content
Snippets Groups Projects
Commit 82ec807c authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Merge branch 'issue-55' into 'master'

Closes #55

Closes #55

See merge request bob/bob.conda!353
parents b68d46a9 18f7bdaa
Branches
Tags
1 merge request!353Closes #55
Pipeline #
package: package:
name: bob-devel name: bob-devel
version: 2018.04.11 version: 2018.04.12
build: build:
number: 0 number: 0
......
...@@ -11,13 +11,15 @@ source: ...@@ -11,13 +11,15 @@ source:
url: https://github.com/menpo/menpo/archive/v{{ version }}.tar.gz url: https://github.com/menpo/menpo/archive/v{{ version }}.tar.gz
sha256: {{ sha256 }} sha256: {{ sha256 }}
patches: patches:
# removes the pinning for scipy<1
- no-scipy-pin.patch
# removes the pinning for matplotlib<2 # removes the pinning for matplotlib<2
- no-matplotlib-pin.patch - no-matplotlib-pin.patch
# relaxes the pathlib pinning for python 2.x # relaxes the pathlib pinning for python 2.x
- relax-pathlib-pin.patch - relax-pathlib-pin.patch
build: build:
number: 3 number: 4
script: python setup.py install --single-version-externally-managed --record=record.txt script: python setup.py install --single-version-externally-managed --record=record.txt
run_exports: run_exports:
- {{ pin_subpackage(name, max_pin='x.x') }} - {{ pin_subpackage(name, max_pin='x.x') }}
......
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']
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment