diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 14 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rw-r--r-- | debian/gitlab-ci.yml | 16 | ||||
| -rw-r--r-- | debian/gitlab-ci.yml.tpl | 3 | ||||
| -rw-r--r-- | debian/patches/0002-use-the-system-mathjax-privacy-breach.patch | 2 | ||||
| -rw-r--r-- | debian/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch | 2 | ||||
| -rw-r--r-- | debian/patches/0003-fix-unit-test.patch | 2 | ||||
| -rw-r--r-- | debian/patches/0007-add-install_requires-dependencies.patch | 39 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/tests/control.autodep8 | 31 | ||||
| -rw-r--r-- | debian/watch | 3 |
11 files changed, 71 insertions, 48 deletions
diff --git a/debian/changelog b/debian/changelog index 472053a..cff8d61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +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 <alexandre.marie@synchrotron-soleil.fr> Mon, 17 Dec 2018 13:25:52 +0100 + silx (0.8.0+dfsg-1) unstable; urgency=medium * New upstream version 0.8.0+dfsg diff --git a/debian/control b/debian/control index f394e6b..0d43d0b 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ 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> + 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), @@ -19,13 +20,10 @@ Build-Depends: cython (>= 0.23.2), python-all-dbg, python-all-dev, python-concurrent.futures, - python-enum34, python-fabio, python-fabio-dbg, python-h5py, python-h5py-dbg, - python-lxml, - python-lxml-dbg, python-mako, python-matplotlib, python-matplotlib-dbg, diff --git a/debian/gitlab-ci.yml b/debian/gitlab-ci.yml new file mode 100644 index 0000000..b7dc52a --- /dev/null +++ b/debian/gitlab-ci.yml @@ -0,0 +1,16 @@ +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 diff --git a/debian/gitlab-ci.yml.tpl b/debian/gitlab-ci.yml.tpl new file mode 100644 index 0000000..eeb89b6 --- /dev/null +++ b/debian/gitlab-ci.yml.tpl @@ -0,0 +1,3 @@ +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 d1fa79d..641d90a 100644 --- a/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch +++ b/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch @@ -8,7 +8,7 @@ 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 234e4fa..ab5e24b 100644 +index 23efd15..532f6bf 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -142,6 +142,11 @@ pygments_style = 'sphinx' 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 index 9a82a2b..f4bbf44 100644 --- a/debian/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch +++ b/debian/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch @@ -7,7 +7,7 @@ Subject: do not modify PYTHONPATH from setup.py 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 69a6dca..bc7ea27 100644 +index 5ce0435..40b2e8e 100644 --- a/setup.py +++ b/setup.py @@ -257,7 +257,8 @@ class BuildMan(Command): diff --git a/debian/patches/0003-fix-unit-test.patch b/debian/patches/0003-fix-unit-test.patch index ceaebf4..07523e7 100644 --- a/debian/patches/0003-fix-unit-test.patch +++ b/debian/patches/0003-fix-unit-test.patch @@ -8,7 +8,7 @@ Subject: fix unit test 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/silx/opencl/common.py b/silx/opencl/common.py -index e955f46..07159e2 100644 +index 9a04035..17c67d1 100644 --- a/silx/opencl/common.py +++ b/silx/opencl/common.py @@ -61,7 +61,14 @@ else: diff --git a/debian/patches/0007-add-install_requires-dependencies.patch b/debian/patches/0007-add-install_requires-dependencies.patch deleted file mode 100644 index 940ac56..0000000 --- a/debian/patches/0007-add-install_requires-dependencies.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= - <picca@synchrotron-soleil.fr> -Date: Thu, 17 Aug 2017 09:30:39 +0200 -Subject: add install_requires dependencies - ---- - setup.py | 19 ++++++++++++++++++- - 1 file changed, 18 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index bc7ea27..8c4dd3d 100644 ---- a/setup.py -+++ b/setup.py -@@ -857,7 +857,24 @@ def get_project_configuration(dry_run): - # for most of the computation - "numpy %s" % numpy_requested_version, - # for the script launcher -- "setuptools"] -+ "setuptools", -+ # Debian added -+ 'futures;python_version<"3.2"', -+ "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 index 40de024..168097d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 0002-use-the-system-mathjax-privacy-breach.patch 0003-fix-unit-test.patch 0003-do-not-modify-PYTHONPATH-from-setup.py.patch -0007-add-install_requires-dependencies.patch diff --git a/debian/tests/control.autodep8 b/debian/tests/control.autodep8 new file mode 100644 index 0000000..5ffa42b --- /dev/null +++ b/debian/tests/control.autodep8 @@ -0,0 +1,31 @@ +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/watch b/debian/watch index d2115e7..99444f9 100644 --- a/debian/watch +++ b/debian/watch @@ -1,6 +1,7 @@ version=4 opts=repacksuffix=+dfsg,\ pgpsigurlmangle=s/$/.asc/,\ -dversionmangle=s/\+dfsg// \ +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 |