From 328032e2317e3ac4859196bbf12bdb71795302fe Mon Sep 17 00:00:00 2001 From: Alexandre Marie Date: Tue, 21 Jul 2020 14:45:14 +0200 Subject: New upstream version 0.13.0+dfsg --- package/debian11/changelog | 156 +++++++++++++++++++ package/debian11/control | 170 +++++++++++++++++++++ package/debian11/gbp.conf | 2 + ...002-use-the-system-mathjax-privacy-breach.patch | 25 +++ ...03-do-not-modify-PYTHONPATH-from-setup.py.patch | 22 +++ package/debian11/patches/series | 2 + package/debian11/py3dist-overrides | 1 + package/debian11/python-silx-doc.doc-base | 9 ++ package/debian11/rules | 82 ++++++++++ package/debian11/source/format | 1 + package/debian11/source/options | 1 + package/debian11/tests/control | 15 ++ package/debian11/watch | 7 + 13 files changed, 493 insertions(+) create mode 100644 package/debian11/changelog create mode 100644 package/debian11/control create mode 100644 package/debian11/gbp.conf create mode 100644 package/debian11/patches/0002-use-the-system-mathjax-privacy-breach.patch create mode 100644 package/debian11/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch create mode 100644 package/debian11/patches/series create mode 100644 package/debian11/py3dist-overrides create mode 100644 package/debian11/python-silx-doc.doc-base create mode 100755 package/debian11/rules create mode 100644 package/debian11/source/format create mode 100644 package/debian11/source/options create mode 100644 package/debian11/tests/control create mode 100644 package/debian11/watch (limited to 'package/debian11') diff --git a/package/debian11/changelog b/package/debian11/changelog new file mode 100644 index 0000000..d0764f1 --- /dev/null +++ b/package/debian11/changelog @@ -0,0 +1,156 @@ +silx (0.11.0+dfsg-3) unstable; urgency=medium + + * d/control: Build-Depends on python3-qtconsole(Closes: #946571). + + -- Picca Frédéric-Emmanuel Wed, 11 Dec 2019 09:10:31 +0100 + +silx (0.11.0+dfsg-2) unstable; urgency=medium + + * Use debhelper-compat instead of debian/compat. + * remove Python2 modules (Closes: #938481). + * Switched to compat level 12 + - d/rules: Used --doc-main-package python3-silx. + + -- Picca Frédéric-Emmanuel Sat, 19 Oct 2019 13:19:44 +0200 + +silx (0.11.0+dfsg-1) unstable; urgency=medium + + [ Alexandre Marie ] + * Added test on openCL's use + * New upstream version 0.11.0+dfsg + * d/patches + - 0004-fix-missing-import.patches (Removed) + - 0005-fix-problem-with-sift-import (Removed) + + -- Picca Frédéric-Emmanuel Tue, 09 Jul 2019 15:26:55 +0200 + +silx (0.10.1+dfsg-1~exp2) experimental; urgency=medium + + * d/patchs + + 0005-fix-problem-with-sift-import.patch (Added) + + -- Picca Frédéric-Emmanuel Tue, 28 May 2019 11:17:46 +0200 + +silx (0.10.1+dfsg-1~exp1) experimental; urgency=medium + + * New upstream version 0.10.1+dfsg + * d/patches + + 0004-fix-missing-import.patch (Added) + + -- Picca Frédéric-Emmanuel Tue, 28 May 2019 08:20:44 +0200 + +silx (0.9.0+dfsg-3) unstable; urgency=medium + + * d/rules: Do not run Qt test for now. + * d/t/control.autodep8: Fixed to run test for real. + + -- Picca Frédéric-Emmanuel Thu, 21 Feb 2019 11:22:03 +0100 + +silx (0.9.0+dfsg-2) unstable; urgency=medium + + * d/patches: + + 0004-fix-FTBFS-with-numpy-0.16.patch (Added) + + -- Picca Frédéric-Emmanuel Thu, 20 Dec 2018 16:21:18 +0100 + +silx (0.9.0+dfsg-1) unstable; urgency=medium + + [ Picca Frédéric-Emmanuel ] + * Fixed autopkgtests and use control.autodep8 + * Used salsa-ci for continuous integration. + * Run autopkgtests via xvfb-run + * d/control: Removed Build-Depends: python-lxml[-dbg], python-enum34. + + [ Alexandre Marie ] + * New upstream version 0.9.0+dfsg + * d/watch: uversionmangling to deal with rc|alpha|beta versions. + + -- Alexandre Marie Mon, 17 Dec 2018 13:25:52 +0100 + +silx (0.8.0+dfsg-1) unstable; urgency=medium + + * New upstream version 0.8.0+dfsg + * Added the pub 4096R/26F8E116 key to keyring + 2016-04-11 Thomas Vincent + * d/control + - Build-Depends + + Added pandoc + - Removed obsolete X-Python[3]-Version + * d/rules + - Installed the QtDesgigner files only for Qt5. + - Override dh_python3 to deal with qtdesigner files. + - Run sphinx with xvfb in order to have the right silx.sx documentation. + - Avoid QT warnings by setting XDG_RUNTIME_DIR + + -- Picca Frédéric-Emmanuel Tue, 31 Jul 2018 16:24:57 +0200 + +silx (0.7.0+dfsg-2) unstable; urgency=medium + + * d/rules + - use py3versions to get the python3 default interpreter version. + This makes the package backportable. + + -- Picca Frédéric-Emmanuel Tue, 13 Mar 2018 20:04:20 +0100 + +silx (0.7.0+dfsg-1) unstable; urgency=medium + + * New upstream version 0.7.0+dfsg + * Bumped Strandards-Versions to 4.1.3 (nothing to do) + * d/control + - Build-Depends + + Added python[3]-nbsphinx, python-concurrent.futures + * d/copyright + remove the third_party _local files. + * d/patches + + 0003-do-not-modify-PYTHONPATH-from-setup.py.patch (added) + - 0005-slocale.h-is-removed-in-GLIBC-2.26.patch (obsolete) + - 0006-prefer-pyqt5-over-pyside.patch (obsolete) + * d/rules + - removed the jessie backports specific code + - compile extensions only once per interpreter. + - unactive for now the build time tests. + - build the doc only with python3. + * d/watch + - check the pgp signature + + -- Picca Frédéric-Emmanuel Tue, 13 Mar 2018 07:32:00 +0100 + +silx (0.6.1+dfsg-2) unstable; urgency=medium + + * d/control + - Bump Standrad-Version 4.1.1 (nothing to do) + * fixed glibc 2.26 FTBFS with upstream patch glib2.26 (Closes: #882881) + * d/patches + + 0005-slocale.h-is-removed-in-GLIBC-2.26.patch (Added) + + -- Picca Frédéric-Emmanuel Sun, 21 Jan 2018 09:32:38 +0100 + +silx (0.6.1+dfsg-1) unstable; urgency=medium + + * New upstream version 0.6.1+dfsg + * update watch file + + -- Picca Frédéric-Emmanuel Sat, 25 Nov 2017 17:02:19 +0100 + +silx (0.6.0+dfsg-1) unstable; urgency=medium + + * New upstream version 0.6.0+dfsg + * d/patches + - 0001-fix-the-build_man-target.patch (deleted) + - 0004-test-unactive-ressource-for-now.patch (deleted) + - 0005-fix-the-sift-removal.patch (deleted) + + -- Picca Frédéric-Emmanuel Sat, 07 Oct 2017 08:08:56 +0200 + +silx (0.5.0+dfsg-2) unstable; urgency=medium + + * d/control + - Added all the -dbg dependencies for the -dbg packages. + + -- Picca Frédéric-Emmanuel Fri, 01 Sep 2017 15:10:44 +0200 + +silx (0.5.0+dfsg-1) unstable; urgency=medium + + * Initial release (Closes: #871637) + + -- Picca Frédéric-Emmanuel Wed, 02 Aug 2017 11:00:20 +0100 diff --git a/package/debian11/control b/package/debian11/control new file mode 100644 index 0000000..f2791e7 --- /dev/null +++ b/package/debian11/control @@ -0,0 +1,170 @@ +Source: silx +Maintainer: Debian Science Maintainers +Uploaders: Jerome Kieffer , + Picca Frédéric-Emmanuel , + Alexandre Marie +Section: science +Priority: optional +Build-Depends: cython3 (>= 0.23.2), + cython3-dbg (>= 0.23.2), + debhelper-compat (= 12), + dh-python, + graphviz, + help2man, + ipython3, + pandoc , + python3-all-dbg, + python3-all-dev, + python3-fabio, + python3-fabio-dbg, + python3-h5py, + python3-h5py-dbg, + python3-mako, + python3-matplotlib, + python3-matplotlib-dbg, + python3-nbsphinx , + 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-qtconsole, + python3-scipy, + python3-scipy-dbg, + python3-setuptools, + python3-six, + python3-sphinx, + python3-sphinxcontrib.programoutput, + xauth, + xvfb +Standards-Version: 4.1.3 +Vcs-Browser: https://salsa.debian.org/science-team/silx +Vcs-Git: https://salsa.debian.org/science-team/silx.git +Homepage: https://github.com/silx-kit/silx + +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: 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-fabio-dbg, + python3-h5py-dbg, + python3-lxml-dbg, + python3-matplotlib-dbg, + python3-numpy-dbg, + python3-pil-dbg, + python3-pyopencl-dbg, + python3-pyqt5-dbg, + python3-pyqt5.qtopengl-dbg, + python3-pyqt5.qtsvg-dbg, + python3-scipy-dbg, + 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/package/debian11/gbp.conf b/package/debian11/gbp.conf new file mode 100644 index 0000000..f68d262 --- /dev/null +++ b/package/debian11/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +debian-branch = master \ No newline at end of file diff --git a/package/debian11/patches/0002-use-the-system-mathjax-privacy-breach.patch b/package/debian11/patches/0002-use-the-system-mathjax-privacy-breach.patch new file mode 100644 index 0000000..04deea7 --- /dev/null +++ b/package/debian11/patches/0002-use-the-system-mathjax-privacy-breach.patch @@ -0,0 +1,25 @@ +From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= + +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 86dbccf..18bfce2 100644 +--- a/doc/source/conf.py ++++ b/doc/source/conf.py +@@ -143,6 +143,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/package/debian11/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch b/package/debian11/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch new file mode 100644 index 0000000..4591cb6 --- /dev/null +++ b/package/debian11/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch @@ -0,0 +1,22 @@ +From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= +Date: Sun, 4 Mar 2018 16:36:35 +0100 +Subject: do not modify PYTHONPATH from setup.py + +--- + setup.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 1029bf0..46d0bdf 100644 +--- a/setup.py ++++ b/setup.py +@@ -260,7 +260,8 @@ 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) + if not os.path.isdir("build/man"): + os.makedirs("build/man") + import subprocess diff --git a/package/debian11/patches/series b/package/debian11/patches/series new file mode 100644 index 0000000..e3795b3 --- /dev/null +++ b/package/debian11/patches/series @@ -0,0 +1,2 @@ +0002-use-the-system-mathjax-privacy-breach.patch +0003-do-not-modify-PYTHONPATH-from-setup.py.patch diff --git a/package/debian11/py3dist-overrides b/package/debian11/py3dist-overrides new file mode 100644 index 0000000..2c4ce13 --- /dev/null +++ b/package/debian11/py3dist-overrides @@ -0,0 +1 @@ +pyqt5 python3-pyqt5,python3-pyqt5.qtopengl,python3-pyqt5.qtsvg \ No newline at end of file diff --git a/package/debian11/python-silx-doc.doc-base b/package/debian11/python-silx-doc.doc-base new file mode 100644 index 0000000..c8efa7f --- /dev/null +++ b/package/debian11/python-silx-doc.doc-base @@ -0,0 +1,9 @@ +Document: silx-manual +Title: silx documentation manual +Author: Jérôme Kieffer +Abstract: Toolbox for X-Ray data analysis +Section: Science/Data Analysis + +Format: HTML +Index: /usr/share/doc/python3-silx/html/index.html +Files: /usr/share/doc/python3-silx/html/* diff --git a/package/debian11/rules b/package/debian11/rules new file mode 100755 index 0000000..d086f63 --- /dev/null +++ b/package/debian11/rules @@ -0,0 +1,82 @@ +#!/usr/bin/make -f + +# avoir bbuild FTBFS +export HOME=$(CURDIR)/debian/tmp-home +export XDG_RUNTIME_DIR=$(HOME)/runtime +export POCL_CACHE_DIR=$(HOME)/.cache/ + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export PYBUILD_AFTER_INSTALL=rm -rf {destdir}/usr/bin/ +export PYBUILD_NAME=silx +export SPECFILE_USE_GNU_SOURCE=1 +export SILX_FULL_INSTALL_REQUIRES=1 + +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +# 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 * + +# get the default python3 interpreter version +PY3VER := $(shell py3versions -dv) + +%: + dh $@ --with 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 doc/build/html + rm -rf build/man + rm -rf *.egg-info + +override_dh_auto_build: + dh_auto_build + # build man pages + dh_auto_build -- -s custom --build-args="env PYTHONPATH={build_dir} {interpreter} setup.py build_man" + +override_dh_install: + dh_numpy3 + + # install scripts into silx + python3 setup.py install_scripts -d debian/silx/usr/bin + dh_install -p silx package/desktop/*.desktop usr/share/applications + dh_install -p silx package/desktop/silx.png usr/share/icons/hicolor/48x48/apps + dh_install -p silx package/desktop/silx.svg usr/share/icons/hicolor/scalable/apps + dh_install -p silx package/desktop/silx.xml usr/share/mime/packages + + # install the qtdesigner files only for the python3 package + dh_install -p python3-silx qtdesigner_plugins/*.py /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/plugins/designer/python + + dh_install + +override_dh_python3: + dh_python3 + dh_python3 -p python3-silx /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/plugins/designer/python + +# 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 +override_dh_auto_test: + 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 WITH_QT_TEST=False SILX_OPENCL=False SILX_TEST_LAW_MEM=True xvfb-run -a --server-args=\"-screen 0 1024x768x24\" {interpreter} run_tests.py -vv --installed" + +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 + mkdir -p -m 700 $(XDG_RUNTIME_DIR) + pybuild --build -s custom -p $(PY3VER) --build-args="cd doc && env PYTHONPATH={build_dir} http_proxy='127.0.0.1:9' xvfb-run -a --server-args=\"-screen 0 1024x768x24\" {interpreter} -m sphinx -N -bhtml source build/html" + dh_installdocs "doc/build/html" -p python-silx-doc --doc-main-package=python3-silx + dh_sphinxdoc -O--buildsystem=pybuild +endif diff --git a/package/debian11/source/format b/package/debian11/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/package/debian11/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/package/debian11/source/options b/package/debian11/source/options new file mode 100644 index 0000000..6e88e49 --- /dev/null +++ b/package/debian11/source/options @@ -0,0 +1 @@ +extend-diff-ignore="^[^/]+\.egg-info/" \ No newline at end of file diff --git a/package/debian11/tests/control b/package/debian11/tests/control new file mode 100644 index 0000000..deb174c --- /dev/null +++ b/package/debian11/tests/control @@ -0,0 +1,15 @@ +Test-Command: set -efu + ; for py in $(py3versions -r 2>/dev/null) + ; do cd "$AUTOPKGTEST_TMP" + ; echo "Testing with $py:" + ; xvfb-run -a --server-args="-screen 0 1024x768x24" $py -c "import silx.test; silx.test.run_tests()" 2>&1 + ; done +Depends: python3-all, python3-silx, xauth, xvfb + +Test-Command: set -efu + ; for py in $(py3versions -r 2>/dev/null) + ; do cd "$AUTOPKGTEST_TMP" + ; echo "Testing with $py-dbg:" + ; xvfb-run -a --server-args="-screen 0 1024x768x24" $py-dbg -c "import silx.test; silx.test.run_tests()" 2>&1 + ; done +Depends: python3-all-dbg, python3-silx-dbg, xauth, xvfb diff --git a/package/debian11/watch b/package/debian11/watch new file mode 100644 index 0000000..99444f9 --- /dev/null +++ b/package/debian11/watch @@ -0,0 +1,7 @@ +version=4 +opts=repacksuffix=+dfsg,\ +pgpsigurlmangle=s/$/.asc/,\ +dversionmangle=s/\+dfsg//,\ +uversionmangle=s/(rc|a|b|c)/~$1/ \ +https://pypi.python.org/packages/source/s/@PACKAGE@/ \ + @PACKAGE@-@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate -- cgit v1.2.3