[pyfai] 20/22: fix the 0002 patch
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Wed Jun 8 14:33:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to annotated tag debian/0.12.0+dfsg-1
in repository pyfai.
commit a6284854321339d21b07ec8d73e0cd6e1f9e1f1e
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Wed Jun 8 14:54:56 2016 +0200
fix the 0002 patch
---
debian/patches/0002-skip-test-if-no-network.patch | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/debian/patches/0002-skip-test-if-no-network.patch b/debian/patches/0002-skip-test-if-no-network.patch
index 61df388..0655a84 100644
--- a/debian/patches/0002-skip-test-if-no-network.patch
+++ b/debian/patches/0002-skip-test-if-no-network.patch
@@ -1,6 +1,6 @@
From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
<picca at synchrotron-soleil.fr>
-Date: Wed, 8 Jun 2016 11:19:37 +0200
+Date: Wed, 8 Jun 2016 14:54:28 +0200
Subject: skip test if no network
---
@@ -26,7 +26,7 @@ index be03f8a..9de7e44 100644
def setUp(self):
"""Download files"""
diff --git a/pyFAI/test/test_csr.py b/pyFAI/test/test_csr.py
-index 835f825..001afc0 100644
+index 835f825..f98b7eb 100644
--- a/pyFAI/test/test_csr.py
+++ b/pyFAI/test/test_csr.py
@@ -49,11 +49,6 @@ if opencl.ocl:
@@ -50,7 +50,7 @@ index 835f825..001afc0 100644
+ cls.N = 1000
+ cls.ai = AzimuthalIntegrator.sload(UtilsTest.getimage("1893/Pilatus1M.poni"))
+ cls.data = fabio.open(UtilsTest.getimage("1883/Pilatus1M.edf")).data
-+ cls.ai.xrpd_LUT(data, N)
++ cls.ai.xrpd_LUT(cls.data, cls.N)
+
def __init__(self, methodName='runTest', param=None):
super(ParameterisedTestCase, self).__init__(methodName)
@@ -82,7 +82,7 @@ index 835f825..001afc0 100644
logger.debug(cmt)
if skip:
diff --git a/pyFAI/test/test_integrate.py b/pyFAI/test/test_integrate.py
-index 17efa5c..30466ba 100644
+index 17efa5c..5d1c415 100644
--- a/pyFAI/test/test_integrate.py
+++ b/pyFAI/test/test_integrate.py
@@ -110,13 +110,15 @@ class TestIntegrate1D(unittest.TestCase):
@@ -100,7 +100,7 @@ index 17efa5c..30466ba 100644
+ def setUpClass(cls):
+ cls.npt = 500
+ cls.img = UtilsTest.getimage("1883/Pilatus1M.edf")
-+ cls.data = fabio.open(img).data
++ cls.data = fabio.open(cls.img).data
+ cls.ai = AzimuthalIntegrator(1.58323111834, 0.0334170169115, 0.0412277798782, 0.00648735642526, 0.00755810191106, 0.0, detector=Pilatus1M())
+ cls.ai.wavelength = 1e-10
+ cls.Rmax = 20
--
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