diff options
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 105 | ||||
| -rw-r--r-- | debian/gitlab-ci.yml.tpl | 3 | ||||
| -rw-r--r-- | debian/pydist-overrides | 3 | ||||
| -rw-r--r-- | debian/python-silx-doc.doc-base | 6 | ||||
| -rwxr-xr-x | debian/rules | 7 | ||||
| -rw-r--r-- | debian/tests/control | 16 |
8 files changed, 17 insertions, 133 deletions
diff --git a/debian/changelog b/debian/changelog index 3b5427f..86bdf86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +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 ] 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..e5a8e49 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 (>= 10), + debhelper-compat (= 12), 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/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 b75711c..d086f63 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 @@ -66,8 +65,6 @@ override_dh_python3: # 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: 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" @@ -80,6 +77,6 @@ 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_installdocs "doc/build/html" -p python-silx-doc --doc-main-package=python3-silx dh_sphinxdoc -O--buildsystem=pybuild endif 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:" |