[pyfai] 03/03: generate the dependencies via setuptools
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Mon Sep 4 14:26:20 UTC 2017
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository pyfai.
commit 51cacda86b5c3b73e3b9880cc9cbdfff543f4b16
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Mon Sep 4 14:29:53 2017 +0200
generate the dependencies via setuptools
---
debian/changelog | 5 ++
debian/control | 67 +++++++++-------------
.../patches/0005-fix-the-setup-dependencies.patch | 42 ++++++++++++++
debian/patches/series | 1 +
debian/py3dist-overrides | 1 +
debian/pydist-overrides | 1 +
6 files changed, 76 insertions(+), 41 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cf24c7b..4012d32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,11 @@ pyfai (0.14.0+dfsg-1) UNRELEASED; urgency=medium
- Bump Standrad-Version 4.0.1 (extra -> optional)
- Build-Depends
+ Fixed with cme
+ + Removed python[3]-pil[-dbg]
+ + Removed python[3]-lxml[-dbg]
+ Added python[3]-numexpr[-dbg]
+ + Added python[3]-pymca5[-dbg]
+ + Added python[3]-pyopencl[-dbg]
+ Added help2man in order to generate the manpages.
+ Added xauth, xvfb
* debian/patches
@@ -17,6 +21,7 @@ pyfai (0.14.0+dfsg-1) UNRELEASED; urgency=medium
- 0003-remove-a-wrong-PYTHONPATH-modification.patch (Added)
- 0003-use-the-system-mathjax.patch (Added)
- 0004-unactivated-a-bunch-of-failling-tests.patch (Added)
+ - 0005-fix-the-setup-dependencies.patch (Added)
* Debian/rules
- Run tests with xvfb
diff --git a/debian/control b/debian/control
index 7dac847..1eeed56 100644
--- a/debian/control
+++ b/debian/control
@@ -19,14 +19,16 @@ Build-Depends: cython,
python-fabio-dbg (>= 0.3.0+dfsg-1~),
python-h5py,
python-h5py-dbg,
- python-lxml,
- python-lxml-dbg,
python-matplotlib,
python-matplotlib-dbg,
python-numexpr,
python-numexpr-dbg,
python-numpy,
python-numpy-dbg,
+ python-pymca5,
+ python-pymca5-dbg,
+ python-pyopencl,
+ python-pyopencl-dbg,
python-pyqt5,
python-pyqt5-dbg,
python-scipy,
@@ -44,14 +46,16 @@ Build-Depends: cython,
python3-fabio-dbg,
python3-h5py,
python3-h5py-dbg,
- python3-lxml,
- python3-lxml-dbg,
python3-matplotlib,
python3-matplotlib-dbg,
python3-numexpr,
python3-numexpr-dbg,
python3-numpy,
python3-numpy-dbg,
+ python3-pymca5,
+ python3-pymca5-dbg,
+ python3-pyopencl,
+ python3-pyopencl-dbg,
python3-pyqt5,
python3-pyqt5-dbg,
python3-scipy,
@@ -98,20 +102,8 @@ Description: Fast Azimuthal Integration scripts
Package: python-pyfai
Architecture: any
Section: python
-Depends: python-fabio (>= 0.3.0+dfsg-1~),
- python-imaging,
- python-matplotlib,
- python-scipy,
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends}
-Recommends: python-h5py,
- python-pyopencl,
- python-qt4 | python-pyside
-Suggests: pymca,
- python-rfoo
-Breaks: pyfai (<< 0.11.0+dfsg-2),
- ${python:Breaks}
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
+Breaks: pyfai (<< 0.11.0+dfsg-2), ${python:Breaks}
Replaces: pyfai (<< 0.11.0+dfsg-2)
Description: Fast Azimuthal Integration scripts - Python2
PyFAI is a Python library for azimuthal integration; it allows the conversion
@@ -136,17 +128,19 @@ Package: python-pyfai-dbg
Architecture: any
Section: debug
Depends: python-fabio-dbg (>= 0.3.0+dfsg-1~),
- python-imaging-dbg,
+ python-h5py-dbg,
python-matplotlib-dbg,
+ python-numexpr-dbg,
python-pyfai (= ${binary:Version}),
+ python-pymca5-dbg,
+ python-pyopencl-dbg,
+ python-pyqt5-dbg,
python-scipy-dbg,
+ python-silx-dbg,
+ python-tk-dbg,
${misc:Depends},
${python:Depends},
${shlibs:Depends}
-Recommends: python-dbg,
- python-pyopencl-dbg,
- python-qt4-dbg
-Suggests: python-h5py-dbg
Description: Fast Azimuthal Integration scripts - Python2 debug
PyFAI is a Python library for azimuthal integration; it allows the conversion
of diffraction images taken with 2D detectors like CCD cameras into X-Ray
@@ -170,16 +164,7 @@ Description: Fast Azimuthal Integration scripts - Python2 debug
Package: python3-pyfai
Architecture: any
Section: python
-Depends: python3-fabio,
- python3-matplotlib,
- python3-pil,
- python3-scipy,
- ${misc:Depends},
- ${python3:Depends},
- ${shlibs:Depends}
-Recommends: python3-pyopencl,
- python3-pyqt4 | python3-pyside
-Suggests: python3-h5py
+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
Description: Fast Azimuthal Integration scripts - Python3
PyFAI is a Python library for azimuthal integration; it allows the conversion
of diffraction images taken with 2D detectors like CCD cameras into X-Ray
@@ -203,17 +188,19 @@ Package: python3-pyfai-dbg
Architecture: any
Section: debug
Depends: python3-fabio-dbg,
+ python3-h5py-dbg,
python3-matplotlib-dbg,
- python3-pil-dbg,
+ python3-numexpr-dbg,
python3-pyfai (= ${binary:Version}),
+ python3-pymca-dbg,
+ python3-pyopencl-dbg,
+ python3-pyqt5-dbg,
python3-scipy-dbg,
+ python3-silx-dbg,
+ python3-tk-dbg,
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
-Recommends: python3-dbg,
- python3-pyopencl-dbg,
- python3-pyqt4-dbg | python3-pyside-dbg
-Suggests: python3-h5py-dbg
Description: Fast Azimuthal Integration scripts - Python3 debug
PyFAI is a Python library for azimuthal integration; it allows the conversion
of diffraction images taken with 2D detectors like CCD cameras into X-Ray
@@ -237,9 +224,7 @@ Description: Fast Azimuthal Integration scripts - Python3 debug
Package: python-pyfai-doc
Architecture: all
Section: doc
-Depends: libjs-mathjax,
- ${misc:Depends},
- ${sphinxdoc:Depends}
+Depends: libjs-mathjax, ${misc:Depends}, ${sphinxdoc:Depends}
Description: Fast Azimuthal Integration scripts - Documentation
PyFAI is a Python library for azimuthal integration; it allows the conversion
of diffraction images taken with 2D detectors like CCD cameras into X-Ray
diff --git a/debian/patches/0005-fix-the-setup-dependencies.patch b/debian/patches/0005-fix-the-setup-dependencies.patch
new file mode 100644
index 0000000..fa5c45a
--- /dev/null
+++ b/debian/patches/0005-fix-the-setup-dependencies.patch
@@ -0,0 +1,42 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
+ <picca at synchrotron-soleil.fr>
+Date: Mon, 4 Sep 2017 14:12:04 +0200
+Subject: fix the setup dependencies
+
+---
+ setup.py | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 090676a..ddd2e43 100644
+--- a/setup.py
++++ b/setup.py
+@@ -713,18 +713,20 @@ def get_project_configuration(dry_run):
+ """Returns project arguments for setup"""
+
+ install_requires = [
+- "numpy",
+- # h5py was removed from dependencies cause it creates an issue with
+- # Debian 8. Pip is not aware that h5py is installed and pkg_resources
+- # check dependencies and in this case raise an exception
+- # FIXME we still have to investigate
+- # "h5py",
+ "fabio",
++ "h5py",
+ "matplotlib",
+- "scipy",
+ "numexpr",
++ "numpy",
++ "PyMca5",
++ "pyopencl",
++ "PyQt5",
+ # for the use of pkg_resources on script launcher
+- "setuptools"]
++ "setuptools",
++ "scipy",
++ "silx",
++ "six"
++ ]
+
+ setup_requires = [
+ "setuptools",
diff --git a/debian/patches/series b/debian/patches/series
index 0f99d39..3cf1a9b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
0002-remove-useless-logic-in-conf.py.patch
0003-remove-a-wrong-PYTHONPATH-modification.patch
0004-unactivated-a-bunch-of-failling-tests.patch
+0005-fix-the-setup-dependencies.patch
diff --git a/debian/py3dist-overrides b/debian/py3dist-overrides
new file mode 100644
index 0000000..2c65b5a
--- /dev/null
+++ b/debian/py3dist-overrides
@@ -0,0 +1 @@
+pyqt5 python3-pyqt5
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
new file mode 100644
index 0000000..c66659d
--- /dev/null
+++ b/debian/pydist-overrides
@@ -0,0 +1 @@
+pyqt5 python-pyqt5
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyfai.git
More information about the debian-science-commits
mailing list