summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog216
-rw-r--r--debian/compat1
-rw-r--r--debian/control244
-rw-r--r--debian/copyright8
-rw-r--r--debian/gitlab-ci.yml20
-rw-r--r--debian/gitlab-ci.yml.tpl3
-rw-r--r--debian/patches/0002-use-the-system-mathjax-privacy-breach.patch4
-rw-r--r--debian/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch22
-rw-r--r--debian/patches/0003-fix-unit-test.patch29
-rw-r--r--debian/patches/0004-fix-FTBFS-with-numpy-0.16.patch24
-rw-r--r--debian/patches/0007-python3.10-fix.patch42
-rw-r--r--debian/patches/0008-deal-with-h5py-until-we-solved-1051781.patch21
-rw-r--r--debian/patches/0009-Skip-testing-nanmin-on-float64-arrays-on-mips-el.patch46
-rw-r--r--debian/patches/series6
-rw-r--r--debian/pydist-overrides3
-rw-r--r--debian/python-silx-doc.doc-base6
-rwxr-xr-xdebian/rules54
-rw-r--r--debian/salsa-ci.yml7
-rw-r--r--debian/tests/control31
-rw-r--r--debian/tests/control.autodep831
-rwxr-xr-xdebian/tests/gui19
-rwxr-xr-xdebian/tests/no-opencl9
-rwxr-xr-xdebian/tests/opencl18
-rw-r--r--debian/upstream/metadata5
-rw-r--r--debian/upstream/signing-key.asc263
-rw-r--r--debian/watch1
26 files changed, 560 insertions, 573 deletions
diff --git a/debian/changelog b/debian/changelog
index 2ac45dd..aa319b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,219 @@
+silx (2.0.1+dfsg-3) unstable; urgency=medium
+
+ * d/t/gui: do not fail if the return value is 134. until we figure out
+ what is going on with mesa and xvfb.
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org> Tue, 16 Apr 2024 10:47:09 +0200
+
+silx (2.0.1+dfsg-2) unstable; urgency=medium
+
+ * d/t/control: rework the gui test in order to make it work with
+ autopkgtest. run the test but skip it.
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org> Mon, 15 Apr 2024 16:18:16 +0200
+
+silx (2.0.1+dfsg-1) unstable; urgency=medium
+
+ * New upstream version 2.0.1+dfsg
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org> Tue, 19 Mar 2024 23:02:23 +0100
+
+silx (2.0.0+dfsg-2) unstable; urgency=medium
+
+ * d/t/control: Split into opencl, no-opencl and gui scripts.
+ The opencl part is for now marked flaky.
+ * use POCL_WORK_GROUP_METHOD=cbs for tests.
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org> Mon, 11 Mar 2024 13:27:15 +0100
+
+silx (2.0.0+dfsg-1) unstable; urgency=low
+
+ * Update standards version to 4.6.2, no changes needed.
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org> Wed, 28 Feb 2024 14:49:37 +0000
+
+silx (2.0.0+dfsg-1~exp1) experimental; urgency=medium
+
+ * d/control: Hardcode the h5py dependency for now until dist-info files are
+ provided by python-h5py.
+ * d/t/control: Added a test to check that the silx view command can be started.
+ * d/t/control: Do not hide the output of the command
+ * d/rules: verbose build
+ * New upstream version 2.0.0+dfsg
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org> Tue, 06 Feb 2024 11:54:53 +0100
+
+silx (1.1.2+dfsg-2) unstable; urgency=medium
+
+ * d/control: Added B-D python3-hdf5plugin.
+ * d/p/0004-skip-two-tests.patch: removed since upstream propose somethinf equivalent.
+ * d/p/0005-removed-hdf5plugin-from-full-dependencies.patch: Removed, hdf5plugin is
+ now available in Debian.
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org> Fri, 23 Jun 2023 09:36:20 +0200
+
+silx (1.1.2+dfsg-1) unstable; urgency=medium
+
+ [ Stefano Rivera ]
+ * Edit the description of the mips*el patch, now that we understand it.
+
+ [ Picca Frédéric-Emmanuel ]
+ * New upstream release. (Closes: #966051)
+ * d/rules: set HOME to avoid FTBFS.
+ * d/control: Added B-D-I graphviz for the documentation
+ * d/t/control: set the HOME to avoid error with pytools
+ * d/t/control: Added python3-pytest-mock
+ * d/control: Added B-D pybuild-plugin-pyproject to avoid setup.py build
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org> Fri, 23 Jun 2023 09:10:22 +0200
+
+silx (1.1.0+dfsg-5) unstable; urgency=medium
+
+ * Team upload.
+ * Patch out tests that fail on mipsel / mips64el due to a numpy bug.
+
+ -- Stefano Rivera <stefanor@debian.org> Fri, 03 Feb 2023 16:46:19 -0400
+
+silx (1.1.0+dfsg-4) unstable; urgency=medium
+
+ * Team upload.
+ * Add a patch fixing the build with Python 3.11, thanks Simon Quigley.
+ (Closes: #1025183)
+
+ -- Stefano Rivera <stefanor@debian.org> Fri, 27 Jan 2023 21:20:42 -0400
+
+silx (1.1.0+dfsg-3) unstable; urgency=medium
+
+ * do not run test which use lot's of memory
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org> Fri, 04 Nov 2022 16:54:24 +0100
+
+silx (1.1.0+dfsg-2) unstable; urgency=medium
+
+ * fix a typo to avoid running test which use lot's of memory.
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org> Fri, 04 Nov 2022 15:42:11 +0100
+
+silx (1.1.0+dfsg-1) unstable; urgency=medium
+
+ * New upstream version 1.1.0+dfsg
+ * do not install the scipy_spatial COPYING file
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org> Thu, 03 Nov 2022 10:38:19 +0100
+
+silx (1.0.0+dfsg-4) unstable; urgency=medium
+
+ * Team Upload.
+ * d/salsa-ci.yml: Disable reprotest
+ * d/t/control: Skip testing on i386
+
+ -- Nilesh Patra <nilesh@debian.org> Mon, 14 Mar 2022 12:56:01 +0530
+
+silx (1.0.0+dfsg-3) unstable; urgency=medium
+
+ * Team Upload.
+ * d/t/control: Add test dep on python3-pytest (Closes: #1006690)
+ * d/t/control: Make test "not" no-op so as to wxit with
+ non-zero exit code when it fails
+ * Add patch to fix test with python3.10
+ * Add d/salsa-ci.yml
+
+ -- Nilesh Patra <nilesh@debian.org> Mon, 14 Mar 2022 02:04:04 +0530
+
+silx (1.0.0+dfsg-2) unstable; urgency=medium
+
+ * d/patches/0005-removed-hdf5plugin-from-full-dependencies.patch
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org> Thu, 10 Feb 2022 15:15:16 +0100
+
+silx (1.0.0+dfsg-1) unstable; urgency=medium
+
+ * New upstream version 1.0.0+dfsg
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org> Wed, 02 Feb 2022 14:43:11 +0100
+
+silx (0.15.2+dfsg-3) unstable; urgency=medium
+
+ * fix FTBFS by skipping two tests
+ https://github.com/silx-kit/silx/issues/3523
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org> Sun, 19 Sep 2021 16:05:34 +0200
+
+silx (0.15.2+dfsg-2) unstable; urgency=medium
+
+ * Bug fix: "Removal of the python3-*-dbg packages in sid/bookworm",
+ thanks to Matthias Klose (Closes: #994377).
+ * Bug fix: "drop unused *-dbg packages from Build-Depends", thanks to
+ Helmut Grohne (Closes: #980417).
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org> Sun, 19 Sep 2021 14:07:44 +0200
+
+silx (0.14.0+dfsg-1) unstable; urgency=medium
+
+ * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, Repository-Browse.
+ * Update standards version to 4.5.0, no changes needed.
+ * d/u/signing-key.asc: Added Pierre Paleo gpg key.
+ * New upstream version 0.14.0+dfsg
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org> Wed, 06 Jan 2021 15:17:45 +0100
+
+silx (0.13.1+dfsg-1) unstable; urgency=medium
+
+ * New upstream version 0.13.1+dfsg (Closes: #966933)
+ * d/control: Standards-Version bumped to 4.1.3 (nothing to do)
+ * d/control: Rules-Requires-Root: no
+ * Demote documentation dependencies to B-D-I. (Closes: #946110)
+ Thanks Helmut Grohne for the patch
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org> Tue, 04 Aug 2020 10:25:26 +0200
+
+silx (0.12.0+dfsg-1) unstable; urgency=medium
+
+ * New upstream version 0.12.0+dfsg
+
+ -- Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> Thu, 30 Jan 2020 11:48:55 +0100
+
+silx (0.11.0+dfsg-3) unstable; urgency=medium
+
+ * d/control: Build-Depends on python3-qtconsole(Closes: #946571).
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org> 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 <picca@debian.org> 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 <picca@debian.org> 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 <picca@synchrotron-soleil.fr> 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 <picca@debian.org> 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.
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 0d43d0b..222230c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,91 +1,61 @@
Source: silx
Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
-Uploaders: Jerome Kieffer <jerome.kieffer@esrf.fr>,
- Picca Frédéric-Emmanuel <picca@debian.org>,
- Alexandre Marie <alexandre.marie@synchrotron-soleil.fr>
+Uploaders:
+ Jerome Kieffer <jerome.kieffer@esrf.fr>,
+ Picca Frédéric-Emmanuel <picca@debian.org>,
+ Alexandre Marie <alexandre.marie@synchrotron-soleil.fr>,
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,
- pandoc <!nodoc>,
- python-all-dbg,
- python-all-dev,
- python-concurrent.futures,
- python-fabio,
- python-fabio-dbg,
- python-h5py,
- python-h5py-dbg,
- python-mako,
- python-matplotlib,
- python-matplotlib-dbg,
- python-nbsphinx <!nodoc>,
- 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-nbsphinx <!nodoc>,
- 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.1.3
+Build-Depends:
+ cython3,
+ debhelper-compat (= 13),
+ dh-python,
+ dh-sequence-numpy3,
+ dh-sequence-python3,
+ help2man,
+ ipython3,
+ pybuild-plugin-pyproject,
+ python3-all-dev,
+ python3-fabio,
+ python3-h5py,
+ python3-hdf5plugin,
+ python3-mako,
+ python3-matplotlib,
+ python3-numpy,
+ python3-opengl,
+ python3-pil,
+ python3-pyopencl,
+ python3-pyqt5,
+ python3-pyqt5.qtopengl,
+ python3-pyqt5.qtsvg,
+ python3-pytest <!nocheck>,
+ python3-qtconsole,
+ python3-scipy,
+ python3-setuptools,
+ xauth,
+ xvfb,
+Build-Depends-Indep:
+ dh-sequence-sphinxdoc <!nodoc>,
+ graphviz <!nodoc>,
+ pandoc <!nodoc>,
+ python3-nbsphinx <!nodoc>,
+ python3-pydata-sphinx-theme <!nodoc>,
+ python3-sphinx,
+ python3-sphinx-panels,
+ python3-sphinxcontrib.programoutput,
+Standards-Version: 4.6.2
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
+Rules-Requires-Root: no
Package: silx
Architecture: all
-Depends: python3-silx (>= ${source:Version}),
- ${misc:Depends},
- ${python3:Depends},
- ${shlibs:Depends}
+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
@@ -108,76 +78,14 @@ Description: Toolbox for X-Ray data analysis - Executables
.
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-fabio-dbg,
- python-h5py-dbg,
- python-lxml-dbg,
- python-matplotlib-dbg,
- python-numpy-dbg,
- python-pil-dbg,
- python-pyopencl-dbg,
- python-pyqt5-dbg,
- python-pyqt5.qtopengl-dbg,
- python-pyqt5.qtsvg-dbg,
- python-scipy-dbg,
- 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}
+Depends:
+ ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends},
+ python3-h5py
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
@@ -200,50 +108,14 @@ Description: Toolbox for X-Ray data analysis - Python3
.
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}
+Depends:
+ libjs-mathjax,
+ ${misc:Depends},
+ ${sphinxdoc:Depends},
+Multi-Arch: foreign
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
diff --git a/debian/copyright b/debian/copyright
index f0510f5..548070c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,12 @@
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
- silx/third_party/_local
+Files-Excluded: src/silx/opencl/sift
+ src/silx/resources/opencl/sift
+ src/silx/third_party/_local
Files: *
-Copyright: 2004-2017 European Synchrotron Radiation Facility
+Copyright: 2004-2017, 2022 European Synchrotron Radiation Facility
Data analysis unit (silx@esrf.fr)
License: Expat
diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml
index b7dc52a..33c3a64 100644
--- a/debian/gitlab-ci.yml
+++ b/debian/gitlab-ci.yml
@@ -1,16 +1,4 @@
-include: https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
-
-build:
- extends: .build-unstable
-
-reprotest:
- extends: .test-reprotest
-
-lintian:
- extends: .test-lintian
-
-autopkgtest:
- extends: .test-autopkgtest
-
-piuparts:
- extends: .test-piuparts
+---
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
diff --git a/debian/gitlab-ci.yml.tpl b/debian/gitlab-ci.yml.tpl
deleted file mode 100644
index eeb89b6..0000000
--- a/debian/gitlab-ci.yml.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-include: https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
-
-# end of salsa pipeline bot parser
diff --git a/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch b/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch
index 641d90a..c42bfcf 100644
--- a/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch
+++ b/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch
@@ -8,10 +8,10 @@ Subject: use the system mathjax (privacy breach)
1 file changed, 5 insertions(+)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 23efd15..532f6bf 100644
+index b412a1d..1f421fe 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
-@@ -142,6 +142,11 @@ pygments_style = 'sphinx'
+@@ -154,6 +154,11 @@ pygments_style = "sphinx"
# A list of ignored prefixes for module index sorting.
# modindex_common_prefix = []
diff --git a/debian/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch b/debian/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch
deleted file mode 100644
index f4bbf44..0000000
--- a/debian/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca@debian.org>
-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 5ce0435..40b2e8e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -257,7 +257,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/debian/patches/0003-fix-unit-test.patch b/debian/patches/0003-fix-unit-test.patch
deleted file mode 100644
index 07523e7..0000000
--- a/debian/patches/0003-fix-unit-test.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
- <picca@synchrotron-soleil.fr>
-Date: Fri, 11 Aug 2017 10:15:26 +0200
-Subject: fix unit test
-
----
- silx/opencl/common.py | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/silx/opencl/common.py b/silx/opencl/common.py
-index 9a04035..17c67d1 100644
---- a/silx/opencl/common.py
-+++ b/silx/opencl/common.py
-@@ -61,7 +61,14 @@ else:
- pyopencl = None
- 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
-
- if pyopencl is None:
- # Define default mem flags
diff --git a/debian/patches/0004-fix-FTBFS-with-numpy-0.16.patch b/debian/patches/0004-fix-FTBFS-with-numpy-0.16.patch
deleted file mode 100644
index bcc32ad..0000000
--- a/debian/patches/0004-fix-FTBFS-with-numpy-0.16.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
- <picca@synchrotron-soleil.fr>
-Date: Thu, 21 Feb 2019 11:04:02 +0100
-Subject: fix FTBFS with numpy 0.16
-
----
- setup.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 40b2e8e..9f6ae13 100644
---- a/setup.py
-+++ b/setup.py
-@@ -614,8 +614,8 @@ class BuildExt(build_ext):
- extern = 'extern "C" ' if ext.language == 'c++' else ''
- return_type = 'void' if sys.version_info[0] <= 2 else 'PyObject*'
-
-- ext.extra_compile_args.append(
-- '''-fvisibility=hidden -D'PyMODINIT_FUNC=%s__attribute__((visibility("default"))) %s ' ''' % (extern, return_type))
-+ # ext.extra_compile_args.append(
-+ # '''-fvisibility=hidden -D'PyMODINIT_FUNC=%s__attribute__((visibility("default"))) %s ' ''' % (extern, return_type))
-
- def is_debug_interpreter(self):
- """
diff --git a/debian/patches/0007-python3.10-fix.patch b/debian/patches/0007-python3.10-fix.patch
new file mode 100644
index 0000000..a4e54e9
--- /dev/null
+++ b/debian/patches/0007-python3.10-fix.patch
@@ -0,0 +1,42 @@
+From: Nilesh Patra <nilesh@debian.org>
+Date: Sun, 13 Mar 2022 03:37:32 +0100
+Subject: Fix int compare with python3.10, skip a couple of tests
+
+---
+ src/silx/app/view/About.py | 2 +-
+ src/silx/opencl/test/test_medfilt.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/silx/app/view/About.py b/src/silx/app/view/About.py
+index 76e0cf2..350337d 100644
+--- a/src/silx/app/view/About.py
++++ b/src/silx/app/view/About.py
+@@ -250,7 +250,7 @@ class About(qt.QDialog):
+ width = hardLimit
+
+ height = layoutMinimumSize.height()
+- self.setFixedSize(width, height)
++ self.setFixedSize(int(width), int(height))
+
+ @staticmethod
+ def about(parent, applicationName):
+diff --git a/src/silx/opencl/test/test_medfilt.py b/src/silx/opencl/test/test_medfilt.py
+index 2ef4490..15cd749 100644
+--- a/src/silx/opencl/test/test_medfilt.py
++++ b/src/silx/opencl/test/test_medfilt.py
+@@ -40,6 +40,7 @@ import time
+ import logging
+ import numpy
+ import unittest
++
+ from collections import namedtuple
+
+ try:
+@@ -77,7 +78,6 @@ except:
+ HAS_SCIPY = False
+ from silx.math import medfilt2d as median_filter
+
+-
+ @unittest.skipUnless(ocl and mako, "PyOpenCl is missing")
+ class TestMedianFilter(unittest.TestCase):
+ def setUp(self):
diff --git a/debian/patches/0008-deal-with-h5py-until-we-solved-1051781.patch b/debian/patches/0008-deal-with-h5py-until-we-solved-1051781.patch
new file mode 100644
index 0000000..40716ad
--- /dev/null
+++ b/debian/patches/0008-deal-with-h5py-until-we-solved-1051781.patch
@@ -0,0 +1,21 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca@debian.org>
+Date: Tue, 19 Sep 2023 15:10:58 +0200
+Subject: deal with h5py until we solved #1051781
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 06ed4f4..525e7c9 100644
+--- a/setup.py
++++ b/setup.py
+@@ -170,7 +170,7 @@ def get_project_configuration():
+ # for version parsing
+ "packaging",
+ # for io support
+- "h5py",
++ # "h5py",
+ "fabio>=0.9",
+ ]
+ if sys.version_info < (3, 9):
diff --git a/debian/patches/0009-Skip-testing-nanmin-on-float64-arrays-on-mips-el.patch b/debian/patches/0009-Skip-testing-nanmin-on-float64-arrays-on-mips-el.patch
new file mode 100644
index 0000000..6ef70a0
--- /dev/null
+++ b/debian/patches/0009-Skip-testing-nanmin-on-float64-arrays-on-mips-el.patch
@@ -0,0 +1,46 @@
+From: Stefano Rivera <stefanor@debian.org>
+Date: Fri, 3 Feb 2023 15:34:10 -0400
+Subject: Skip testing nanmin() on float64 arrays on mips*el
+
+There was an ABI break in NAN handling on MIPS that hasn't been fully
+dealt with, yet. See:
+https://sourceware.org/binutils/docs/as/MIPS-NaN-Encodings.html
+
+Discussion in the numpy bug: https://github.com/numpy/numpy/issues/23158
+---
+ src/silx/math/test/test_combo.py | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/silx/math/test/test_combo.py b/src/silx/math/test/test_combo.py
+index 917be55..1057344 100644
+--- a/src/silx/math/test/test_combo.py
++++ b/src/silx/math/test/test_combo.py
+@@ -27,6 +27,8 @@ __license__ = "MIT"
+ __date__ = "17/01/2018"
+
+
++import sys
++
+ import numpy
+
+ from silx.utils.testutils import ParametricTestCase
+@@ -161,6 +163,9 @@ class TestMinMax(ParametricTestCase):
+ def test_nandata(self):
+ """Test min_max with NaN in data"""
+ for dtype in self.FLOATING_DTYPES:
++ if dtype == 'float64' and sys.implementation._multiarch in (
++ 'mips64el-linux-gnuabi64', 'mipsel-linux-gnu'):
++ continue
+ for data in self.NAN_TEST_DATA:
+ with self.subTest(dtype=dtype, data=data):
+ data = numpy.array(data, dtype=dtype)
+@@ -178,6 +183,9 @@ class TestMinMax(ParametricTestCase):
+ def test_infdata(self):
+ """Test min_max with inf."""
+ for dtype in self.FLOATING_DTYPES:
++ if dtype == 'float64' and sys.implementation._multiarch in (
++ 'mips64el-linux-gnuabi64', 'mipsel-linux-gnu'):
++ continue
+ for data in self.INF_TEST_DATA:
+ with self.subTest(dtype=dtype, data=data):
+ data = numpy.array(data, dtype=dtype)
diff --git a/debian/patches/series b/debian/patches/series
index 57660df..9454aee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
0002-use-the-system-mathjax-privacy-breach.patch
-0003-fix-unit-test.patch
-0003-do-not-modify-PYTHONPATH-from-setup.py.patch
-0004-fix-FTBFS-with-numpy-0.16.patch
+0007-python3.10-fix.patch
+0009-Skip-testing-nanmin-on-float64-arrays-on-mips-el.patch
+0008-deal-with-h5py-until-we-solved-1051781.patch
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
deleted file mode 100644
index 4a84372..0000000
--- a/debian/pydist-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-pyqt5 python-pyqt5,python-pyqt5.qtopengl,python-pyqt5.qtsvg
-enum34_python_version python-enum34
-futures_python_version python-concurrent.futures
diff --git a/debian/python-silx-doc.doc-base b/debian/python-silx-doc.doc-base
index b290d8a..c8efa7f 100644
--- a/debian/python-silx-doc.doc-base
+++ b/debian/python-silx-doc.doc-base
@@ -1,9 +1,9 @@
Document: silx-manual
Title: silx documentation manual
Author: Jérôme Kieffer <jerome.kieffer@esrf.eu>
-Abstract: Toolbox for X-Ray data analysis
+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/*
+Index: /usr/share/doc/python3-silx/html/index.html
+Files: /usr/share/doc/python3-silx/html/*
diff --git a/debian/rules b/debian/rules
index 501910c..d0950af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,13 @@
#!/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 DH_VERBOSE=1
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
+export HOME=$(CURDIR)/debian/build
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -23,10 +22,9 @@ ALL_PYX := $(call rwildcard,silx/,*.pyx)
PY3VER := $(shell py3versions -dv)
%:
- dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+ dh $@ --buildsystem=pybuild
-override_dh_clean:
- dh_clean
+execute_after_dh_clean:
# remove the cython generated file to force rebuild
rm -f $(patsubst %.pyx,%.cpp,${ALL_PYX})
rm -f $(patsubst %.pyx,%.c,${ALL_PYX})
@@ -35,15 +33,16 @@ override_dh_clean:
rm -rf build/man
rm -rf *.egg-info
-override_dh_auto_build:
- dh_auto_build
+execute_after_dh_auto_build-indep:
# build man pages
- dh_auto_build -- -s custom --build-args="env PYTHONPATH={build_dir} {interpreter} setup.py build_man"
+ pybuild --build -s custom -p $(PY3VER) --build-args="env PYTHONPATH={build_dir} {interpreter} tools/build_man_page.py"
-override_dh_install:
- dh_numpy
- dh_numpy3
+ # build the documentation
+ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
+ 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"
+endif
+execute_before_dh_install:
# install scripts into silx
python3 setup.py install_scripts -d debian/silx/usr/bin
dh_install -p silx package/desktop/*.desktop usr/share/applications
@@ -54,31 +53,22 @@ override_dh_install:
# 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
+# SILX_TEST_LOW_MEM=False 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:
-# 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 -vv --installed"
+ GPU=False WITH_QT_TEST=False SILX_OPENCL=False SILX_TEST_LOW_MEM=False \
+ dh_auto_test
+
+execute_after_dh_installdocs:
+ dh_installdocs -p python-silx-doc "doc/build/html" --doc-main-package=python3-silx
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
- dh_sphinxdoc -O--buildsystem=pybuild
-endif
+override_dh_python3:
+ -rm -f `find . -name "core"`
+ dh_python3 --depends-section=full
+ dh_python3 -p python3-silx /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/plugins/designer/python
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
new file mode 100644
index 0000000..1e7946b
--- /dev/null
+++ b/debian/salsa-ci.yml
@@ -0,0 +1,7 @@
+---
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
+variables:
+ SALSA_CI_DISABLE_REPROTEST: 1
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..f849f55
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,31 @@
+Tests: no-opencl
+Depends:
+ @,
+ python3-all,
+ python3-pytest,
+ python3-pytest-mock,
+ python3-pytest-xvfb,
+ xauth,
+ xvfb,
+Restrictions: allow-stderr
+
+Tests: opencl
+Depends:
+ @,
+ clinfo,
+ python3-all,
+ python3-pytest,
+ python3-pytest-mock,
+ python3-pytest-xvfb,
+ xauth,
+ xvfb,
+Architecture: !i386
+Restrictions: allow-stderr
+
+Test-Command: xvfb-run -s "-screen 0 1024x768x24 -ac +extension GLX +render -noreset" sh debian/tests/gui
+Depends:
+ mesa-utils,
+ silx,
+ xauth,
+ xvfb,
+Restrictions: allow-stderr
diff --git a/debian/tests/control.autodep8 b/debian/tests/control.autodep8
deleted file mode 100644
index 5ffa42b..0000000
--- a/debian/tests/control.autodep8
+++ /dev/null
@@ -1,31 +0,0 @@
-Test-Command: set -efu
- ; for py in $(pyversions -r 2>/dev/null)
- ; do cd "$AUTOPKGTEST_TMP"
- ; echo "Testing with $py:"
- ; xvfb-run -a --server-args="-screen 0 1024x768x24" $py -m unittest discover silx 2>&1
- ; done
-Depends: python-all, python-silx, xauth, xvfb
-
-Test-Command: set -efu
- ; for py in $(pyversions -r 2>/dev/null)
- ; do cd "$AUTOPKGTEST_TMP"
- ; echo "Testing with $py-dbg:"
- ; xvfb-run -a --server-args="-screen 0 1024x768x24" $py-dbg -m unittest discover silx 2>&1
- ; done
-Depends: python-all-dbg, python-silx-dbg, xauth, xvfb
-
-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 -m unittest discover silx 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 -m unittest discover silx 2>&1
- ; done
-Depends: python3-all-dbg, python3-silx-dbg, xauth, xvfb
diff --git a/debian/tests/gui b/debian/tests/gui
new file mode 100755
index 0000000..f5c0a5b
--- /dev/null
+++ b/debian/tests/gui
@@ -0,0 +1,19 @@
+#!/bin/sh -ex
+
+# display glxinfo
+
+glxinfo
+
+# Check that the GUI can be started
+
+timeout --preserve-status 5s silx view
+ec=$?
+
+# do not fail if the exit code is 143, it seems that there is an
+# issue with mesa 16/04/2024.
+
+if [ $ec -eq 143 ]; then
+ exit 0;
+else
+ exit $ec;
+fi
diff --git a/debian/tests/no-opencl b/debian/tests/no-opencl
new file mode 100755
index 0000000..0041789
--- /dev/null
+++ b/debian/tests/no-opencl
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+# run most of the test suite without the OpenCL part
+
+for py in $(py3versions -r 2>/dev/null)
+do cd "$AUTOPKGTEST_TMP"
+ echo "Testing with $py:"
+ HOME="$AUTOPKGTEST_TMP" SILX_OPENCL=False SILX_TEST_LOW_MEM=False xvfb-run -a --server-args="-screen 0 1024x768x24" $py -c "import sys; import silx.test; sys.exit(silx.test.run_tests())" 2>&1
+done
diff --git a/debian/tests/opencl b/debian/tests/opencl
new file mode 100755
index 0000000..174bf4f
--- /dev/null
+++ b/debian/tests/opencl
@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+# Check that OpenCL isn't totally broken (note that it isn't totally working either)
+# Uses device 0 platform 0, i.e. to use a real GPU manually install its opencl-icd before running this
+# Mark the test has flaky, the important part is the CPU computation.
+
+# display the OpenCL platform info
+
+clinfo
+
+# until we solved https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1060318
+export POCL_WORK_GROUP_METHOD=cbs
+
+for py in $(py3versions -r 2>/dev/null)
+do cd "$AUTOPKGTEST_TMP"
+ echo "Testing with $py:"
+ HOME="$AUTOPKGTEST_TMP" WITH_QT_TEST=False SILX_TEST_LOW_MEM=False xvfb-run -a --server-args="-screen 0 1024x768x24" $py -c "import sys; import silx.test; sys.exit(silx.test.run_tests())" 2>&1
+done
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 0000000..fc9a3a3
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://github.com/silx-kit/silx/issues
+Bug-Submit: https://github.com/silx-kit/silx/issues/new
+Repository: https://github.com/silx-kit/silx.git
+Repository-Browse: https://github.com/silx-kit/silx
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 698218a..6fb0a40 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -1,217 +1,52 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-mQINBFhBdK4BEADKerSWynw8GQzpKXJwLu9e/YylaVn3SwkC/ThiZn5/fsiPCNs7
-kSED0zIf9jo8Cqlk2Fp6zIOCOG3J8olaB8wqOiTzfY6KzAgTedbS12vLe0CX9L4V
-TVVbbUipHTaktn0ZyULymdrwLUd5x7Hz6uhnUNnbk3xFM+N+jwEFEXFkRw72JtWH
-K7X5/+DflNS7zLTA0zV13GG4K8/H/INq86ZSdN6oh3DLfvSxorM0acy+qGPz5C3K
-9NCDpCOBvYrG2Kk2xTfx9fL9lmzSSzP3O3/LoVe1ylDJxJB6uC1v4beR3fTCQ9nZ
-22tqKL9VB9F8S4MjmT48uvaOGTb2Ow82AL+1z+vVNa2MhdOCOhflls71x5ymsAbJ
-5gZtNkDMobdqAYjcuIq3jtrPS8dzzpMkZ5yLGEjUb65PZp+GtYLRhRzNOOA2Xbzk
-DU0RcLLjYFSkGEt2rxDXlUwO3N1Dv+smZIj0Ata23pJB6P1KIvJrdZo5X5c0ZWzy
-SwKt/xnzdPlNc94Oi0priyUmPEKtEjCtKI/6yEriJTkvqqjBjLwDXR69jTWkPUip
-FbUUNirXFKaTXg7B9NUV/2P/OB1qM0PWEqhpuGSwqdn3CG9ABmlxgfVOjZLZphHK
-ami2x+GsTnWMLkjmIGH1L6ka1l79Xm9//iEseIXlLcbtf5fEzcTr/VoEuQARAQAB
-tCdWYWxlbnRpbiBWYWxscyA8dmFsZW50aW4udmFsbHNAZXNyZi5mcj6JAj0EEwEI
-ACcFAlhBdK4CGwMFCQWjmoAFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQhSMf
-2ZzDPpHI6RAAtJj90WAP31lNXGWYFPjynDosC6/4T0zsnNO2+9q/KDoN5Z1vILX4
-pJodN9DApyCZ4iZNVnwaaIH15MNmTM2YpO0vC32DniGd0cssiiBP2+WIc9pJKZJA
-Sro8vUXoE12412KKrG+WqQLoOUP31fVo39UEzlMh/NxYCW/R8r0rFBR+8bve3fvn
-nFLF1SpzFZ1Tr18bOT1vhmeOqSMShoDdfkXM+F/C0U+AGWbvxVZuT6jr83oR5XjR
-RODs6F0yYKWPMyQBMzft4oYa7NAsjsGHJExiHyltJnCuKF3PineKiLDQYx0jdqkB
-qKEA/0u0MWd6mQdYydyhReJHMXTxcaSM3+LFLlxHtO9+V5T1HgZdV4eFGNFhRYA6
-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
-LokEJwI+XhTYfnftnTA=
-=DZLD
+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
+nb7YbK8=
+=gXaR
-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 99444f9..d221e62 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,7 @@
version=4
opts=repacksuffix=+dfsg,\
pgpsigurlmangle=s/$/.asc/,\
+pgpmode=none,\
dversionmangle=s/\+dfsg//,\
uversionmangle=s/(rc|a|b|c)/~$1/ \
https://pypi.python.org/packages/source/s/@PACKAGE@/ \