[pyfai] 03/03: refresh the patch series
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Mon Sep 18 18:35:44 UTC 2017
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository pyfai.
commit b079c1a81a230150cf52ec7c302812ead6071114
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Mon Sep 18 20:26:15 2017 +0200
refresh the patch series
---
debian/changelog | 4 +-
.../0002-remove-useless-logic-in-conf.py.patch | 30 ---------
...03-remove-a-wrong-PYTHONPATH-modification.patch | 4 +-
debian/patches/0003-use-the-system-mathjax.patch | 4 +-
...004-unactivated-a-bunch-of-failling-tests.patch | 72 ----------------------
.../patches/0005-fix-the-setup-dependencies.patch | 12 ++--
debian/patches/series | 2 -
7 files changed, 11 insertions(+), 117 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4012d32..fb8f9c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pyfai (0.14.0+dfsg-1) UNRELEASED; urgency=medium
+pyfai (0.14.2+dfsg-1) UNRELEASED; urgency=medium
* New upstream version 0.14.0+dfsg
* debian/watch
@@ -17,10 +17,8 @@ pyfai (0.14.0+dfsg-1) UNRELEASED; urgency=medium
+ Added help2man in order to generate the manpages.
+ Added xauth, xvfb
* debian/patches
- - 0002-remove-useless-logic-in-conf.py.patch (Added)
- 0003-remove-a-wrong-PYTHONPATH-modification.patch (Added)
- 0003-use-the-system-mathjax.patch (Added)
- - 0004-unactivated-a-bunch-of-failling-tests.patch (Added)
- 0005-fix-the-setup-dependencies.patch (Added)
* Debian/rules
- Run tests with xvfb
diff --git a/debian/patches/0002-remove-useless-logic-in-conf.py.patch b/debian/patches/0002-remove-useless-logic-in-conf.py.patch
deleted file mode 100644
index 72f85d1..0000000
--- a/debian/patches/0002-remove-useless-logic-in-conf.py.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
- <picca at synchrotron-soleil.fr>
-Date: Mon, 31 Jul 2017 16:50:54 +0200
-Subject: remove useless logic in conf.py
-
----
- doc/source/conf.py | 10 ----------
- 1 file changed, 10 deletions(-)
-
-diff --git a/doc/source/conf.py b/doc/source/conf.py
-index ea362ea..a118acd 100644
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -60,16 +60,6 @@ source_suffix = '.rst'
- # The master toctree document.
- master_doc = 'index'
-
--# Configure the environment to be able to use sphinxcontrib.programoutput
--# NOTE: Must be done after pyFAI._version import which at the end of the end imports PyMCA
--# Importing PyMCA redefine and reorder PYTHONPATH
--import glob
--root_dir = os.path.abspath("../..")
--build_dir = glob.glob('../../build/lib*')
--
--sys.path.insert(1, build_dir[0])
--os.environ["PYTHONPATH"] = os.path.abspath(build_dir[0]) + os.pathsep + os.environ.get("PYTHONPATH", "")
--
- # General information about the project.
- project = u'pyFAI'
- from pyFAI._version import strictversion, version, __date__ as pyfai_date
diff --git a/debian/patches/0003-remove-a-wrong-PYTHONPATH-modification.patch b/debian/patches/0003-remove-a-wrong-PYTHONPATH-modification.patch
index 0851e6a..d4c86c8 100644
--- a/debian/patches/0003-remove-a-wrong-PYTHONPATH-modification.patch
+++ b/debian/patches/0003-remove-a-wrong-PYTHONPATH-modification.patch
@@ -8,10 +8,10 @@ Subject: remove a wrong PYTHONPATH modification
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
-index 611ba81..090676a 100644
+index 1e780e9..267f4e3 100644
--- a/setup.py
+++ b/setup.py
-@@ -200,7 +200,7 @@ class BuildMan(Command):
+@@ -203,7 +203,7 @@ class BuildMan(Command):
path.insert(0, os.path.abspath(build.build_lib))
env = dict((str(k), str(v)) for k, v in os.environ.items())
diff --git a/debian/patches/0003-use-the-system-mathjax.patch b/debian/patches/0003-use-the-system-mathjax.patch
index 9a79162..0500a5b 100644
--- a/debian/patches/0003-use-the-system-mathjax.patch
+++ b/debian/patches/0003-use-the-system-mathjax.patch
@@ -8,10 +8,10 @@ Subject: use the system mathjax
1 file changed, 6 insertions(+)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index cc41d41..ea362ea 100644
+index 9e584c8..2b9c2c4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
-@@ -201,6 +201,12 @@ html_static_path = ['_static']
+@@ -199,6 +199,12 @@ html_static_path = []
htmlhelp_basename = 'pyFAIdoc'
diff --git a/debian/patches/0004-unactivated-a-bunch-of-failling-tests.patch b/debian/patches/0004-unactivated-a-bunch-of-failling-tests.patch
deleted file mode 100644
index 92dd5a2..0000000
--- a/debian/patches/0004-unactivated-a-bunch-of-failling-tests.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
- <picca at synchrotron-soleil.fr>
-Date: Mon, 21 Aug 2017 14:09:41 +0200
-Subject: unactivated a bunch of failling tests
-
----
- pyFAI/test/test_bug_regression.py | 2 +-
- pyFAI/test/test_csr.py | 18 +++++++++---------
- pyFAI/test/test_distortion.py | 8 ++++----
- 3 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/pyFAI/test/test_bug_regression.py b/pyFAI/test/test_bug_regression.py
-index 9a359bb..b82aabe 100644
---- a/pyFAI/test/test_bug_regression.py
-+++ b/pyFAI/test/test_bug_regression.py
-@@ -194,7 +194,7 @@ class TestBug174(unittest.TestCase):
- def suite():
- loader = unittest.defaultTestLoader.loadTestsFromTestCase
- testsuite = unittest.TestSuite()
-- testsuite.addTest(loader(TestBug170))
-+ # testsuite.addTest(loader(TestBug170))
- testsuite.addTest(loader(TestBug211))
- testsuite.addTest(loader(TestBug232))
- testsuite.addTest(loader(TestBug174))
-diff --git a/pyFAI/test/test_csr.py b/pyFAI/test/test_csr.py
-index 62bdf55..3f48bb0 100644
---- a/pyFAI/test/test_csr.py
-+++ b/pyFAI/test/test_csr.py
-@@ -143,15 +143,15 @@ class Test_CSR(unittest.TestCase):
- # diff_img(img, img_csr, "splitbbox")
- self.assertTrue(numpy.allclose(img, img_csr), " img are the same")
-
-- def test_2d_nosplit(self):
-- self.ai.reset()
-- img, tth, chi = self.ai.integrate2d(self.data, self.N, unit="2th_deg", method="histogram")
-- img_csr, tth_csr, chi_csr = self.ai.integrate2d(self.data, self.N, unit="2th_deg", method="nosplit_csr")
-- # diff_crv(tth, tth_csr, "2th")
-- # self.assertTrue(numpy.allclose(tth, tth_csr), " 2Th are the same")
-- # self.assertTrue(numpy.allclose(chi, chi_csr), " Chi are the same")
-- # diff_img(img, img_csr, "no split")
-- self.assertLess(((img - img_csr) > 1).sum(), 6, " img are almost the same")
-+ # def test_2d_nosplit(self):
-+ # self.ai.reset()
-+ # img, tth, chi = self.ai.integrate2d(self.data, self.N, unit="2th_deg", method="histogram")
-+ # img_csr, tth_csr, chi_csr = self.ai.integrate2d(self.data, self.N, unit="2th_deg", method="nosplit_csr")
-+ # # diff_crv(tth, tth_csr, "2th")
-+ # # self.assertTrue(numpy.allclose(tth, tth_csr), " 2Th are the same")
-+ # # self.assertTrue(numpy.allclose(chi, chi_csr), " Chi are the same")
-+ # # diff_img(img, img_csr, "no split")
-+ # self.assertLess(((img - img_csr) > 1).sum(), 6, " img are almost the same")
-
-
- def suite():
-diff --git a/pyFAI/test/test_distortion.py b/pyFAI/test/test_distortion.py
-index 179ebf2..7d6771d 100644
---- a/pyFAI/test/test_distortion.py
-+++ b/pyFAI/test/test_distortion.py
-@@ -249,10 +249,10 @@ def suite():
- testsuite.addTest(TestImplementations("test_calc_pos"))
- testsuite.addTest(TestImplementations("test_size"))
- testsuite.addTest(TestImplementations("test_lut"))
-- testsuite.addTest(TestHalfCCD("test_pos_lut"))
-- testsuite.addTest(TestHalfCCD("test_ref_vs_fit2d"))
-- testsuite.addTest(TestHalfCCD("test_lut_vs_fit2d"))
-- testsuite.addTest(TestHalfCCD("test_csr_vs_fit2d"))
-+ # testsuite.addTest(TestHalfCCD("test_pos_lut"))
-+ # testsuite.addTest(TestHalfCCD("test_ref_vs_fit2d"))
-+ # testsuite.addTest(TestHalfCCD("test_lut_vs_fit2d"))
-+ # testsuite.addTest(TestHalfCCD("test_csr_vs_fit2d"))
- return testsuite
-
-
diff --git a/debian/patches/0005-fix-the-setup-dependencies.patch b/debian/patches/0005-fix-the-setup-dependencies.patch
index fa5c45a..6c23abd 100644
--- a/debian/patches/0005-fix-the-setup-dependencies.patch
+++ b/debian/patches/0005-fix-the-setup-dependencies.patch
@@ -4,14 +4,14 @@ Date: Mon, 4 Sep 2017 14:12:04 +0200
Subject: fix the setup dependencies
---
- setup.py | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
+ setup.py | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/setup.py b/setup.py
-index 090676a..ddd2e43 100644
+index 267f4e3..73019ca 100644
--- a/setup.py
+++ b/setup.py
-@@ -713,18 +713,20 @@ def get_project_configuration(dry_run):
+@@ -727,19 +727,20 @@ def get_project_configuration(dry_run):
"""Returns project arguments for setup"""
install_requires = [
@@ -31,8 +31,8 @@ index 090676a..ddd2e43 100644
+ "pyopencl",
+ "PyQt5",
# for the use of pkg_resources on script launcher
-- "setuptools"]
-+ "setuptools",
+ "setuptools",
+- "silx"]
+ "scipy",
+ "silx",
+ "six"
diff --git a/debian/patches/series b/debian/patches/series
index 3cf1a9b..7c9dc05 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
0003-use-the-system-mathjax.patch
-0002-remove-useless-logic-in-conf.py.patch
0003-remove-a-wrong-PYTHONPATH-modification.patch
-0004-unactivated-a-bunch-of-failling-tests.patch
0005-fix-the-setup-dependencies.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