remove Python2 modules

6 files changed, 5 insertions, 126 deletions

diff --git a/debian/changelog b/debian/changelog
index 11c79eb..45c8363 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 silx (0.11.0+dfsg-2) UNRELEASED; urgency=medium
 
   * Use debhelper-compat instead of debian/compat.
+  * remove Python2 modules (Closes: #938481)
 
- -- Picca Frédéric-Emmanuel <picca@debian.org>  Fri, 19 Jul 2019 16:10:37 +0200
+ -- Picca Frédéric-Emmanuel <picca@debian.org>  Sat, 19 Oct 2019 09:41:53 +0200
 
 silx (0.11.0+dfsg-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 6c8b62e..e88babe 100644
--- a/debian/control
+++ b/debian/control
@@ -5,47 +5,14 @@ Uploaders: Jerome Kieffer <jerome.kieffer@esrf.fr>,
            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),
+Build-Depends: cython3 (>= 0.23.2),
                cython3-dbg (>= 0.23.2),
                debhelper-compat (= 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,
+               pandoc <!nodoc>,
                python3-all-dbg,
                python3-all-dev,
                python3-fabio,
@@ -108,72 +75,6 @@ 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
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/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/rules b/debian/rules
index b75711c..2066404 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ ALL_PYX := $(call rwildcard,silx/,*.pyx)
 PY3VER := $(shell py3versions -dv)
 
 %:
-	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_clean:
 	dh_clean
@@ -42,7 +42,6 @@ override_dh_auto_build:
 	dh_auto_build -- -s custom --build-args="env PYTHONPATH={build_dir} {interpreter} setup.py build_man"
 
 override_dh_install:
-	dh_numpy
 	dh_numpy3
 
 	# install scripts into silx
diff --git a/debian/tests/control b/debian/tests/control
index 1e5cddf..deb174c 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,20 +1,4 @@
 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 -c "import silx.test; silx.test.run_tests()" 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 -c "import silx.test; silx.test.run_tests()" 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:"