[python-fabio] 08/10: fix buildMan target

Frédéric-Emmanuel Picca picca at moszumanska.debian.org
Mon Sep 11 12:38:46 UTC 2017


This is an automated email from the git hooks/post-receive script.

picca pushed a commit to branch master
in repository python-fabio.

commit b7332b6eccf4252aaee8a7d2d250a969bfac5dd4
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Wed Sep 6 15:14:27 2017 +0200

    fix buildMan target
---
 debian/changelog                                  |  2 ++
 debian/control                                    |  8 ++++++++
 debian/patches/0001-do-not-touch-PYTHONPATH.patch | 22 ++++++++++++++++++++++
 debian/patches/series                             |  1 +
 debian/rules                                      |  4 ++++
 5 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5a7f565..216100f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ python-fabio (0.5.0+dfsg-1) UNRELEASED; urgency=medium
     - wrap-and-sort
     - Build-Depends
       + Added help2man,
+        python[3]-h5py[-dbg],
+        python[3]-matplotlib[-dbg],
         python-pil[-dbg],
         python-qt4|dbg], python3-pyqt4[-dbg],
         xauth, xvfb
diff --git a/debian/control b/debian/control
index 4d94ce5..0a498c0 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,12 @@ Build-Depends: cython,
                help2man,
                python-all-dbg,
                python-all-dev,
+               python-h5py,
+               python-h5py-dbg,
                python-lxml,
                python-lxml-dbg,
+               python-matplotlib,
+               python-matplotlib-dbg,
                python-numpy,
                python-numpy-dbg,
                python-pil,
@@ -27,8 +31,12 @@ Build-Depends: cython,
                python-sphinxcontrib.programoutput,
                python3-all-dbg,
                python3-all-dev,
+               python3-h5py,
+               python3-h5py-dbg,
                python3-lxml,
                python3-lxml-dbg,
+               python3-matplotlib,
+               python3-matplotlib-dbg,
                python3-numpy,
                python3-numpy-dbg,
                python3-pil,
diff --git a/debian/patches/0001-do-not-touch-PYTHONPATH.patch b/debian/patches/0001-do-not-touch-PYTHONPATH.patch
new file mode 100644
index 0000000..3585f89
--- /dev/null
+++ b/debian/patches/0001-do-not-touch-PYTHONPATH.patch
@@ -0,0 +1,22 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
+ <picca at synchrotron-soleil.fr>
+Date: Wed, 6 Sep 2017 15:14:10 +0200
+Subject: do not touch PYTHONPATH
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 34fc837..86decc7 100644
+--- a/setup.py
++++ b/setup.py
+@@ -176,7 +176,7 @@ class BuildMan(Command):
+         path.insert(0, os.path.abspath(build.build_lib))
+ 
+         env = dict((str(k), str(v)) for k, v in os.environ.items())
+-        env["PYTHONPATH"] = os.pathsep.join(path)
++        #env["PYTHONPATH"] = os.pathsep.join(path)
+ 
+         import subprocess
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c139b64
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-do-not-touch-PYTHONPATH.patch
diff --git a/debian/rules b/debian/rules
index ec02fdf..35bf71e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,10 @@ override_dh_clean:
 
 override_dh_auto_build:
 	dh_auto_build
+#	PYBUILD_SYSTEM=custom \
+	PYBUILD_BUILD_ARGS="PYTHONPATH={build_dir} cd {build_dir} && xvfb-run -a --server-args=\"-screen 0 1024x768x24\" {interpreter} -m fabio.app.convert --help" dh_auto_build
+#	PYBUILD_SYSTEM=custom \
+	PYBUILD_BUILD_ARGS="PYTHONPATH={build_dir} cd {build_dir} && xvfb-run -a --server-args=\"-screen 0 1024x768x24\" {interpreter} -m fabio.app.viewer --help" dh_auto_build
 	PYBUILD_SYSTEM=custom \
 	PYBUILD_BUILD_ARGS="PYTHONPATH={build_dir} xvfb-run -a --server-args=\"-screen 0 1024x768x24\" {interpreter} setup.py build_man" dh_auto_build
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-fabio.git



More information about the debian-science-commits mailing list