...
 
Commits (2)
......@@ -19,7 +19,7 @@ Standards-Version: 4.1.3
Homepage: https://git.fmrib.ox.ac.uk/fsl/fslpy
X-Python3-Version: >= 3.2
Package: python3-fslpy
Package: python3-fsl
Architecture: all
Depends: python3-six,
python3-numpy, python3-scipy,
......@@ -28,14 +28,14 @@ Depends: python3-six,
python3-wxgtk4.0,
python3-rtree, ${python3:Depends}, ${misc:Depends}
Recommends: python3-trimesh
Suggests: python-fslpy-doc
Suggests: python-fsl-doc
Description: The FSL Python Library (Python 3)
The fslpy project is a FSL programming library written in Python. It is used
by FSLeyes.
.
This package installs the library for Python 3.
Package: python-fslpy-doc
Package: python-fsl-doc
Architecture: all
Section: doc
Depends: ${sphinxdoc:Depends}, ${misc:Depends}
......
......@@ -9,7 +9,7 @@ Signed-off-by: Mark Hymers <mark.hymers@ynic.york.ac.uk>
2 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/fsl/utils/platform.py b/fsl/utils/platform.py
index 04ffb98..38009e7 100644
index 04ffb98..4fb45d0 100644
--- a/fsl/utils/platform.py
+++ b/fsl/utils/platform.py
@@ -254,7 +254,7 @@ class Platform(notifier.Notifier):
......
From: Mark Hymers <mark.hymers@ynic.york.ac.uk>
Date: Fri, 26 Jul 2019 12:00:14 +0100
Subject: Fix six dependency
Signed-off-by: Mark Hymers <mark.hymers@ynic.york.ac.uk>
---
fslpy.egg-info/requires.txt | 2 +-
requirements.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fslpy.egg-info/requires.txt b/fslpy.egg-info/requires.txt
index ad2afa9..869583a 100644
--- a/fslpy.egg-info/requires.txt
+++ b/fslpy.egg-info/requires.txt
@@ -1,4 +1,4 @@
-six==1.*
+six
numpy==1.*
scipy>=0.18
nibabel>=2.3.1
diff --git a/requirements.txt b/requirements.txt
index ef041ad..9b35b88 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-six==1.*
+six
numpy==1.*
scipy>=0.18
nibabel>=2.3.1
0001-Deal-with-environment-not-being-passed-through.patch
0002-Set-default-FSLDIR-and-other-variables.patch
0003-Fix-six-dependency.patch
......@@ -5,7 +5,7 @@
XVFB_OPTS=--auto-servernum --server-num=20 -s "-screen 0 1024x768x24 -ac +extension GLX +render -noreset"
export PYBUILD_NAME=fslpy
export PYBUILD_NAME=fsl
export PYBUILD_TEST_PYTEST=1
export PYBUILD_TEST_ARGS=>/dev/null 2>&1; cd {build_dir}; FSLDIR=/usr/share/fsl-6.0 xvfb-run $(XVFB_OPTS) python{version} -m pytest -c ../../../setup.cfg ../../../tests/ -v
......