[pytables] 09/20: Fix uniline fields in patches
Antonio Valentino
a_valentino-guest at moszumanska.debian.org
Fri Aug 14 19:00:06 UTC 2015
This is an automated email from the git hooks/post-receive script.
a_valentino-guest pushed a commit to branch master
in repository pytables.
commit 1b6d23e7819da8428912bb12cc2cf76efcad9585
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date: Fri Aug 14 10:58:46 2015 +0200
Fix uniline fields in patches
---
debian/patches/0004-Never-use-the-msse2-flag-explicitly.patch | 5 ++---
.../0007-Temporay-desable-tests-that-use-the-lz4-conpressor.patch | 7 +++----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/debian/patches/0004-Never-use-the-msse2-flag-explicitly.patch b/debian/patches/0004-Never-use-the-msse2-flag-explicitly.patch
index 7174d8b..9e2a24d 100644
--- a/debian/patches/0004-Never-use-the-msse2-flag-explicitly.patch
+++ b/debian/patches/0004-Never-use-the-msse2-flag-explicitly.patch
@@ -1,5 +1,4 @@
-From: Debian Science Maintainers
- <debian-science-maintainers at lists.alioth.debian.org>
+From: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Date: Sat, 25 Jul 2015 17:50:31 +0000
Subject: Never-use-the-msse2-flag-explicitly
@@ -15,7 +14,7 @@ index 4e016de..990e3fe 100755
@@ -762,7 +762,8 @@ if 'BLOSC' not in optional_libs:
finally:
os.remove(fd.name)
-
+
- try_flags = ["-march=native", "-msse2"]
+ #try_flags = ["-march=native", "-msse2"]
+ try_flags = []
diff --git a/debian/patches/0007-Temporay-desable-tests-that-use-the-lz4-conpressor.patch b/debian/patches/0007-Temporay-desable-tests-that-use-the-lz4-conpressor.patch
index 4536e84..28a6f5d 100644
--- a/debian/patches/0007-Temporay-desable-tests-that-use-the-lz4-conpressor.patch
+++ b/debian/patches/0007-Temporay-desable-tests-that-use-the-lz4-conpressor.patch
@@ -1,5 +1,4 @@
-From: Debian Science Maintainers
- <debian-science-maintainers at lists.alioth.debian.org>
+From: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Date: Sat, 25 Jul 2015 17:50:31 +0000
Subject: Temporay-desable-tests-that-use-the-lz4-conpressor
@@ -14,8 +13,8 @@ index 7f0d2ac..64b6335 100644
+++ b/tables/tests/test_tables.py
@@ -1577,6 +1577,8 @@ class CompressBloscShuffleTablesTestCase(BasicTestCase):
complib = "blosc"
-
-
+
+
+import platform
+ at unittest.skipIf('s390x' in platform.platform().lower(), 'lz4 required')
@unittest.skipIf(not common.blosc_avail,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytables.git
More information about the debian-science-commits
mailing list