[pyfai] 04/10: fix the LaB6.poni alteration

Frédéric-Emmanuel Picca picca at moszumanska.debian.org
Mon Jan 13 23:05:29 UTC 2014


This is an automated email from the git hooks/post-receive script.

picca pushed a commit to branch experimental
in repository pyfai.

commit 1dd836fb5d4eab5f9e3b45ab36a34feefade0b03
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Dec 28 13:03:52 2013 +0100

    fix the LaB6.poni alteration
---
 ...wareded-do-not-alter-the-original-poni-fi.patch | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 38 insertions(+)

diff --git a/debian/patches/0002-feature-forwareded-do-not-alter-the-original-poni-fi.patch b/debian/patches/0002-feature-forwareded-do-not-alter-the-original-poni-fi.patch
new file mode 100644
index 0000000..74f4204
--- /dev/null
+++ b/debian/patches/0002-feature-forwareded-do-not-alter-the-original-poni-fi.patch
@@ -0,0 +1,37 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Sat, 28 Dec 2013 13:03:06 +0100
+Subject: feature forwareded do not alter the original poni file during tests
+
+---
+ test/testAzimuthalIntegrator.py | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/test/testAzimuthalIntegrator.py b/test/testAzimuthalIntegrator.py
+index 834b270..1d3bfce 100755
+--- a/test/testAzimuthalIntegrator.py
++++ b/test/testAzimuthalIntegrator.py
+@@ -69,6 +69,7 @@ class test_azim_halfFrelon(unittest.TestCase):
+ 
+         self.tmpdir = tempfile.mkdtemp(dir=dirname)
+ 
++        # prepare the poni file and add the spline information
+         with open(self.poniFile) as f:
+             data = []
+             for line in f:
+@@ -76,11 +77,14 @@ class test_azim_halfFrelon(unittest.TestCase):
+                     data.append("SplineFile: " + self.splineFile)
+                 else:
+                     data.append(line.strip())
+-        with open(self.poniFile, "w") as f:
++
++        poniFile = os.path.join(self.tmpdir, "test.poni")
++        with open(poniFile, "w") as f:
+             f.write(os.linesep.join(data))
++
+         self.fit2d = numpy.loadtxt(self.fit2dFile)
+         self.ai = AzimuthalIntegrator()
+-        self.ai.load(self.poniFile)
++        self.ai.load(poniFile)
+         self.data = fabio.open(self.halfFrelon).data
+ 
+     def tearDown(self):
diff --git a/debian/patches/series b/debian/patches/series
index c2996ec..cfbd264 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-feature-forwarded-setup-teardown-to-remove-temporary.patch
+0002-feature-forwareded-do-not-alter-the-original-poni-fi.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