[python-fabio] 10/10: generate the dependencies via setup tools

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 985e4ffd9da3fa8aea368d48e65c39679cf2cc01
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Thu Sep 7 10:36:35 2017 +0200

    generate the dependencies via setup tools
    
    setup also the -dbg dependencices
---
 debian/changelog                                   |  3 ++
 debian/control                                     | 36 ++++++++++++----------
 .../0002-fix-the-install_requires-depends.patch    | 29 +++++++++++++++++
 debian/patches/series                              |  1 +
 debian/py3dist-overrides                           |  1 +
 debian/pydist-overrides                            |  1 +
 6 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 216100f..b5a3935 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ python-fabio (0.5.0+dfsg-1) UNRELEASED; urgency=medium
   * d/copyright
     - updated the Files-excludes for 0.5.0
     - Setting up and using cme upgrade dpkg-copyright
+  * d/patch
+    - Added 0001-do-not-touch-PYTHONPATH.patch
+    - Added 0002-fix-the-install_requires-depends.patch
   * d/rules
     - Used xvfb to generate the manpages
 
diff --git a/debian/control b/debian/control
index 0a498c0..4d3e080 100644
--- a/debian/control
+++ b/debian/control
@@ -77,9 +77,8 @@ Description: Viewer for images produced by 2D X-ray detector
 Package: python-fabio
 Architecture: any
 Section: python
-Depends: python-six, ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
-Recommends: fabio-viewer, python-imaging, python-lxml, python-matplotlib
-Suggests: pyfai, python-fabio-doc
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
+Suggests: python-fabio-doc
 Description: I/O library for images produced by 2D X-ray detector - Python2
  FabIO is an I/O library for images produced by 2D X-ray detectors and
  written in Python. FabIO support images detectors from a dozen of
@@ -93,14 +92,17 @@ Description: I/O library for images produced by 2D X-ray detector - Python2
 Package: python-fabio-dbg
 Architecture: any
 Section: debug
-Depends: python-fabio (= ${binary:Version}),
+Depends: python-dbg,
+         python-fabio (= ${binary:Version}),
+         python-h5py-dbg,
+         python-lxml-dbg,
+         python-matplotlib-dbg,
+         python-numpy-dbg,
+         python-pil-dbg,
+         python-qt4-dbg,
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends}
-Recommends: python-dbg,
-            python-imaging-dbg,
-            python-lxml-dbg,
-            python-matplotlib-dbg
 Description: I/O library for images produced by 2D X-ray detector - Python2 debug
  FabIO is an I/O library for images produced by 2D X-ray detectors and
  written in Python. FabIO support images detectors from a dozen of
@@ -115,9 +117,8 @@ Description: I/O library for images produced by 2D X-ray detector - Python2 debu
 Package: python3-fabio
 Architecture: any
 Section: python
-Depends: python3-six, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
-Recommends: python3-lxml, python3-matplotlib, python3-pil
-Suggests: pyfai, python-fabio-doc
+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
+Suggests: python-fabio-doc
 Description: I/O library for images produced by 2D X-ray detector - Python3
  FabIO is an I/O library for images produced by 2D X-ray detectors and
  written in Python. FabIO support images detectors from a dozen of
@@ -131,14 +132,17 @@ Description: I/O library for images produced by 2D X-ray detector - Python3
 Package: python3-fabio-dbg
 Architecture: any
 Section: debug
-Depends: python3-fabio (= ${binary:Version}),
+Depends: python-qt4-dbg,
+         python3-dbg,
+         python3-fabio (= ${binary:Version}),
+         python3-h5py-dbg,
+         python3-lxml-dbg,
+         python3-matplotlib-dbg,
+         python3-numpy-dbg,
+         python3-pil-dbg,
          ${misc:Depends},
          ${python3:Depends},
          ${shlibs:Depends}
-Recommends: python3-dbg,
-            python3-lxml-dbg,
-            python3-matplotlib-dbg,
-            python3-pil-dbg
 Description: I/O library for images produced by 2D X-ray detector - Python3 debug
  FabIO is an I/O library for images produced by 2D X-ray detectors and
  written in Python. FabIO support images detectors from a dozen of
diff --git a/debian/patches/0002-fix-the-install_requires-depends.patch b/debian/patches/0002-fix-the-install_requires-depends.patch
new file mode 100644
index 0000000..7e2c665
--- /dev/null
+++ b/debian/patches/0002-fix-the-install_requires-depends.patch
@@ -0,0 +1,29 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
+ <picca at synchrotron-soleil.fr>
+Date: Thu, 7 Sep 2017 14:33:43 +0200
+Subject: fix the install_requires depends
+
+---
+ setup.py | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 86decc7..6db4d12 100644
+--- a/setup.py
++++ b/setup.py
+@@ -610,7 +610,14 @@ classifiers = [
+ 
+ def get_project_configuration(dry_run):
+     """Returns project arguments for setup"""
+-    install_requires = ["numpy"]
++    install_requires = [ "h5py",
++                         "lxml",
++                         "matplotlib",
++                         "numpy",
++                         "pil",
++                         "PyQt4",
++                         "six"
++    ]
+     setup_requires = ["numpy", "cython"]
+ 
+     console_scripts = [
diff --git a/debian/patches/series b/debian/patches/series
index c139b64..1987bdc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-do-not-touch-PYTHONPATH.patch
+0002-fix-the-install_requires-depends.patch
diff --git a/debian/py3dist-overrides b/debian/py3dist-overrides
new file mode 100644
index 0000000..fb5ef13
--- /dev/null
+++ b/debian/py3dist-overrides
@@ -0,0 +1 @@
+pyqt4 python3-pyqt4
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
new file mode 100644
index 0000000..9ece151
--- /dev/null
+++ b/debian/pydist-overrides
@@ -0,0 +1 @@
+pyqt4 python-qt4

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