Re: 01/01: python: Update to 3.4.3

Re: 01/01: python: Update to 3.4.3

[Mark H Weaver]

Cyril Roelandt <tipecaml@gmail.com> writes:

> commit 08c045091e8d8da3b4c677540ed577e8f2448b0d
> Author: Cyril Roelandt <tipecaml@gmail.com>
> Date:   Fri Apr 10 00:19:20 2015 +0200
>
>     python: Update to 3.4.3
>     
>     * gnu/packages/python.scm (python): Update from 3.3.5 to 3.4.3.
>     * gnu/packages/patches/python-fix-tests.patch: Update the required test fixes.
>     * gnu/packages/patches/python-libffi-mips-n32-fix.patch: Remove it...

We can't remove this patch yet, because it's still needed for our
python-2 package.  I added it back in 7934c8cfee.

    Thanks,
      Mark

Re: 01/01: python: Update to 3.4.3

[Cyril Roelandt]

On 04/10/2015 01:09 AM, Mark H Weaver wrote:
> Cyril Roelandt <tipecaml@gmail.com> writes:
> 
>> commit 08c045091e8d8da3b4c677540ed577e8f2448b0d
>> Author: Cyril Roelandt <tipecaml@gmail.com>
>> Date:   Fri Apr 10 00:19:20 2015 +0200
>>
>>     python: Update to 3.4.3
>>     
>>     * gnu/packages/python.scm (python): Update from 3.3.5 to 3.4.3.
>>     * gnu/packages/patches/python-fix-tests.patch: Update the required test fixes.
>>     * gnu/packages/patches/python-libffi-mips-n32-fix.patch: Remove it...
> 
> We can't remove this patch yet, because it's still needed for our
> python-2 package.  I added it back in 7934c8cfee.
> 

Oh right. I'll try to upgrade to 2.7.9 and see whether it is still needed.

Cyril.

[PATCH] python: update to 2.7.9

[Cyril Roelandt]

* gnu/packages/python.scm (python-2): Upgrade to 2.7.9.
* gnu/packages/patches/python-libffi-mips-n32-fix.patch: Delete.
* gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch: Delete.
* gnu-system.am: Remove the previous two patches.
---
 gnu-system.am                                       |  2 --
 .../patches/python-libffi-mips-n32-fix.patch        | 21 ---------------------
 .../patches/python2-sqlite-3.8.4-test-fix.patch     | 15 ---------------
 gnu/packages/python.scm                             |  7 ++-----
 4 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 gnu/packages/patches/python-libffi-mips-n32-fix.patch
 delete mode 100644 gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch

diff --git a/gnu-system.am b/gnu-system.am
index 969a911..3b49c78 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -510,10 +510,8 @@ dist_patch_DATA =						\
   gnu/packages/patches/pybugz-stty.patch			\
   gnu/packages/patches/pyqt-configure.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-rdflib-drop-sparqlwrapper.patch	\
-  gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch	\
   gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
   gnu/packages/patches/qt4-tests.patch				\
   gnu/packages/patches/ratpoison-shell.patch			\
diff --git a/gnu/packages/patches/python-libffi-mips-n32-fix.patch b/gnu/packages/patches/python-libffi-mips-n32-fix.patch
deleted file mode 100644
index 3938837..0000000
--- a/gnu/packages/patches/python-libffi-mips-n32-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fix handling of uint32_t arguments on the MIPS N32 ABI.
-
-Patch by Mark H Weaver <mhw@netris.org>.
-
---- Modules/_ctypes/libffi/src/mips/ffi.c.orig	2013-03-16 07:19:39.000000000 -0400
-+++ Modules/_ctypes/libffi/src/mips/ffi.c	2013-10-22 01:11:03.111985247 -0400
-@@ -170,7 +170,14 @@
- 		break;
- 		  
- 	      case FFI_TYPE_UINT32:
-+#ifdef FFI_MIPS_N32
-+		/* The N32 ABI requires that 32-bit integers
-+		   be sign-extended to 64-bits, regardless of
-+		   whether they are signed or unsigned. */
-+		*(ffi_arg *)argp = *(SINT32 *)(* p_argv);
-+#else
- 		*(ffi_arg *)argp = *(UINT32 *)(* p_argv);
-+#endif
- 		break;
- 
- 	      /* This can only happen with 64bit slots.  */
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
deleted file mode 100644
index f121e88..0000000
--- a/gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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 2381c7d..e2f252f 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -69,18 +69,15 @@
 (define-public python-2
   (package
     (name "python")
-    (version "2.7.6")
+    (version "2.7.9")
     (source
      (origin
       (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")
-                     (search-patch "python2-sqlite-3.8.4-test-fix.patch")))
-      (patch-flags '("-p0"))
       (sha256
        (base32
-        "18gnpyh071dxa0rv3silrz92jw9qpblswzwv4gzqcwxzz20qxmhz"))))
+        "05j9in7yygfgl6nml0rixfvj1bbip982w3l54q05f0vyx8a7xllh"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f
-- 
1.8.4.rc3

Re: [PATCH] python: update to 2.7.9

[Mark H Weaver]

Cyril Roelandt <tipecaml@gmail.com> writes:

> * gnu/packages/python.scm (python-2): Upgrade to 2.7.9.
> * gnu/packages/patches/python-libffi-mips-n32-fix.patch: Delete.
> * gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch: Delete.
> * gnu-system.am: Remove the previous two patches.

Unless there is an important reason to do this update now, I would
prefer to wait on this until the next core-updates cycle.  The current
cycle has already been delayed too long, and Andy's work on GNOME is
waiting on it.

What do you think?

      Mark
      
PS: By convention, we start the summary line with "gnu: " when adding or
changing packages.

Re: [PATCH] python: update to 2.7.9

[Ricardo Wurmus]

Cyril Roelandt writes:

> * gnu/packages/python.scm (python-2): Upgrade to 2.7.9.

[...]

> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 2381c7d..e2f252f 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -69,18 +69,15 @@
>  (define-public python-2
>    (package
>      (name "python")
> -    (version "2.7.6")
> +    (version "2.7.9")

I suspect that upgrading from 2.7.6 to 2.7.9 will break the build of a
number of python modules.  IIRC there are a few that explicitly check
for a Python version of 2.7.6.

~~ Ricardo

Re: [PATCH] python: update to 2.7.9

[Ludovic Courtès]

Mark H Weaver <mhw@netris.org> skribis:

> Cyril Roelandt <tipecaml@gmail.com> writes:
>
>> * gnu/packages/python.scm (python-2): Upgrade to 2.7.9.
>> * gnu/packages/patches/python-libffi-mips-n32-fix.patch: Delete.
>> * gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch: Delete.
>> * gnu-system.am: Remove the previous two patches.
>
> Unless there is an important reason to do this update now, I would
> prefer to wait on this until the next core-updates cycle.  The current
> cycle has already been delayed too long, and Andy's work on GNOME is
> waiting on it.
>
> What do you think?

I agree.

Ludo’.