From bba2b1b3fa42f85ca641ff7a39a17f29288c1286 Mon Sep 17 00:00:00 2001 From: Marianne Corvellec Date: Fri, 28 Jun 2013 12:35:50 -0400 Subject: [PATCH 1/3] Documented another easy way to build scikit-image for virtualenv users. --- DEPENDS.txt | 5 +++++ requirements.txt | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 requirements.txt diff --git a/DEPENDS.txt b/DEPENDS.txt index b2858256..e9e9025a 100644 --- a/DEPENDS.txt +++ b/DEPENDS.txt @@ -7,6 +7,11 @@ Build Requirements `Matplotlib >= 1.0 `__ is needed to generate the examples in the documentation. +If you like to use pip in a virtualenv, you can do the following to build the +development version of scikit-image: +$ pip install -r requirements.txt +$ python setup.py install + Runtime requirements -------------------- * `SciPy >= 0.10 `__ diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..f291f1a5 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +cython>=0.15 +matplotlib>=1.0 +numpy>=1.6 From edee15054b415d82fba498ef76646779679e528b Mon Sep 17 00:00:00 2001 From: Marianne Corvellec Date: Fri, 28 Jun 2013 16:50:43 -0400 Subject: [PATCH 2/3] Edited after Stefan's comments. --- DEPENDS.txt | 6 ++---- requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/DEPENDS.txt b/DEPENDS.txt index e9e9025a..1f6fb735 100644 --- a/DEPENDS.txt +++ b/DEPENDS.txt @@ -2,15 +2,13 @@ Build Requirements ------------------ * `Python >= 2.5 `__ * `Numpy >= 1.6 `__ -* `Cython >= 0.15 `__ +* `Cython >= 0.17 `__ `Matplotlib >= 1.0 `__ is needed to generate the examples in the documentation. -If you like to use pip in a virtualenv, you can do the following to build the -development version of scikit-image: +You can use pip to automatically install the base dependencies as follows: $ pip install -r requirements.txt -$ python setup.py install Runtime requirements -------------------- diff --git a/requirements.txt b/requirements.txt index f291f1a5..4a4aaa53 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -cython>=0.15 +cython>=0.17 matplotlib>=1.0 numpy>=1.6 diff --git a/setup.py b/setup.py index d62a0d86..93460509 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ VERSION = '0.9dev' PYTHON_VERSION = (2, 5) DEPENDENCIES = { 'numpy': (1, 6), - 'Cython': (0, 15), + 'Cython': (0, 17), } From 0baffad640ad9794ea2bf388862db5a72506a5dc Mon Sep 17 00:00:00 2001 From: Marianne Corvellec Date: Fri, 28 Jun 2013 19:10:55 -0400 Subject: [PATCH 3/3] Okay, I think I got the rst syntax this time... --- DEPENDS.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/DEPENDS.txt b/DEPENDS.txt index 1f6fb735..9c7302f1 100644 --- a/DEPENDS.txt +++ b/DEPENDS.txt @@ -7,8 +7,9 @@ Build Requirements `Matplotlib >= 1.0 `__ is needed to generate the examples in the documentation. -You can use pip to automatically install the base dependencies as follows: -$ pip install -r requirements.txt +You can use pip to automatically install the base dependencies as follows:: + + $ pip install -r requirements.txt Runtime requirements --------------------