[pyfai] 01/02: Imported Debian patch 0.11.0+dfsg-4
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Sun Mar 27 14:23:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository pyfai.
commit f23be446b07f17f6d37287f3d83efef0e210f95c
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Sat Mar 26 15:25:53 2016 +0100
Imported Debian patch 0.11.0+dfsg-4
---
debian/changelog | 9 +++
debian/control | 16 ++---
.../0003-fix-from-upstream-for-fabio-3.x.patch | 69 ++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 87 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 465ef8b..18599c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pyfai (0.11.0+dfsg-4) unstable; urgency=medium
+
+ * debian/control
+ - Added Build-Depends fabio (>= 0.3.0+dfsg-1~)
+ * debian/patch
+ + 0003-fix-from-upstream-for-fabio-3.x.patch
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Sat, 26 Mar 2016 15:25:53 +0100
+
pyfai (0.11.0+dfsg-3) unstable; urgency=medium
* debian/path
diff --git a/debian/control b/debian/control
index 3100567..b770ca5 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Build-Depends: cython,
dh-python,
python-all-dev,
python-all-dbg,
- python-fabio (>= 0.2.2+dfsg~),
- python-fabio-dbg (>= 0.2.2+dfsg~),
+ python-fabio (>= 0.3.0+dfsg-1~),
+ python-fabio-dbg (>= 0.3.0+dfsg-1~),
python-fftw,
python-h5py,
python-lxml,
@@ -32,8 +32,8 @@ Build-Depends: cython,
python-tk-dbg,
python3-all-dev,
python3-all-dbg,
- python3-fabio (>= 0.2.2+dfsg~),
- python3-fabio-dbg (>= 0.2.2+dfsg~),
+ python3-fabio (>= 0.3.0+dfsg-1~),
+ python3-fabio-dbg (>= 0.3.0+dfsg-1~),
python3-lxml,
python3-lxml-dbg,
python3-matplotlib,
@@ -84,7 +84,7 @@ Section: python
Depends: ${misc:Depends},
${python:Depends},
${shlibs:Depends},
- python-fabio (>= 0.2.2+dfsg~),
+ python-fabio (>= 0.3.0+dfsg-1~),
python-imaging,
python-matplotlib,
python-scipy
@@ -123,7 +123,7 @@ Depends: ${misc:Depends},
${python:Depends},
${shlibs:Depends},
python-pyfai (= ${binary:Version}),
- python-fabio-dbg (>= 0.2.2+dfsg~),
+ python-fabio-dbg (>= 0.3.0+dfsg-1~),
python-imaging-dbg,
python-matplotlib-dbg,
python-scipy-dbg
@@ -158,7 +158,7 @@ Section: python
Depends: ${misc:Depends},
${python3:Depends},
${shlibs:Depends},
- python3-fabio (>= 0.2.2+dfsg~),
+ python3-fabio (>= 0.3.0+dfsg-1~),
python3-pil,
python3-matplotlib,
python3-scipy
@@ -192,7 +192,7 @@ Depends: ${misc:Depends},
${python3:Depends},
${shlibs:Depends},
python3-pyfai (= ${binary:Version}),
- python3-fabio-dbg (>= 0.2.2+dfsg~),
+ python3-fabio-dbg (>= 0.3.0+dfsg-1~),
python3-pil-dbg,
python3-matplotlib-dbg,
python3-scipy-dbg
diff --git a/debian/patches/0003-fix-from-upstream-for-fabio-3.x.patch b/debian/patches/0003-fix-from-upstream-for-fabio-3.x.patch
new file mode 100644
index 0000000..61cb8e3
--- /dev/null
+++ b/debian/patches/0003-fix-from-upstream-for-fabio-3.x.patch
@@ -0,0 +1,69 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Sat, 26 Mar 2016 15:25:02 +0100
+Subject: fix from upstream for fabio 3.x
+
+---
+ pyFAI-src/azimuthalIntegrator.py | 43 +++++++++++++++++++---------------------
+ 1 file changed, 20 insertions(+), 23 deletions(-)
+
+diff --git a/pyFAI-src/azimuthalIntegrator.py b/pyFAI-src/azimuthalIntegrator.py
+index 78b413a..36c8e62 100644
+--- a/pyFAI-src/azimuthalIntegrator.py
++++ b/pyFAI-src/azimuthalIntegrator.py
+@@ -3340,27 +3340,25 @@ class AzimuthalIntegrator(Geometry):
+ return
+
+ dim1_unit = units.to_unit(dim1_unit)
+- header_keys = ["dist", "poni1", "poni2", "rot1", "rot2", "rot3",
+- "chi_min", "chi_max",
+- dim1_unit.REPR + "_min",
+- dim1_unit.REPR + "_max",
+- "pixelX", "pixelY",
+- "dark", "flat", "polarization_factor", "normalization_factor"]
+- header = {"dist": str(self._dist),
+- "poni1": str(self._poni1),
+- "poni2": str(self._poni2),
+- "rot1": str(self._rot1),
+- "rot2": str(self._rot2),
+- "rot3": str(self._rot3),
+- "chi_min": str(dim2.min()),
+- "chi_max": str(dim2.max()),
+- dim1_unit.REPR + "_min": str(dim1.min()),
+- dim1_unit.REPR + "_max": str(dim1.max()),
+- "pixelX": str(self.pixel2), # this is not a bug ... most people expect dim1 to be X
+- "pixelY": str(self.pixel1), # this is not a bug ... most people expect dim2 to be Y
+- "polarization_factor": str(polarization_factor),
+- "normalization_factor":str(normalization_factor)
+- }
++ try:
++ from collections import OrderedDict
++ except ImportError:
++ header = {}
++
++ header["dist"] = str(self._dist)
++ header["poni1"] = str(self._poni1)
++ header["poni2"] = str(self._poni2)
++ header["rot1"] = str(self._rot1)
++ header["rot2"] = str(self._rot2)
++ header["rot3"] = str(self._rot3)
++ header["chi_min"] = str(dim2.min())
++ header["chi_max"] = str(dim2.max())
++ header[dim1_unit.REPR + "_min"] = str(dim1.min())
++ header[dim1_unit.REPR + "_max"] = str(dim1.max())
++ header["pixelX"] = str(self.pixel2) # this is not a bug ... most people expect dim1 to be X
++ header["pixelY"] = str(self.pixel1) # this is not a bug ... most people expect dim2 to be Y
++ header["polarization_factor"] = str(polarization_factor)
++ header["normalization_factor"] = str(normalization_factor)
+
+ if self.splineFile:
+ header["spline"] = str(self.splineFile)
+@@ -3380,8 +3378,7 @@ class AzimuthalIntegrator(Geometry):
+ header["key"] = f2d[key]
+ try:
+ img = fabio.edfimage.edfimage(data=I.astype("float32"),
+- header=header,
+- header_keys=header_keys)
++ header=header)
+
+ if error is not None:
+ img.appendFrame(data=error, header={"EDF_DataBlockID": "1.Image.Error"})
diff --git a/debian/patches/series b/debian/patches/series
index 78cdbb5..75c409b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001-fix-pyFAI-when-third_party-is-missing.patch
0002-fix-from-upstream-python3-installation.patch
+0003-fix-from-upstream-for-fabio-3.x.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyfai.git
More information about the debian-science-commits
mailing list