[silx] 01/01: Import Debian changes 0.5.0+dfsg-1
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Fri Aug 18 12:50:49 UTC 2017
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository silx.
commit 9476c9afc088a4738a81c0248ee1510b0d8ad860
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Wed Aug 2 11:00:20 2017 +0100
Import Debian changes 0.5.0+dfsg-1
silx (0.5.0+dfsg-1) unstable; urgency=medium
* Initial release (Closes: #871637)
---
debian/changelog | 5 +
debian/compat | 1 +
debian/control | 245 +++++++++++++++++++++
debian/copyright | 118 ++++++++++
debian/gbp.conf | 2 +
debian/patches/0001-fix-the-build_man-target.patch | 30 +++
...002-use-the-system-mathjax-privacy-breach.patch | 25 +++
debian/patches/0003-fix-unit-test.patch | 35 +++
.../0004-test-unactive-ressource-for-now.patch | 22 ++
debian/patches/0005-fix-the-sift-removal.patch | 54 +++++
debian/patches/0006-prefer-pyqt5-over-pyside.patch | 52 +++++
.../0007-add-install_requires-dependencies.patch | 38 ++++
debian/patches/series | 7 +
debian/py3dist-overrides | 1 +
debian/pydist-overrides | 2 +
debian/python-silx-doc.doc-base | 9 +
debian/rules | 77 +++++++
debian/source/format | 1 +
debian/source/options | 1 +
debian/watch | 7 +
20 files changed, 732 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..99cb276
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+silx (0.5.0+dfsg-1) unstable; urgency=medium
+
+ * Initial release (Closes: #871637)
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Wed, 02 Aug 2017 11:00:20 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..f599e28
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..b6152c8
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,245 @@
+Source: silx
+Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Jerome Kieffer <jerome.kieffer at esrf.fr>,
+ Picca Frédéric-Emmanuel <picca at debian.org>
+Section: science
+Priority: optional
+Build-Depends: cython (>= 0.23.2),
+ cython-dbg (>= 0.23.2),
+ cython3 (>= 0.23.2),
+ cython3-dbg (>= 0.23.2),
+ debhelper (>= 10),
+ dh-python,
+ help2man,
+ ipython,
+ ipython-qtconsole,
+ ipython3,
+ ipython3-qtconsole,
+ python-all-dbg,
+ python-all-dev,
+ python-enum34,
+ python-fabio,
+ python-fabio-dbg,
+ python-h5py,
+ python-h5py-dbg,
+ python-lxml,
+ python-lxml-dbg,
+ python-mako,
+ python-matplotlib,
+ python-matplotlib-dbg,
+ python-numpy,
+ python-numpy-dbg,
+ python-opengl,
+ python-pil,
+ python-pil-dbg,
+ python-pyopencl,
+ python-pyopencl-dbg,
+ python-pyqt5,
+ python-pyqt5-dbg,
+ python-pyqt5.qtopengl,
+ python-pyqt5.qtopengl-dbg,
+ python-pyqt5.qtsvg,
+ python-pyqt5.qtsvg-dbg,
+ python-scipy,
+ python-scipy-dbg,
+ python-setuptools,
+ python-sphinx,
+ python-sphinxcontrib.programoutput,
+ python3-all-dbg,
+ python3-all-dev,
+ python3-fabio,
+ python3-fabio-dbg,
+ python3-h5py,
+ python3-h5py-dbg,
+ python3-mako,
+ python3-matplotlib,
+ python3-matplotlib-dbg,
+ python3-numpy,
+ python3-numpy-dbg,
+ python3-opengl,
+ python3-pil,
+ python3-pil-dbg,
+ python3-pyopencl,
+ python3-pyopencl-dbg,
+ python3-pyqt5-dbg,
+ python3-pyqt5.qtopengl,
+ python3-pyqt5.qtopengl-dbg,
+ python3-pyqt5.qtsvg,
+ python3-pyqt5.qtsvg-dbg,
+ python3-scipy,
+ python3-scipy-dbg,
+ python3-setuptools,
+ python3-sphinx,
+ python3-sphinxcontrib.programoutput,
+ xauth,
+ xvfb
+Standards-Version: 4.0.1
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/silx.git
+Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/silx.git
+Homepage: https://github.com/silx-kit/silx
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.4
+
+Package: silx
+Architecture: all
+Depends: python3-silx (>= ${source:Version}),
+ ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends}
+Description: Toolbox for X-Ray data analysis - Executables
+ The silx project aims at providing a collection of Python packages to
+ support the development of data assessment, reduction and analysis
+ applications at synchrotron radiation facilities. It aims at
+ providing reading/writing different file formats, data reduction
+ routines and a set of Qt widgets to browse and visualize data.
+ .
+ The current version provides :
+ .
+ * reading HDF5 file format (with support of SPEC file format)
+ * histogramming
+ * fitting
+ * 1D and 2D visualization using multiple backends (matplotlib or OpenGL)
+ * image plot widget with a set of associated tools (See changelog file).
+ * Unified browser for HDF5, SPEC and image file formats supporting inspection
+ and visualization of n-dimensional datasets.
+ * Unified viewer (silx view filename) for HDF5, SPEC and image file formats
+ * OpenGL-based widget to display 3D scalar field with
+ isosurface and cutting plane.
+ .
+ This uses the Python 3 version of the package.
+
+Package: python-silx
+Architecture: any
+Section: python
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
+Description: Toolbox for X-Ray data analysis - Python2 library
+ The silx project aims at providing a collection of Python packages to
+ support the development of data assessment, reduction and analysis
+ applications at synchrotron radiation facilities. It aims at
+ providing reading/writing different file formats, data reduction
+ routines and a set of Qt widgets to browse and visualize data.
+ .
+ The current version provides :
+ .
+ * reading HDF5 file format (with support of SPEC file format)
+ * histogramming
+ * fitting
+ * 1D and 2D visualization using multiple backends (matplotlib or OpenGL)
+ * image plot widget with a set of associated tools (See changelog file).
+ * Unified browser for HDF5, SPEC and image file formats supporting inspection
+ and visualization of n-dimensional datasets.
+ * Unified viewer (silx view filename) for HDF5, SPEC and image file formats
+ * OpenGL-based widget to display 3D scalar field with
+ isosurface and cutting plane.
+ .
+ This is the Python 2 version of the package.
+
+Package: python-silx-dbg
+Architecture: any
+Section: debug
+Depends: python-silx (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Toolbox for X-Ray data analysis - Python2 debug
+ The silx project aims at providing a collection of Python packages to
+ support the development of data assessment, reduction and analysis
+ applications at synchrotron radiation facilities. It aims at
+ providing reading/writing different file formats, data reduction
+ routines and a set of Qt widgets to browse and visualize data.
+ .
+ The current version provides :
+ .
+ * reading HDF5 file format (with support of SPEC file format)
+ * histogramming
+ * fitting
+ * 1D and 2D visualization using multiple backends (matplotlib or OpenGL)
+ * image plot widget with a set of associated tools (See changelog file).
+ * Unified browser for HDF5, SPEC and image file formats supporting inspection
+ and visualization of n-dimensional datasets.
+ * Unified viewer (silx view filename) for HDF5, SPEC and image file formats
+ * OpenGL-based widget to display 3D scalar field with
+ isosurface and cutting plane.
+ .
+ This is the Python 2 debug version of the package.
+
+Package: python3-silx
+Architecture: any
+Section: python
+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
+Description: Toolbox for X-Ray data analysis - Python3
+ The silx project aims at providing a collection of Python packages to
+ support the development of data assessment, reduction and analysis
+ applications at synchrotron radiation facilities. It aims at
+ providing reading/writing different file formats, data reduction
+ routines and a set of Qt widgets to browse and visualize data.
+ .
+ The current version provides :
+ .
+ * reading HDF5 file format (with support of SPEC file format)
+ * histogramming
+ * fitting
+ * 1D and 2D visualization using multiple backends (matplotlib or OpenGL)
+ * image plot widget with a set of associated tools (See changelog file).
+ * Unified browser for HDF5, SPEC and image file formats supporting inspection
+ and visualization of n-dimensional datasets.
+ * Unified viewer (silx view filename) for HDF5, SPEC and image file formats
+ * OpenGL-based widget to display 3D scalar field with
+ isosurface and cutting plane.
+ .
+ This is the Python 3 version of the package.
+
+Package: python3-silx-dbg
+Architecture: any
+Section: debug
+Depends: python3-silx (= ${binary:Version}),
+ ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends}
+Description: Toolbox for X-Ray data analysis - Python3 debug
+ The silx project aims at providing a collection of Python packages to
+ support the development of data assessment, reduction and analysis
+ applications at synchrotron radiation facilities. It aims at
+ providing reading/writing different file formats, data reduction
+ routines and a set of Qt widgets to browse and visualize data.
+ .
+ The current version provides :
+ .
+ * reading HDF5 file format (with support of SPEC file format)
+ * histogramming
+ * fitting
+ * 1D and 2D visualization using multiple backends (matplotlib or OpenGL)
+ * image plot widget with a set of associated tools (See changelog file).
+ * Unified browser for HDF5, SPEC and image file formats supporting inspection
+ and visualization of n-dimensional datasets.
+ * Unified viewer (silx view filename) for HDF5, SPEC and image file formats
+ * OpenGL-based widget to display 3D scalar field with
+ isosurface and cutting plane.
+ .
+ This is the Python 3 debug version of the package.
+
+Package: python-silx-doc
+Architecture: all
+Section: doc
+Depends: libjs-mathjax, ${misc:Depends}, ${sphinxdoc:Depends}
+Description: Toolbox for X-Ray data analysis - Documentation
+ The silx project aims at providing a collection of Python packages to
+ support the development of data assessment, reduction and analysis
+ applications at synchrotron radiation facilities. It aims at
+ providing reading/writing different file formats, data reduction
+ routines and a set of Qt widgets to browse and visualize data.
+ .
+ The current version provides :
+ .
+ * reading HDF5 file format (with support of SPEC file format)
+ * histogramming
+ * fitting
+ * 1D and 2D visualization using multiple backends (matplotlib or OpenGL)
+ * image plot widget with a set of associated tools (See changelog file).
+ * Unified browser for HDF5, SPEC and image file formats supporting inspection
+ and visualization of n-dimensional datasets.
+ * Unified viewer (silx view filename) for HDF5, SPEC and image file formats
+ * OpenGL-based widget to display 3D scalar field with
+ isosurface and cutting plane.
+ .
+ This is the common documentation package.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..e71dedd
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,118 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: silx
+Source: https://github.com/silx-kit/silx
+Files-Excluded: silx/opencl/sift
+ silx/resources/opencl/sift
+
+Files: *
+Copyright: 2004-2017 European Synchrotron Radiation Facility
+ Data analysis unit (silx at esrf.fr)
+License: Expat
+
+Files: silx/io/specfile/src/* silx/io/specfile/include/Lists.h silx/io/specfile/include/locale_management.h silx/io/specfile/include/SpecFile.h silx/io/specfile/include/SpecFileP.h
+Copyright: 2004-2016 European Synchrotron Radiation Facility
+License: LGPL-2.1+
+
+Files: silx/math/histogramnd/include/msvc/stdint.h
+Copyright: 2006-2008 Alexander Chemeris
+License: BSD-3-clause
+
+Files: silx/gui/plot/MPLColormap.py
+Copyright: Nathaniel J. Smith, Stefan van der Walt, Eric Firing
+License: CC0
+
+Files: silx/gui/qt/_pyside_dynamic.py
+Copyright: 2011 Sebastian Wiesner <lunaryorn at gmail.com>
+ Modifications by Charl Botha <cpbotha at vxlabs.com>
+License: Expat
+
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of the <organization> nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT
+ HOLDER> BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: CC0
+ Statement of Purpose
+ .
+ The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work").
+ .
+ Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote th [...]
+ .
+ For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights.
+ .
+ 1. Copyright and Related Rights. A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following:
+ .
+ i. the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+ iii. publicity and privacy rights pertaining to a person's image or likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below;
+ v. rights protecting the extraction, dissemination, use and reuse of data in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and
+ vii. other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof.
+ .
+ 2. Waiver. To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable l [...]
+ .
+ 3. Public License Fallback. Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's [...]
+ .
+ 4. Limitations and Disclaimers.
+ .
+ a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work.
+
+License: Expat
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License can be found in "/usr/share/common-licenses/LGPL-2.1".
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..f68d262
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch = master
\ No newline at end of file
diff --git a/debian/patches/0001-fix-the-build_man-target.patch b/debian/patches/0001-fix-the-build_man-target.patch
new file mode 100644
index 0000000..02a1899
--- /dev/null
+++ b/debian/patches/0001-fix-the-build_man-target.patch
@@ -0,0 +1,30 @@
+From: "picca at synchrotron-soleil.fr" <picca at synchrotron-soleil.fr>
+Date: Wed, 2 Aug 2017 15:43:37 +0200
+Subject: fix the build_man target
+
+---
+ doc/source/conf.py | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index 30abf54..44f0a3e 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -15,16 +15,12 @@ import sys
+ import os
+ import glob
+ import subprocess
++import silx
+
+ # If extensions (or modules to document with autodoc) are in another directory,
+ # add these directories to sys.path here. If the directory is relative to the
+ # documentation root, use os.path.abspath to make it absolute, like shown here.
+ # sys.path.insert(0, os.path.abspath('.'))
+-dirname = os.path.dirname
+-root_dir = dirname(dirname(dirname(os.path.abspath(__file__))))
+-import silx
+-source_dir = dirname(dirname(silx.__file__))
+-os.environ["PYTHONPATH"] = source_dir + os.pathsep + os.environ.get("PYTHONPATH", "")
+
+ # -- General configuration -----------------------------------------------------
+
diff --git a/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch b/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch
new file mode 100644
index 0000000..81cf440
--- /dev/null
+++ b/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch
@@ -0,0 +1,25 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
+ <picca at synchrotron-soleil.fr>
+Date: Thu, 10 Aug 2017 10:19:39 +0200
+Subject: use the system mathjax (privacy breach)
+
+---
+ doc/source/conf.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index 44f0a3e..375c2bf 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -100,6 +100,11 @@ pygments_style = 'sphinx'
+ # A list of ignored prefixes for module index sorting.
+ # modindex_common_prefix = []
+
++# -- Option for MathJax extension ----------------------------------------------
++
++# Override required in order to use Debian's system mathjax
++mathjax_path = 'file:///usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
++
+
+ # -- Options for HTML output ---------------------------------------------------
+
diff --git a/debian/patches/0003-fix-unit-test.patch b/debian/patches/0003-fix-unit-test.patch
new file mode 100644
index 0000000..4e27e83
--- /dev/null
+++ b/debian/patches/0003-fix-unit-test.patch
@@ -0,0 +1,35 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
+ <picca at synchrotron-soleil.fr>
+Date: Fri, 11 Aug 2017 10:15:26 +0200
+Subject: fix unit test
+
+---
+ silx/opencl/common.py | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/silx/opencl/common.py b/silx/opencl/common.py
+index fcb4efa..e5f23c0 100644
+--- a/silx/opencl/common.py
++++ b/silx/opencl/common.py
+@@ -59,13 +59,16 @@ else:
+ except ImportError:
+ logger.warning("Unable to import pyOpenCl. Please install it from: http://pypi.python.org/pypi/pyopencl")
+ pyopencl = None
+- class mf(object):
+- WRITE_ONLY = 1
+- READ_ONLY = 1
+- READ_WRITE = 1
+ else:
+ import pyopencl.array as array
+- mf = pyopencl.mem_flags
++
++if pyopencl is None:
++ class mf(object):
++ WRITE_ONLY = 1
++ READ_ONLY = 1
++ READ_WRITE = 1
++else:
++ mf = pyopencl.mem_flags
+
+
+ FLOP_PER_CORE = {"GPU": 64, # GPU, Fermi at least perform 64 flops per cycle/multicore, G80 were at 24 or 48 ...
diff --git a/debian/patches/0004-test-unactive-ressource-for-now.patch b/debian/patches/0004-test-unactive-ressource-for-now.patch
new file mode 100644
index 0000000..d609678
--- /dev/null
+++ b/debian/patches/0004-test-unactive-ressource-for-now.patch
@@ -0,0 +1,22 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
+ <picca at synchrotron-soleil.fr>
+Date: Fri, 11 Aug 2017 10:57:17 +0200
+Subject: test unactive ressource for now
+
+---
+ silx/test/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/silx/test/__init__.py b/silx/test/__init__.py
+index 01ee8d1..ddbc5c1 100644
+--- a/silx/test/__init__.py
++++ b/silx/test/__init__.py
+@@ -60,7 +60,7 @@ def suite():
+ # then test no-gui tests
+ test_suite.addTest(test_utils.suite())
+ test_suite.addTest(test_version.suite())
+- test_suite.addTest(test_resources.suite())
++ # test_suite.addTest(test_resources.suite())
+ test_suite.addTest(test_utils.suite())
+ test_suite.addTest(test_io.suite())
+ test_suite.addTest(test_math.suite())
diff --git a/debian/patches/0005-fix-the-sift-removal.patch b/debian/patches/0005-fix-the-sift-removal.patch
new file mode 100644
index 0000000..2c85d15
--- /dev/null
+++ b/debian/patches/0005-fix-the-sift-removal.patch
@@ -0,0 +1,54 @@
+From: =?utf-8?q?Picca_Fr=C3=83=C2=A9d=C3=83=C2=A9ric-Emmanuel?=
+ <picca at synchrotron-soleil.fr>
+Date: Fri, 11 Aug 2017 16:02:12 +0200
+Subject: fix the sift removal
+
+---
+ silx/opencl/setup.py | 5 ++++-
+ silx/opencl/test/__init__.py | 7 +++++--
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/silx/opencl/setup.py b/silx/opencl/setup.py
+index d0181cd..bc23c2b 100644
+--- a/silx/opencl/setup.py
++++ b/silx/opencl/setup.py
+@@ -29,12 +29,15 @@ __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
+ __authors__ = ["J. Kieffer"]
+ __date__ = "08/09/2016"
+
++import os
++
+ from numpy.distutils.misc_util import Configuration
+
+
+ def configuration(parent_package='', top_path=None):
+ config = Configuration('opencl', parent_package, top_path)
+- config.add_subpackage('sift')
++ if os.path.exists('sift'):
++ config.add_subpackage('sift')
+ config.add_subpackage('test')
+ return config
+
+diff --git a/silx/opencl/test/__init__.py b/silx/opencl/test/__init__.py
+index 24aa06e..bdc83a9 100644
+--- a/silx/opencl/test/__init__.py
++++ b/silx/opencl/test/__init__.py
+@@ -29,13 +29,16 @@ __date__ = "15/03/2017"
+ import unittest
+ from . import test_addition
+ from . import test_medfilt
+-from ..sift import test as test_sift
+
+
+ def suite():
+ test_suite = unittest.TestSuite()
+ test_suite.addTests(test_addition.suite())
+ test_suite.addTests(test_medfilt.suite())
+- test_suite.addTests(test_sift.suite())
++ try:
++ from ..sift import test as test_sift
++ test_suite.addTests(test_sift.suite())
++ except ImportError:
++ pass
+
+ return test_suite
diff --git a/debian/patches/0006-prefer-pyqt5-over-pyside.patch b/debian/patches/0006-prefer-pyqt5-over-pyside.patch
new file mode 100644
index 0000000..253751b
--- /dev/null
+++ b/debian/patches/0006-prefer-pyqt5-over-pyside.patch
@@ -0,0 +1,52 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
+ <picca at synchrotron-soleil.fr>
+Date: Mon, 14 Aug 2017 14:58:02 +0200
+Subject: prefer pyqt5 over pyside
+
+---
+ silx/gui/qt/_qt.py | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/silx/gui/qt/_qt.py b/silx/gui/qt/_qt.py
+index 0962c21..67f3e46 100644
+--- a/silx/gui/qt/_qt.py
++++ b/silx/gui/qt/_qt.py
+@@ -64,12 +64,12 @@ HAS_OPENGL = False
+ """True if Qt provides support for OpenGL (QtOpenGL)."""
+
+ # First check for an already loaded wrapper
+-if 'PySide.QtCore' in sys.modules:
+- BINDING = 'PySide'
+-
+-elif 'PyQt5.QtCore' in sys.modules:
++if 'PyQt5.QtCore' in sys.modules:
+ BINDING = 'PyQt5'
+
++elif 'PySide.QtCore' in sys.modules:
++ BINDING = 'PySide'
++
+ elif 'PyQt4.QtCore' in sys.modules:
+ BINDING = 'PyQt4'
+
+@@ -78,17 +78,17 @@ else: # Then try Qt bindings
+ import PyQt4 # noqa
+ except ImportError:
+ try:
+- import PySide # noqa
++ import PyQt5 # noqa
+ except ImportError:
+ try:
+- import PyQt5 # noqa
++ import PySide # noqa
+ except ImportError:
+ raise ImportError(
+ 'No Qt wrapper found. Install PyQt4, PyQt5 or PySide.')
+ else:
+- BINDING = 'PyQt5'
++ BINDING = 'PySide'
+ else:
+- BINDING = 'PySide'
++ BINDING = 'PyQt5'
+ else:
+ BINDING = 'PyQt4'
+
diff --git a/debian/patches/0007-add-install_requires-dependencies.patch b/debian/patches/0007-add-install_requires-dependencies.patch
new file mode 100644
index 0000000..467d8c1
--- /dev/null
+++ b/debian/patches/0007-add-install_requires-dependencies.patch
@@ -0,0 +1,38 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
+ <picca at synchrotron-soleil.fr>
+Date: Thu, 17 Aug 2017 09:30:39 +0200
+Subject: add install_requires dependencies
+
+---
+ setup.py | 20 +++++++++++++++++++-
+ 1 file changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 852c48d..f91cc03 100644
+--- a/setup.py
++++ b/setup.py
+@@ -649,7 +649,23 @@ def get_project_configuration(dry_run):
+ # for most of the computation
+ "numpy",
+ # for the script launcher
+- "setuptools"]
++ "setuptools",
++ # Debian added
++ "ipython",
++ "qtconsole",
++ 'enum34;python_version<"3.4"',
++ "fabio",
++ "h5py",
++ "lxml",
++ "mako",
++ "matplotlib",
++ "PyOpenGL",
++ "pil",
++ "pyopencl",
++ "PyQt5",
++ "scipy",
++ "six"
++ ]
+
+ setup_requires = ["setuptools", "numpy"]
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..406220d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,7 @@
+0001-fix-the-build_man-target.patch
+0002-use-the-system-mathjax-privacy-breach.patch
+0003-fix-unit-test.patch
+0004-test-unactive-ressource-for-now.patch
+0005-fix-the-sift-removal.patch
+0006-prefer-pyqt5-over-pyside.patch
+0007-add-install_requires-dependencies.patch
diff --git a/debian/py3dist-overrides b/debian/py3dist-overrides
new file mode 100644
index 0000000..2c4ce13
--- /dev/null
+++ b/debian/py3dist-overrides
@@ -0,0 +1 @@
+pyqt5 python3-pyqt5,python3-pyqt5.qtopengl,python3-pyqt5.qtsvg
\ No newline at end of file
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
new file mode 100644
index 0000000..a9fde6e
--- /dev/null
+++ b/debian/pydist-overrides
@@ -0,0 +1,2 @@
+pyqt5 python-pyqt5,python-pyqt5.qtopengl,python-pyqt5.qtsvg
+enum34_python_version python-enum34
diff --git a/debian/python-silx-doc.doc-base b/debian/python-silx-doc.doc-base
new file mode 100644
index 0000000..b290d8a
--- /dev/null
+++ b/debian/python-silx-doc.doc-base
@@ -0,0 +1,9 @@
+Document: silx-manual
+Title: silx documentation manual
+Author: Jérôme Kieffer <jerome.kieffer at esrf.eu>
+Abstract: Toolbox for X-Ray data analysis
+Section: Science/Data Analysis
+
+Format: HTML
+Index: /usr/share/doc/python-silx-doc/html/index.html
+Files: /usr/share/doc/python-silx-doc/html/*
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..b04892d
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,77 @@
+#!/usr/bin/make -f
+
+# when activated do not forget to remove the
+# python[3]-hdf5-dbg Build-Depends
+JESSIE_BACKPORTS ?= 0
+
+ifeq ($(JESSIE_BACKPORTS), 0)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+else
+export PYBUILD_DISABLE_python2-dbg=test
+export PYBUILD_DISABLE_python3-dbg=test
+endif
+
+export POCL_CACHE_DIR=$(CURDIR)/.cache/
+export PYBUILD_AFTER_INSTALL=rm -rf {destdir}/usr/bin/
+export PYBUILD_NAME=silx
+export SPECFILE_USE_GNU_SOURCE=1
+
+# Make does not offer a recursive wildcard function, so here's one:
+rwildcard=$(wildcard $1$2) $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2))
+
+# How to recursively find all files with the same name in a given folder
+ALL_PYX := $(call rwildcard,silx/,*.pyx)
+#NOTA: No space before *
+
+%:
+ dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+
+override_dh_clean:
+ dh_clean
+ # remove the cython generated file to force rebuild
+ rm -f $(patsubst %.pyx,%.cpp,${ALL_PYX})
+ rm -f $(patsubst %.pyx,%.c,${ALL_PYX})
+ rm -f $(patsubst %.pyx,%.html,${ALL_PYX})
+ rm -rf build/html build/man
+ rm -rf *.egg-info
+ rm -rf $(POCL_CACHE_DIR)
+
+override_dh_auto_build:
+ python setup.py build build_man
+ dh_auto_build
+
+override_dh_install:
+ dh_numpy
+ dh_numpy3
+
+ # install scripts into silx
+ python3 setup.py install_scripts -d debian/silx/usr/bin
+
+ # install the qtdesigner files only for the python3 package
+ dh_install -p python3-silx qtdesigner_plugins/*.py /usr/lib/qt4/plugins/designer/python
+
+ dh_install
+
+# WITH_QT_TEST=False to disable graphical tests
+# SILX_OPENCL=False to disable OpenCL tests
+# SILX_TEST_LOW_MEM=True to disable tests taking large amount of memory
+# GPU=False to disable the use of a GPU with OpenCL test
+# WITH_GL_TEST=False to disable tests using OpenGL
+# UNACTIVATED UNTIL dh_python from UNSTABLE IS FIXED
+# https://lists.debian.org/debian-python/2017/08/msg00095.html
+override_dh_auto_test:
+ifeq ($(JESSIE_BACKPORTS), 0)
+ mkdir -p $(POCL_CACHE_DIR) # create POCL cachedir in order to avoid an FTBFS in sbuild
+ dh_auto_test -- -s custom --test-args="env PYTHONPATH={build_dir} GPU=False SILX_OPENCL=False SILX_TEST_LAW_MEM=True xvfb-run -a --server-args=\"-screen 0 1024x768x24\" {interpreter} run_tests.py -v"
+endif
+
+override_dh_installman:
+ dh_installman -p silx build/man/*.1
+
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+ mkdir -p $(POCL_CACHE_DIR) # create POCL cachedir in order to avoid an FTBFS in sbuild
+ python setup.py build build_doc
+ dh_installdocs "build/sphinx/html" -p python-silx-doc
+ dh_sphinxdoc -O--buildsystem=pybuild
+endif
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..6e88e49
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1 @@
+extend-diff-ignore="^[^/]+\.egg-info/"
\ No newline at end of file
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..0ebecc8
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,7 @@
+version=4
+opts=repacksuffix=+dfsg,\
+uversionmangle=s/(rc|a|b|c)/~$1/,\
+dversionmangle=s/\+dfsg// \
+https://pypi.python.org/pypi/silx/ \
+https://pypi.python.org/packages/.*/.*/.*/\
+ silx-([\d\.]+).tar.gz#.* debian uupdate
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/silx.git
More information about the debian-science-commits
mailing list