From: Eric Bavier <ericbavier@gmail.com>
To: guix-devel@gnu.org
Cc: Eric Bavier <bavier@member.fsf.org>
Subject: [PATCH 02/13] gnu: python: Add sqlite input.
Date: Thu, 20 Nov 2014 23:40:57 -0600 [thread overview]
Message-ID: <1416548468-28421-3-git-send-email-bavier@member.fsf.org> (raw)
In-Reply-To: <1416548468-28421-1-git-send-email-bavier@member.fsf.org>
* gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch,
gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch: New patches.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/python.scm (python-2)[source]: Add patch.
[inputs]: Add sqlite.
(python)[source]: Add patch.
---
gnu-system.am | 2 ++
.../patches/python-sqlite-3.8.4-test-fix.patch | 15 +++++++++++++++
.../patches/python2-sqlite-3.8.4-test-fix.patch | 15 +++++++++++++++
gnu/packages/python.scm | 8 +++++++-
4 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch
create mode 100644 gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch
diff --git a/gnu-system.am b/gnu-system.am
index 5fd18e8..6bdd6f0 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -406,6 +406,8 @@ dist_patch_DATA = \
gnu/packages/patches/pybugz-stty.patch \
gnu/packages/patches/python-fix-tests.patch \
gnu/packages/patches/python-libffi-mips-n32-fix.patch \
+ gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch \
+ gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch \
gnu/packages/patches/qt4-tests.patch \
gnu/packages/patches/ratpoison-shell.patch \
gnu/packages/patches/readline-link-ncurses.patch \
diff --git a/gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch b/gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch
new file mode 100644
index 0000000..2f8b159
--- /dev/null
+++ b/gnu/packages/patches/python-sqlite-3.8.4-test-fix.patch
@@ -0,0 +1,15 @@
+From resolution of upstream python issue #20901: http://bugs.python.org/issue20901
+
+diff --git a/Lib/sqlite3/test/hooks.py b/Lib/sqlite3/test/hooks.py
+--- Lib/sqlite3/test/hooks.py
++++ Lib/sqlite3/test/hooks.py
+@@ -162,7 +162,7 @@ class ProgressTests(unittest.TestCase):
+ create table bar (a, b)
+ """)
+ second_count = len(progress_calls)
+- self.assertGreater(first_count, second_count)
++ self.assertGreaterEqual(first_count, second_count)
+
+ def CheckCancelOperation(self):
+ """
+
diff --git a/gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch b/gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch
new file mode 100644
index 0000000..f121e88
--- /dev/null
+++ b/gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch
@@ -0,0 +1,15 @@
+From resolution of upstream python issue #20901: http://bugs.python.org/issue20901
+
+diff --git a/Lib/sqlite3/test/hooks.py b/Lib/sqlite3/test/hooks.py
+--- Lib/sqlite3/test/hooks.py
++++ Lib/sqlite3/test/hooks.py
+@@ -162,7 +162,7 @@ class ProgressTests(unittest.TestCase):
+ create table bar (a, b)
+ """)
+ second_count = len(progress_calls)
+- self.assertTrue(first_count > second_count)
++ self.assertGreaterEqual(first_count, second_count)
+
+ def CheckCancelOperation(self):
+ """
+
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 3786604..229e140 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -55,7 +55,8 @@
(method url-fetch)
(uri (string-append "https://www.python.org/ftp/python/"
version "/Python-" version ".tar.xz"))
- (patches (list (search-patch "python-libffi-mips-n32-fix.patch")))
+ (patches (list (search-patch "python-libffi-mips-n32-fix.patch")
+ (search-patch "python2-sqlite-3.8.4-test-fix.patch")))
(patch-flags '("-p0"))
(sha256
(base32
@@ -109,6 +110,7 @@
(let ((bz2 (assoc-ref %build-inputs "bzip2"))
(gdbm (assoc-ref %build-inputs "gdbm"))
(libffi (assoc-ref %build-inputs "libffi"))
+ (sqlite (assoc-ref %build-inputs "sqlite"))
(openssl (assoc-ref %build-inputs "openssl"))
(readline (assoc-ref %build-inputs "readline"))
(zlib (assoc-ref %build-inputs "zlib")))
@@ -117,6 +119,7 @@
(string-append "CPPFLAGS="
"-I" bz2 "/include "
"-I" gdbm "/include "
+ "-I" sqlite "/include "
"-I" openssl "/include "
"-I" readline "/include "
"-I" zlib "/include")
@@ -124,6 +127,7 @@
"-L" bz2 "/lib "
"-L" gdbm "/lib "
"-L" libffi "/lib "
+ "-L" sqlite "/lib "
"-L" openssl "/lib "
"-L" readline "/lib "
"-L" zlib "/lib")))
@@ -167,6 +171,7 @@
`(("bzip2" ,bzip2)
("gdbm" ,gdbm)
("libffi" ,libffi) ; for ctypes
+ ("sqlite" ,(@ (gnu packages databases) sqlite)) ; prevent circular refs
("openssl" ,openssl)
("readline" ,readline)
("zlib" ,zlib)
@@ -198,6 +203,7 @@ data types.")
(uri (string-append "https://www.python.org/ftp/python/"
version "/Python-" version ".tar.xz"))
(patches (list (search-patch "python-fix-tests.patch")
+ (search-patch "python-sqlite-3.8.4-test-fix.patch")
(search-patch "python-libffi-mips-n32-fix.patch")))
(patch-flags '("-p0"))
(sha256
--
1.7.9.5
next prev parent reply other threads:[~2014-11-21 5:40 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-21 5:40 [PATCH 00/13] Add gourmet (and dependent python packages) Eric Bavier
2014-11-21 5:40 ` [PATCH 01/13] gnu: subversion: Propagate env variables to hooks Eric Bavier
2014-11-21 22:02 ` Ludovic Courtès
2014-11-21 22:24 ` Eric Bavier
2014-11-22 5:15 ` Eric Bavier
2014-11-22 11:02 ` Ludovic Courtès
2014-11-25 5:42 ` Eric Bavier
2014-11-25 8:03 ` Ludovic Courtès
2014-11-25 16:51 ` Eric Bavier
2014-11-25 17:09 ` Ludovic Courtès
2014-11-21 5:40 ` Eric Bavier [this message]
2014-11-21 9:28 ` [PATCH 02/13] gnu: python: Add sqlite input Ludovic Courtès
2014-11-21 13:11 ` Eric Bavier
2014-11-21 5:40 ` [PATCH 03/13] gnu: Add python-sqlalchemy Eric Bavier
2014-11-21 22:03 ` Ludovic Courtès
2014-11-21 5:40 ` [PATCH 04/13] gnu: Export symbols in (gnu packages image) upfront Eric Bavier
2014-11-21 5:41 ` [PATCH 05/13] gnu: Export ghostscript module symbols up-front Eric Bavier
2014-11-21 22:04 ` Ludovic Courtès
2014-11-21 22:27 ` Eric Bavier
2014-11-21 5:41 ` [PATCH 06/13] gnu: Add python-pillow Eric Bavier
2014-11-21 22:05 ` Ludovic Courtès
2014-11-21 5:41 ` [PATCH 07/13] gnu: Add python-distutils-extra Eric Bavier
2014-11-21 22:07 ` Ludovic Courtès
2014-11-21 5:41 ` [PATCH 08/13] gnu: Add python-elib.intl Eric Bavier
2014-11-21 22:06 ` Ludovic Courtès
2014-11-21 5:41 ` [PATCH 09/13] guix: Add MPL1.1 license Eric Bavier
2014-11-21 22:08 ` Ludovic Courtès
2014-11-21 5:41 ` [PATCH 10/13] gnu: Add python-pycairo Eric Bavier
2014-11-21 22:11 ` Ludovic Courtès
2014-11-21 5:41 ` [PATCH 11/13] gnu: Add python-pygobject Eric Bavier
2014-11-21 22:12 ` Ludovic Courtès
2014-11-21 5:41 ` [PATCH 12/13] gnu: Add python2-pygtk Eric Bavier
2014-11-21 22:10 ` Ludovic Courtès
2014-11-21 5:41 ` [PATCH 13/13] gnu: Add gourmet Eric Bavier
2014-11-21 22:13 ` Ludovic Courtès
2014-11-21 9:21 ` [PATCH 00/13] Add gourmet (and dependent python packages) Andreas Enge
2014-11-21 21:27 ` Ludovic Courtès
2014-12-02 3:09 ` Eric Bavier
2014-12-02 8:33 ` Ludovic Courtès
2014-12-02 10:56 ` Andreas Enge
2014-12-02 12:49 ` Ludovic Courtès
2014-12-02 20:05 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1416548468-28421-3-git-send-email-bavier@member.fsf.org \
--to=ericbavier@gmail.com \
--cc=bavier@member.fsf.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).