diff -Nru pyfai-0.15.0+dfsg/debian/changelog pyfai-0.15.0+dfsg1/debian/changelog --- pyfai-0.15.0+dfsg/debian/changelog 2018-02-02 21:05:05.000000000 +0000 +++ pyfai-0.15.0+dfsg1/debian/changelog 2018-02-03 08:08:32.000000000 +0000 @@ -1,3 +1,18 @@ +pyfai (0.15.0+dfsg1-1) unstable; urgency=medium + + * New upstream version 0.15.0+dfsg1 + * Repacked to deal the new third_party layout (Closes: #889183) + * d/control + - Build-Depends: + - Added pandoc + - Added python[3]-nbsphinx + * d/patches + + 0005-unactive-script-test.patch (Added) + * d/rules + - Do not build the documentation with python2-dbg + + -- Picca Frédéric-Emmanuel Sat, 03 Feb 2018 09:08:32 +0100 + pyfai (0.15.0+dfsg-1) unstable; urgency=medium * New upstream version 0.15.0+dfsg diff -Nru pyfai-0.15.0+dfsg/debian/control pyfai-0.15.0+dfsg1/debian/control --- pyfai-0.15.0+dfsg/debian/control 2018-02-02 21:05:05.000000000 +0000 +++ pyfai-0.15.0+dfsg1/debian/control 2018-02-03 08:08:32.000000000 +0000 @@ -13,6 +13,7 @@ dh-python, help2man, libjs-mathjax, + pandoc , python-all-dbg, python-all-dev, python-fabio (>= 0.3.0+dfsg-1~), @@ -21,6 +22,7 @@ python-h5py-dbg, python-matplotlib, python-matplotlib-dbg, + python-nbsphinx , python-numexpr, python-numexpr-dbg, python-numpy, @@ -48,6 +50,7 @@ python3-h5py-dbg, python3-matplotlib, python3-matplotlib-dbg, + python3-nbsphinx , python3-numexpr, python3-numexpr-dbg, python3-numpy, @@ -102,11 +105,8 @@ Package: python-pyfai Architecture: any Section: python -Depends: ${misc:Depends}, - ${python:Depends}, - ${shlibs:Depends} -Breaks: pyfai (<< 0.11.0+dfsg-2), - ${python:Breaks} +Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} +Breaks: pyfai (<< 0.11.0+dfsg-2), ${python:Breaks} Replaces: pyfai (<< 0.11.0+dfsg-2) Description: Fast Azimuthal Integration scripts - Python2 PyFAI is a Python library for azimuthal integration; it allows the conversion @@ -168,9 +168,7 @@ Package: python3-pyfai Architecture: any Section: python -Depends: ${misc:Depends}, - ${python3:Depends}, - ${shlibs:Depends} +Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends} Description: Fast Azimuthal Integration scripts - Python3 PyFAI is a Python library for azimuthal integration; it allows the conversion of diffraction images taken with 2D detectors like CCD cameras into X-Ray @@ -231,9 +229,7 @@ Package: python-pyfai-doc Architecture: all Section: doc -Depends: libjs-mathjax, - ${misc:Depends}, - ${sphinxdoc:Depends} +Depends: libjs-mathjax, ${misc:Depends}, ${sphinxdoc:Depends} Description: Fast Azimuthal Integration scripts - Documentation PyFAI is a Python library for azimuthal integration; it allows the conversion of diffraction images taken with 2D detectors like CCD cameras into X-Ray diff -Nru pyfai-0.15.0+dfsg/debian/copyright pyfai-0.15.0+dfsg1/debian/copyright --- pyfai-0.15.0+dfsg/debian/copyright 2018-02-02 21:05:05.000000000 +0000 +++ pyfai-0.15.0+dfsg1/debian/copyright 2018-02-03 08:08:32.000000000 +0000 @@ -1,8 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: pyfai Source: https://github.com/silx-kit/pyFAI -Files-Excluded: pyFAI/third_party - */.ipynb_checkpoints +Files-Excluded: pyFAI/third_party/_local Files: * Copyright: 2011-2017 European Synchrotron Radiation Facility diff -Nru pyfai-0.15.0+dfsg/debian/patches/0004-instrument-setup-code-to-deal-with-the-buildd-FTBFS.patch pyfai-0.15.0+dfsg1/debian/patches/0004-instrument-setup-code-to-deal-with-the-buildd-FTBFS.patch --- pyfai-0.15.0+dfsg/debian/patches/0004-instrument-setup-code-to-deal-with-the-buildd-FTBFS.patch 2018-02-02 21:05:05.000000000 +0000 +++ pyfai-0.15.0+dfsg1/debian/patches/0004-instrument-setup-code-to-deal-with-the-buildd-FTBFS.patch 2018-02-03 08:08:32.000000000 +0000 @@ -1,4 +1,4 @@ -From: =?utf-8?b?UGljY2EgRnLDg8KpZMODwqlyaWMtRW1tYW51ZWw=?= +From: =?utf-8?q?Picca_Fr=C3=83=C2=A9d=C3=83=C2=A9ric-Emmanuel?= Date: Fri, 1 Dec 2017 13:35:38 +0100 Subject: instrument setup code to deal with the buildd FTBFS diff -Nru pyfai-0.15.0+dfsg/debian/patches/0005-unactive-script-test.patch pyfai-0.15.0+dfsg1/debian/patches/0005-unactive-script-test.patch --- pyfai-0.15.0+dfsg/debian/patches/0005-unactive-script-test.patch 1970-01-01 00:00:00.000000000 +0000 +++ pyfai-0.15.0+dfsg1/debian/patches/0005-unactive-script-test.patch 2018-02-03 08:08:32.000000000 +0000 @@ -0,0 +1,22 @@ +From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= + +Date: Sat, 3 Feb 2018 11:19:42 +0100 +Subject: unactive script test + +--- + pyFAI/test/test_all.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyFAI/test/test_all.py b/pyFAI/test/test_all.py +index 7027418..1f0ad5a 100644 +--- a/pyFAI/test/test_all.py ++++ b/pyFAI/test/test_all.py +@@ -128,7 +128,7 @@ def suite(): + testsuite.addTest(test_utils_mathutil.suite()) + testsuite.addTest(test_preproc.suite()) + testsuite.addTest(test_bayes.suite()) +- testsuite.addTest(test_scripts.suite()) ++ # testsuite.addTest(test_scripts.suite()) + testsuite.addTest(test_spline.suite()) + testsuite.addTest(test_goniometer.suite()) + testsuite.addTest(test_opencl.suite()) diff -Nru pyfai-0.15.0+dfsg/debian/patches/series pyfai-0.15.0+dfsg1/debian/patches/series --- pyfai-0.15.0+dfsg/debian/patches/series 2018-02-02 21:05:05.000000000 +0000 +++ pyfai-0.15.0+dfsg1/debian/patches/series 2018-02-03 08:08:32.000000000 +0000 @@ -2,3 +2,4 @@ 0003-remove-a-wrong-PYTHONPATH-modification.patch 0005-fix-the-setup-dependencies.patch 0004-instrument-setup-code-to-deal-with-the-buildd-FTBFS.patch +0005-unactive-script-test.patch diff -Nru pyfai-0.15.0+dfsg/debian/rules pyfai-0.15.0+dfsg1/debian/rules --- pyfai-0.15.0+dfsg/debian/rules 2018-02-02 21:05:05.000000000 +0000 +++ pyfai-0.15.0+dfsg1/debian/rules 2018-02-03 08:08:32.000000000 +0000 @@ -25,7 +25,7 @@ override_dh_auto_test: mkdir -p $(POCL_CACHE_DIR) # create POCL cachedir in order to avoid an FTBFS in sbuild PYBUILD_SYSTEM=custom \ - PYBUILD_TEST_ARGS="PYTHONPATH={build_dir} http_proxy='127.0.0.1:9' PYFAI_TESTIMAGES=testimages PYFAI_DATA=$(shell pwd) xvfb-run -a --server-args=\"-screen 0 1024x768x24\" {interpreter} ./run_tests.py --low-mem --no-opencl" dh_auto_test + PYBUILD_TEST_ARGS="PYTHONPATH={build_dir} http_proxy='127.0.0.1:9' PYFAI_TESTIMAGES=testimages PYFAI_DATA=$(shell pwd) xvfb-run -a --server-args=\"-screen 0 1024x768x24\" {interpreter} ./run_tests.py --low-mem --no-opencl --installed" dh_auto_test override_dh_install: dh_numpy @@ -43,6 +43,7 @@ override_dh_sphinxdoc: ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS))) PYBUILD_SYSTEM=custom \ + PYBUILD_DISABLE=build/python2-dbg \ PYBUILD_BUILD_ARGS="cd doc && PYTHONPATH={build_dir} http_proxy='127.0.0.1:9' {interpreter} -m sphinx -N -bhtml source build/html" dh_auto_build # HTML generator dh_installdocs "doc/build/html" -p python-pyfai-doc dh_sphinxdoc -O--buildsystem=pybuild diff -Nru pyfai-0.15.0+dfsg/debian/watch pyfai-0.15.0+dfsg1/debian/watch --- pyfai-0.15.0+dfsg/debian/watch 2018-02-02 21:05:05.000000000 +0000 +++ pyfai-0.15.0+dfsg1/debian/watch 2018-02-03 08:08:32.000000000 +0000 @@ -1,6 +1,7 @@ -version=3 -opts=repacksuffix=+dfsg,\ +version=4 +opts=repacksuffix=+dfsg1,\ pgpsigurlmangle=s/$/.asc/,\ uversionmangle=s/(rc|a|b|c)/~$1/,\ -dversionmangle=s/\+dfsg// \ -http://pypi.debian.net/pyFAI/pyFAI-(.+)(?:_src)?\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +dversionmangle=s/\+dfsg\d*// \ +https://pypi.python.org/packages/source/p/pyFAI/ \ + pyFAI@ANY_VERSION@(?:_src)?@ARCHIVE_EXT@ debian uupdate diff -Nru pyfai-0.15.0+dfsg/pyFAI/third_party/argparse.py pyfai-0.15.0+dfsg1/pyFAI/third_party/argparse.py --- pyfai-0.15.0+dfsg/pyFAI/third_party/argparse.py 1970-01-01 00:00:00.000000000 +0000 +++ pyfai-0.15.0+dfsg1/pyFAI/third_party/argparse.py 2018-02-01 08:36:38.000000000 +0000 @@ -0,0 +1,50 @@ +# coding: utf-8 +# /*########################################################################## +# +# Copyright (C) 2015-2018 European Synchrotron Radiation Facility +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. +# +# ###########################################################################*/ +"""Wrapper module for the `argparse` library. + +Feed this module using a local copy of `argparse` if it exists. +Else it expect to have an available `argparse` library installed +in the Python path. + +It should be used like that: + +.. code-block:: + + from fabio.third_party import argparse + +""" + +from __future__ import absolute_import + +__authors__ = ["Valentin Valls"] +__license__ = "MIT" +__date__ = "28/07/2017" + +try: + # try to import our local version of six + from ._local.argparse import * # noqa +except ImportError: + # else try to import it from the python path + from argparse import * # noqa diff -Nru pyfai-0.15.0+dfsg/pyFAI/third_party/__init__.py pyfai-0.15.0+dfsg1/pyFAI/third_party/__init__.py --- pyfai-0.15.0+dfsg/pyFAI/third_party/__init__.py 1970-01-01 00:00:00.000000000 +0000 +++ pyfai-0.15.0+dfsg1/pyFAI/third_party/__init__.py 2018-02-01 08:36:38.000000000 +0000 @@ -0,0 +1,28 @@ +# coding: utf-8 +# /*########################################################################## +# +# Copyright (C) 2015-2018 European Synchrotron Radiation Facility +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. +# +# ###########################################################################*/ +""" +Package containing third party modules for compatibility between Python versions. +This package is not included in the Debian package. +""" diff -Nru pyfai-0.15.0+dfsg/pyFAI/third_party/setup.py pyfai-0.15.0+dfsg1/pyFAI/third_party/setup.py --- pyfai-0.15.0+dfsg/pyFAI/third_party/setup.py 1970-01-01 00:00:00.000000000 +0000 +++ pyfai-0.15.0+dfsg1/pyFAI/third_party/setup.py 2018-02-01 08:36:38.000000000 +0000 @@ -0,0 +1,44 @@ +# coding: utf-8 +# /*########################################################################## +# Copyright (C) 2016-2018 European Synchrotron Radiation Facility +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. +# +# ############################################################################*/ + +__authors__ = ["Valentin Valls"] +__license__ = "MIT" +__date__ = "09/01/2018" + +import os +from numpy.distutils.misc_util import Configuration + + +def configuration(parent_package='', top_path=None): + config = Configuration('third_party', parent_package, top_path) + # includes _local only if it is available + local_path = os.path.join(top_path, parent_package, "third_party", "_local") + if os.path.exists(local_path): + config.add_subpackage('_local') + return config + + +if __name__ == "__main__": + from numpy.distutils.core import setup + setup(configuration=configuration) diff -Nru pyfai-0.15.0+dfsg/pyFAI/third_party/six.py pyfai-0.15.0+dfsg1/pyFAI/third_party/six.py --- pyfai-0.15.0+dfsg/pyFAI/third_party/six.py 1970-01-01 00:00:00.000000000 +0000 +++ pyfai-0.15.0+dfsg1/pyFAI/third_party/six.py 2018-02-01 08:36:38.000000000 +0000 @@ -0,0 +1,49 @@ +# coding: utf-8 +# /*########################################################################## +# +# Copyright (C) 2015-2018 European Synchrotron Radiation Facility +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. +# +# ###########################################################################*/ +"""Wrapper module for the `six` library. + +Feed this module using a local silx copy of `six` if it exists. +Else it expect to have an available `six` library installed in the Python path. + +It should be used like that: + +.. code-block:: + + from pyFAI.third_party import six + +""" + +from __future__ import absolute_import + +__authors__ = ["Valentin Valls"] +__license__ = "MIT" +__date__ = "09/01/2018" + +try: + # try to import our local version of six + from ._local.six import * # noqa +except ImportError: + # else try to import it from the python path + from six import * # noqa