* Python 2.7.* @ 2015-07-31 18:05 Andreas Enge 2015-08-02 15:42 ` [PATCH] gnu: python-2: update to 2.7.10 eric 0 siblings, 1 reply; 14+ messages in thread From: Andreas Enge @ 2015-07-31 18:05 UTC (permalink / raw) To: guix-devel Hello, could maybe one of the python experts look at packaging a newer version of python 2.7? I need at least 2.7.9 for updating calibre, the old version of which does not compile with qt 5.5. Thanks for your help, I think someone knowing the package would be much more efficient than me with packaging. Andreas ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] gnu: python-2: update to 2.7.10. 2015-07-31 18:05 Python 2.7.* Andreas Enge @ 2015-08-02 15:42 ` eric 2015-08-02 19:56 ` Mark H Weaver 2015-08-18 15:30 ` Ludovic Courtès 0 siblings, 2 replies; 14+ messages in thread From: eric @ 2015-08-02 15:42 UTC (permalink / raw) To: Andreas Enge; +Cc: guix-devel, guix-devel-bounces+eric=dvorsak.fr [-- Attachment #1: Type: text/plain, Size: 1044 bytes --] On 31.07.2015 20:05, Andreas Enge wrote: > Hello, > > could maybe one of the python experts look at packaging a newer version > of python 2.7? I need at least 2.7.9 for updating calibre, the old > version > of which does not compile with qt 5.5. > > Thanks for your help, I think someone knowing the package would be much > more efficient than me with packaging. > > Andreas Hello, I updated the package to 2.7.10. This patch should be added to Hydra in a branch first to see if the 500 dependencies are still building properly. Altough the tests are still failing, I ran them after the build failed with : guix build -K cd tmp/nix-build-* env -i $(which bash) source environment-variables And they all passed except for some skips and a module that failed trying to write to a dir without permissions. Maybe there is a fix to do to enable the tests, the problem might be coming from the OS module. They fail because of an OSError exception, so I wonder if it could be because the module doesn't work withing the chroot. Eric. [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-gnu-python-2-update-to-2.7.10.patch --] [-- Type: text/x-diff; name=0001-gnu-python-2-update-to-2.7.10.patch, Size: 9311 bytes --] From 1ffc21f29ce255a1d3f613cb42532a0233f03b60 Mon Sep 17 00:00:00 2001 From: Eric Dvorsak <yenda1@gmail.com> Date: Sun, 2 Aug 2015 19:27:24 +0200 Subject: [PATCH] gnu: python-2: update to 2.7.10. Remove patches added to upstream --- 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 | 86 ++++++++++------------ 4 files changed, 39 insertions(+), 85 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 87924fe..12a87ef 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -593,9 +593,7 @@ dist_patch_DATA = \ gnu/packages/patches/pyqt-configure.patch \ gnu/packages/patches/python-disable-ssl-test.patch \ gnu/packages/patches/python-fix-tests.patch \ - gnu/packages/patches/python-libffi-mips-n32-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/qemu-CVE-2015-3209.patch \ gnu/packages/patches/qemu-CVE-2015-3456.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 4c13316..4e08fc9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -74,63 +74,55 @@ (define-public python-2 (package (name "python") - (version "2.7.6") + (version "2.7.10") (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")))) + "1h7zbrf9pkj29hlm18b10548ch9757f75m64l47sy75rh43p7lqw")))) (build-system gnu-build-system) (arguments `(#:tests? #f -;; 258 tests OK. -;; 103 tests failed: -;; test_bz2 test_distutils test_file test_file2k test_popen2 -;; test_shutil test_signal test_site test_slice test_smtplib -;; test_smtpnet test_socket test_socketserver test_softspace -;; test_sort test_sqlite test_ssl test_startfile test_str -;; test_strftime test_string test_stringprep test_strop test_strptime -;; test_strtod test_struct test_structmembers test_structseq -;; test_subprocess test_sunaudiodev test_sundry test_symtable -;; test_syntax test_sys test_sys_setprofile test_sys_settrace -;; test_sysconfig test_tarfile test_tcl test_telnetlib test_tempfile -;; test_textwrap test_thread test_threaded_import -;; test_threadedtempfile test_threading test_threading_local -;; test_threadsignals test_time test_timeout test_tk test_tokenize -;; test_tools test_trace test_traceback test_transformer -;; test_ttk_guionly test_ttk_textonly test_tuple test_typechecks -;; test_ucn test_unary test_undocumented_details test_unicode -;; test_unicode_file test_unicodedata test_univnewlines -;; test_univnewlines2k test_unpack test_urllib test_urllib2 -;; test_urllib2_localnet test_urllib2net test_urllibnet test_urlparse -;; test_userdict test_userlist test_userstring test_uu test_uuid -;; test_wait3 test_wait4 test_warnings test_wave test_weakref -;; test_weakset test_whichdb test_winreg test_winsound test_with -;; test_wsgiref test_xdrlib test_xml_etree test_xml_etree_c -;; test_xmllib test_xmlrpc test_xpickle test_xrange test_zipfile -;; test_zipfile64 test_zipimport test_zipimport_support test_zlib -;; 31 tests skipped: -;; test_aepack test_al test_applesingle test_ascii_formatd test_bsddb -;; test_bsddb185 test_bsddb3 test_cd test_cl test_codecmaps_cn -;; test_codecmaps_hk test_codecmaps_jp test_codecmaps_kr -;; test_codecmaps_tw test_ctypes test_curses test_dl test_gdb test_gl -;; test_imageop test_imgfile test_ioctl test_kqueue -;; test_linuxaudiodev test_macos test_macostools test_msilib -;; test_multiprocessing test_ossaudiodev test_pep277 -;; test_scriptpackages -;; 7 skips unexpected on linux2: -;; test_ascii_formatd test_bsddb test_bsddb3 test_ctypes test_gdb -;; test_ioctl test_multiprocessing -;; One of the typical errors: -;; test_unicode -;; test test_unicode crashed -- <type 'exceptions.OSError'>: [Errno 2] No such file or directory - #:test-target "test" + ;; 268 tests OK. + ;; 103 tests failed: + ;; test_distutils test_shutil test_signal test_site test_slice + ;; test_smtplib test_smtpnet test_socket test_socketserver + ;; test_softspace test_sort test_spwd test_sqlite test_ssl + ;; test_startfile test_stat test_str test_strftime test_string + ;; test_stringprep test_strop test_strptime test_strtod test_struct + ;; test_structmembers test_structseq test_subprocess test_sunau + ;; test_sunaudiodev test_sundry test_symtable test_syntax test_sys + ;; test_sys_setprofile test_sys_settrace test_sysconfig test_tarfile + ;; test_tcl test_telnetlib test_tempfile test_textwrap test_thread + ;; test_threaded_import test_threadedtempfile test_threading + ;; test_threading_local test_threadsignals test_time test_timeit + ;; test_timeout test_tk test_tokenize test_tools test_trace + ;; test_traceback test_transformer test_ttk_guionly test_ttk_textonly + ;; test_tuple test_typechecks test_ucn test_unary + ;; test_undocumented_details test_unicode test_unicode_file + ;; test_unicodedata test_univnewlines test_univnewlines2k test_unpack + ;; test_urllib test_urllib2 test_urllib2_localnet test_urllib2net + ;; test_urllibnet test_urlparse test_userdict test_userlist + ;; test_userstring test_uu test_uuid test_wait3 test_wait4 + ;; test_warnings test_wave test_weakref test_weakset test_whichdb + ;; test_winreg test_winsound test_with test_wsgiref test_xdrlib + ;; test_xml_etree test_xml_etree_c test_xmllib test_xmlrpc + ;; test_xpickle test_xrange test_zipfile test_zipfile64 + ;; test_zipimport test_zipimport_support test_zlib + ;; 30 tests skipped: + ;; test_aepack test_al test_applesingle test_bsddb test_bsddb185 + ;; test_bsddb3 test_cd test_cl test_codecmaps_cn test_codecmaps_hk + ;; test_codecmaps_jp test_codecmaps_kr test_codecmaps_tw test_crypt + ;; test_curses test_dl test_gdb test_gl test_idle test_imageop + ;; test_imgfile test_ioctl test_kqueue test_linuxaudiodev test_macos + ;; test_macostools test_msilib test_nis test_ossaudiodev + ;; test_scriptpackages + ;; 6 skips unexpected on linux2: + ;; test_bsddb test_bsddb3 test_crypt test_gdb test_idle test_ioctl + #:test-target "test" #:configure-flags (let ((bz2 (assoc-ref %build-inputs "bzip2")) (gdbm (assoc-ref %build-inputs "gdbm")) -- 2.4.3 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH] gnu: python-2: update to 2.7.10. 2015-08-02 15:42 ` [PATCH] gnu: python-2: update to 2.7.10 eric @ 2015-08-02 19:56 ` Mark H Weaver 2015-08-02 22:56 ` eric 2015-08-18 15:30 ` Ludovic Courtès 1 sibling, 1 reply; 14+ messages in thread From: Mark H Weaver @ 2015-08-02 19:56 UTC (permalink / raw) To: eric; +Cc: guix-devel Hi Eric, First, I notice that your mail client added "guix-devel-bounces+eric=dvorsak.fr@gnu.org" to the CC list. That's the "envelope sender" of the emails you receive from this email list, and it's used to detect bounces in case the mail is not successfully delivered to you. If you send email to it more than a few times, our mailman software might conclude that your email address is broken and disable deliveries to you. To make matters worse, anyone who "replies to all" to your email will by default include that address. Your mail client is buggy, and should be fixed somehow. When you "Reply to all" (or similar), it should *not* include the envelope sender. Maybe you could report the problem to its author, or switch clients? Anyway, moving on to your patch... eric@dvorsak.fr writes: > I updated the package to 2.7.10. This patch should be added to Hydra > in a branch first to see if the 500 dependencies are still building > properly. Your patch looks good except for three issues: * it needs a proper commit log conforming to our conventions * it needs proper indentation * you should add a copyright line for yourself to the top of python.scm See below for more details. > Altough the tests are still failing, I ran them after the build failed > with : > > guix build -K > cd tmp/nix-build-* > env -i $(which bash) > source environment-variables > > And they all passed except for some skips and a module that failed > trying to write to a dir without permissions. Okay, I guess the tests fail because of something missing from the isolated build environment. This is a longstanding problem unaffected by this patch. > From 1ffc21f29ce255a1d3f613cb42532a0233f03b60 Mon Sep 17 00:00:00 2001 > From: Eric Dvorsak <yenda1@gmail.com> > Date: Sun, 2 Aug 2015 19:27:24 +0200 > Subject: [PATCH] gnu: python-2: update to 2.7.10. Remove patches added to > upstream This needs a proper commit log that lists the changes made to each file, conforming to our conventions. See our existing git commits for examples. In this case, it should look something like this: --8<---------------cut here---------------start------------->8--- gnu: python-2: Update to 2.7.10. * gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch, gnu/packages/patches/python-libffi-mips-n32-fix.patch: Remove files. * gnu-system.am (dist_patch_DATA): Remove them. * gnu/packages/python.scm (python-2): Update to 2.7.10. Remove patches. Update comment showing test failures. --8<---------------cut here---------------end--------------->8--- > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm > index 4c13316..4e08fc9 100644 > --- a/gnu/packages/python.scm > +++ b/gnu/packages/python.scm Please add a copyright line for yourself to the top of this file. > @@ -74,63 +74,55 @@ > (define-public python-2 > (package > (name "python") > - (version "2.7.6") > + (version "2.7.10") > (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")))) > + "1h7zbrf9pkj29hlm18b10548ch9757f75m64l47sy75rh43p7lqw")))) The open quote should be below the "b", as it was before. > (build-system gnu-build-system) > (arguments > `(#:tests? #f > -;; 258 tests OK. > -;; 103 tests failed: > -;; test_bz2 test_distutils test_file test_file2k test_popen2 > -;; test_shutil test_signal test_site test_slice test_smtplib > -;; test_smtpnet test_socket test_socketserver test_softspace > -;; test_sort test_sqlite test_ssl test_startfile test_str > -;; test_strftime test_string test_stringprep test_strop test_strptime > -;; test_strtod test_struct test_structmembers test_structseq > -;; test_subprocess test_sunaudiodev test_sundry test_symtable > -;; test_syntax test_sys test_sys_setprofile test_sys_settrace > -;; test_sysconfig test_tarfile test_tcl test_telnetlib test_tempfile > -;; test_textwrap test_thread test_threaded_import > -;; test_threadedtempfile test_threading test_threading_local > -;; test_threadsignals test_time test_timeout test_tk test_tokenize > -;; test_tools test_trace test_traceback test_transformer > -;; test_ttk_guionly test_ttk_textonly test_tuple test_typechecks > -;; test_ucn test_unary test_undocumented_details test_unicode > -;; test_unicode_file test_unicodedata test_univnewlines > -;; test_univnewlines2k test_unpack test_urllib test_urllib2 > -;; test_urllib2_localnet test_urllib2net test_urllibnet test_urlparse > -;; test_userdict test_userlist test_userstring test_uu test_uuid > -;; test_wait3 test_wait4 test_warnings test_wave test_weakref > -;; test_weakset test_whichdb test_winreg test_winsound test_with > -;; test_wsgiref test_xdrlib test_xml_etree test_xml_etree_c > -;; test_xmllib test_xmlrpc test_xpickle test_xrange test_zipfile > -;; test_zipfile64 test_zipimport test_zipimport_support test_zlib > -;; 31 tests skipped: > -;; test_aepack test_al test_applesingle test_ascii_formatd test_bsddb > -;; test_bsddb185 test_bsddb3 test_cd test_cl test_codecmaps_cn > -;; test_codecmaps_hk test_codecmaps_jp test_codecmaps_kr > -;; test_codecmaps_tw test_ctypes test_curses test_dl test_gdb test_gl > -;; test_imageop test_imgfile test_ioctl test_kqueue > -;; test_linuxaudiodev test_macos test_macostools test_msilib > -;; test_multiprocessing test_ossaudiodev test_pep277 > -;; test_scriptpackages > -;; 7 skips unexpected on linux2: > -;; test_ascii_formatd test_bsddb test_bsddb3 test_ctypes test_gdb > -;; test_ioctl test_multiprocessing > -;; One of the typical errors: > -;; test_unicode > -;; test test_unicode crashed -- <type 'exceptions.OSError'>: [Errno 2] No such file or directory You removed the three lines above but didn't replace them with anything analogous. They seem useful. > - #:test-target "test" > + ;; 268 tests OK. > + ;; 103 tests failed: > + ;; test_distutils test_shutil test_signal test_site test_slice > + ;; test_smtplib test_smtpnet test_socket test_socketserver > + ;; test_softspace test_sort test_spwd test_sqlite test_ssl > + ;; test_startfile test_stat test_str test_strftime test_string > + ;; test_stringprep test_strop test_strptime test_strtod test_struct > + ;; test_structmembers test_structseq test_subprocess test_sunau > + ;; test_sunaudiodev test_sundry test_symtable test_syntax test_sys > + ;; test_sys_setprofile test_sys_settrace test_sysconfig test_tarfile > + ;; test_tcl test_telnetlib test_tempfile test_textwrap test_thread > + ;; test_threaded_import test_threadedtempfile test_threading > + ;; test_threading_local test_threadsignals test_time test_timeit > + ;; test_timeout test_tk test_tokenize test_tools test_trace > + ;; test_traceback test_transformer test_ttk_guionly test_ttk_textonly > + ;; test_tuple test_typechecks test_ucn test_unary > + ;; test_undocumented_details test_unicode test_unicode_file > + ;; test_unicodedata test_univnewlines test_univnewlines2k test_unpack > + ;; test_urllib test_urllib2 test_urllib2_localnet test_urllib2net > + ;; test_urllibnet test_urlparse test_userdict test_userlist > + ;; test_userstring test_uu test_uuid test_wait3 test_wait4 > + ;; test_warnings test_wave test_weakref test_weakset test_whichdb > + ;; test_winreg test_winsound test_with test_wsgiref test_xdrlib > + ;; test_xml_etree test_xml_etree_c test_xmllib test_xmlrpc > + ;; test_xpickle test_xrange test_zipfile test_zipfile64 > + ;; test_zipimport test_zipimport_support test_zlib > + ;; 30 tests skipped: > + ;; test_aepack test_al test_applesingle test_bsddb test_bsddb185 > + ;; test_bsddb3 test_cd test_cl test_codecmaps_cn test_codecmaps_hk > + ;; test_codecmaps_jp test_codecmaps_kr test_codecmaps_tw test_crypt > + ;; test_curses test_dl test_gdb test_gl test_idle test_imageop > + ;; test_imgfile test_ioctl test_kqueue test_linuxaudiodev test_macos > + ;; test_macostools test_msilib test_nis test_ossaudiodev > + ;; test_scriptpackages > + ;; 6 skips unexpected on linux2: > + ;; test_bsddb test_bsddb3 test_crypt test_gdb test_idle test_ioctl > + #:test-target "test" > #:configure-flags The large comment and the #:test-target line should be aligned with the existing #:tests? #f and #:configure-flags lines. In other words, two more spaces are needed before each comment line above, and three more spaces are needed before #:test-target. Can you send an updated patch? Thanks! Mark ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] gnu: python-2: update to 2.7.10. 2015-08-02 19:56 ` Mark H Weaver @ 2015-08-02 22:56 ` eric 2015-08-03 2:13 ` Mark H Weaver 0 siblings, 1 reply; 14+ messages in thread From: eric @ 2015-08-02 22:56 UTC (permalink / raw) To: guix-devel [-- Attachment #1: Type: text/plain, Size: 10414 bytes --] Hi Mark, Thank you very much for the detailed review. On 02.08.2015 21:56, Mark H Weaver wrote: > Hi Eric, > > First, I notice that your mail client added > "guix-devel-bounces+eric=dvorsak.fr@gnu.org" to the CC list. That's > the > "envelope sender" of the emails you receive from this email list, and > it's used to detect bounces in case the mail is not successfully > delivered to you. If you send email to it more than a few times, our > mailman software might conclude that your email address is broken and > disable deliveries to you. To make matters worse, anyone who "replies > to all" to your email will by default include that address. > > Your mail client is buggy, and should be fixed somehow. When you > "Reply > to all" (or similar), it should *not* include the envelope sender. > Maybe you could report the problem to its author, or switch clients? > It's the webclient (roundcube) from my mail provider (OVH). I am a bit surprised that it is buggy and I will switch for an Emacs client really soon, I just need to choose and configure it first. > Anyway, moving on to your patch... > > eric@dvorsak.fr writes: >> I updated the package to 2.7.10. This patch should be added to Hydra >> in a branch first to see if the 500 dependencies are still building >> properly. > > Your patch looks good except for three issues: > > * it needs a proper commit log conforming to our conventions I used your commit log below, I couldn't find anything else to add and I will try to be more cautious next time. > * it needs proper indentation I hope I nailed the big comment because I wasn't sure I got your instructions right. Emacs "M-q" command was breaking it, that's why I did not use it there and failed the alignment. > * you should add a copyright line for yourself to the top of python.scm It's already there from a previous patch. Eric > > See below for more details. > >> Altough the tests are still failing, I ran them after the build failed >> with : >> >> guix build -K >> cd tmp/nix-build-* >> env -i $(which bash) >> source environment-variables >> >> And they all passed except for some skips and a module that failed >> trying to write to a dir without permissions. > > Okay, I guess the tests fail because of something missing from the > isolated build environment. This is a longstanding problem unaffected > by this patch. > >> From 1ffc21f29ce255a1d3f613cb42532a0233f03b60 Mon Sep 17 00:00:00 2001 >> From: Eric Dvorsak <yenda1@gmail.com> >> Date: Sun, 2 Aug 2015 19:27:24 +0200 >> Subject: [PATCH] gnu: python-2: update to 2.7.10. Remove patches added >> to >> upstream > > This needs a proper commit log that lists the changes made to each > file, > conforming to our conventions. See our existing git commits for > examples. In this case, it should look something like this: > > --8<---------------cut here---------------start------------->8--- > gnu: python-2: Update to 2.7.10. > > * gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch, > gnu/packages/patches/python-libffi-mips-n32-fix.patch: Remove files. > * gnu-system.am (dist_patch_DATA): Remove them. > * gnu/packages/python.scm (python-2): Update to 2.7.10. Remove > patches. > Update comment showing test failures. > --8<---------------cut here---------------end--------------->8--- > >> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm >> index 4c13316..4e08fc9 100644 >> --- a/gnu/packages/python.scm >> +++ b/gnu/packages/python.scm > > Please add a copyright line for yourself to the top of this file. > >> @@ -74,63 +74,55 @@ >> (define-public python-2 >> (package >> (name "python") >> - (version "2.7.6") >> + (version "2.7.10") >> (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")))) >> + "1h7zbrf9pkj29hlm18b10548ch9757f75m64l47sy75rh43p7lqw")))) > > The open quote should be below the "b", as it was before. > >> (build-system gnu-build-system) >> (arguments >> `(#:tests? #f >> -;; 258 tests OK. >> -;; 103 tests failed: >> -;; test_bz2 test_distutils test_file test_file2k test_popen2 >> -;; test_shutil test_signal test_site test_slice test_smtplib >> -;; test_smtpnet test_socket test_socketserver test_softspace >> -;; test_sort test_sqlite test_ssl test_startfile test_str >> -;; test_strftime test_string test_stringprep test_strop >> test_strptime >> -;; test_strtod test_struct test_structmembers test_structseq >> -;; test_subprocess test_sunaudiodev test_sundry >> test_symtable >> -;; test_syntax test_sys test_sys_setprofile >> test_sys_settrace >> -;; test_sysconfig test_tarfile test_tcl test_telnetlib >> test_tempfile >> -;; test_textwrap test_thread test_threaded_import >> -;; test_threadedtempfile test_threading test_threading_local >> -;; test_threadsignals test_time test_timeout test_tk >> test_tokenize >> -;; test_tools test_trace test_traceback test_transformer >> -;; test_ttk_guionly test_ttk_textonly test_tuple >> test_typechecks >> -;; test_ucn test_unary test_undocumented_details >> test_unicode >> -;; test_unicode_file test_unicodedata test_univnewlines >> -;; test_univnewlines2k test_unpack test_urllib test_urllib2 >> -;; test_urllib2_localnet test_urllib2net test_urllibnet >> test_urlparse >> -;; test_userdict test_userlist test_userstring test_uu >> test_uuid >> -;; test_wait3 test_wait4 test_warnings test_wave >> test_weakref >> -;; test_weakset test_whichdb test_winreg test_winsound >> test_with >> -;; test_wsgiref test_xdrlib test_xml_etree test_xml_etree_c >> -;; test_xmllib test_xmlrpc test_xpickle test_xrange >> test_zipfile >> -;; test_zipfile64 test_zipimport test_zipimport_support >> test_zlib >> -;; 31 tests skipped: >> -;; test_aepack test_al test_applesingle test_ascii_formatd >> test_bsddb >> -;; test_bsddb185 test_bsddb3 test_cd test_cl >> test_codecmaps_cn >> -;; test_codecmaps_hk test_codecmaps_jp test_codecmaps_kr >> -;; test_codecmaps_tw test_ctypes test_curses test_dl >> test_gdb test_gl >> -;; test_imageop test_imgfile test_ioctl test_kqueue >> -;; test_linuxaudiodev test_macos test_macostools test_msilib >> -;; test_multiprocessing test_ossaudiodev test_pep277 >> -;; test_scriptpackages >> -;; 7 skips unexpected on linux2: >> -;; test_ascii_formatd test_bsddb test_bsddb3 test_ctypes >> test_gdb >> -;; test_ioctl test_multiprocessing >> -;; One of the typical errors: >> -;; test_unicode >> -;; test test_unicode crashed -- <type 'exceptions.OSError'>: >> [Errno 2] No such file or directory > > You removed the three lines above but didn't replace them with > anything analogous. They seem useful. > >> - #:test-target "test" >> + ;; 268 tests OK. >> + ;; 103 tests failed: >> + ;; test_distutils test_shutil test_signal test_site >> test_slice >> + ;; test_smtplib test_smtpnet test_socket test_socketserver >> + ;; test_softspace test_sort test_spwd test_sqlite test_ssl >> + ;; test_startfile test_stat test_str test_strftime >> test_string >> + ;; test_stringprep test_strop test_strptime test_strtod >> test_struct >> + ;; test_structmembers test_structseq test_subprocess >> test_sunau >> + ;; test_sunaudiodev test_sundry test_symtable test_syntax >> test_sys >> + ;; test_sys_setprofile test_sys_settrace test_sysconfig >> test_tarfile >> + ;; test_tcl test_telnetlib test_tempfile test_textwrap >> test_thread >> + ;; test_threaded_import test_threadedtempfile test_threading >> + ;; test_threading_local test_threadsignals test_time >> test_timeit >> + ;; test_timeout test_tk test_tokenize test_tools test_trace >> + ;; test_traceback test_transformer test_ttk_guionly >> test_ttk_textonly >> + ;; test_tuple test_typechecks test_ucn test_unary >> + ;; test_undocumented_details test_unicode test_unicode_file >> + ;; test_unicodedata test_univnewlines test_univnewlines2k >> test_unpack >> + ;; test_urllib test_urllib2 test_urllib2_localnet >> test_urllib2net >> + ;; test_urllibnet test_urlparse test_userdict test_userlist >> + ;; test_userstring test_uu test_uuid test_wait3 test_wait4 >> + ;; test_warnings test_wave test_weakref test_weakset >> test_whichdb >> + ;; test_winreg test_winsound test_with test_wsgiref >> test_xdrlib >> + ;; test_xml_etree test_xml_etree_c test_xmllib test_xmlrpc >> + ;; test_xpickle test_xrange test_zipfile test_zipfile64 >> + ;; test_zipimport test_zipimport_support test_zlib >> + ;; 30 tests skipped: >> + ;; test_aepack test_al test_applesingle test_bsddb >> test_bsddb185 >> + ;; test_bsddb3 test_cd test_cl test_codecmaps_cn >> test_codecmaps_hk >> + ;; test_codecmaps_jp test_codecmaps_kr test_codecmaps_tw >> test_crypt >> + ;; test_curses test_dl test_gdb test_gl test_idle >> test_imageop >> + ;; test_imgfile test_ioctl test_kqueue test_linuxaudiodev >> test_macos >> + ;; test_macostools test_msilib test_nis test_ossaudiodev >> + ;; test_scriptpackages >> + ;; 6 skips unexpected on linux2: >> + ;; test_bsddb test_bsddb3 test_crypt test_gdb test_idle >> test_ioctl >> + #:test-target "test" >> #:configure-flags > > The large comment and the #:test-target line should be aligned with the > existing #:tests? #f and #:configure-flags lines. In other words, two > more spaces are needed before each comment line above, and three more > spaces are needed before #:test-target. > > Can you send an updated patch? > > Thanks! > Mark [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-gnu-python-2-Update-to-2.7.10.patch --] [-- Type: text/x-diff; name=0001-gnu-python-2-Update-to-2.7.10.patch, Size: 9739 bytes --] From 5665e477589d97672cc6e27a1f454585a2ae773e Mon Sep 17 00:00:00 2001 From: Eric Dvorsak <yenda1@gmail.com> Date: Sun, 2 Aug 2015 19:27:24 +0200 Subject: [PATCH] gnu: python-2: Update to 2.7.10. * gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch, gnu/packages/patches/python-libffi-mips-n32-fix.patch: Remove files. * gnu-system.am (dist_patch_DATA): Remove them. * gnu/packages/python.scm (python-2): Update to 2.7.10. Remove patches. Update comment showing test failures. --- 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 | 88 +++++++++++----------- 4 files changed, 42 insertions(+), 84 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 87924fe..12a87ef 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -593,9 +593,7 @@ dist_patch_DATA = \ gnu/packages/patches/pyqt-configure.patch \ gnu/packages/patches/python-disable-ssl-test.patch \ gnu/packages/patches/python-fix-tests.patch \ - gnu/packages/patches/python-libffi-mips-n32-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/qemu-CVE-2015-3209.patch \ gnu/packages/patches/qemu-CVE-2015-3456.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 4c13316..92e2768 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -74,62 +74,58 @@ (define-public python-2 (package (name "python") - (version "2.7.6") + (version "2.7.10") (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")))) + "1h7zbrf9pkj29hlm18b10548ch9757f75m64l47sy75rh43p7lqw")))) (build-system gnu-build-system) (arguments `(#:tests? #f -;; 258 tests OK. -;; 103 tests failed: -;; test_bz2 test_distutils test_file test_file2k test_popen2 -;; test_shutil test_signal test_site test_slice test_smtplib -;; test_smtpnet test_socket test_socketserver test_softspace -;; test_sort test_sqlite test_ssl test_startfile test_str -;; test_strftime test_string test_stringprep test_strop test_strptime -;; test_strtod test_struct test_structmembers test_structseq -;; test_subprocess test_sunaudiodev test_sundry test_symtable -;; test_syntax test_sys test_sys_setprofile test_sys_settrace -;; test_sysconfig test_tarfile test_tcl test_telnetlib test_tempfile -;; test_textwrap test_thread test_threaded_import -;; test_threadedtempfile test_threading test_threading_local -;; test_threadsignals test_time test_timeout test_tk test_tokenize -;; test_tools test_trace test_traceback test_transformer -;; test_ttk_guionly test_ttk_textonly test_tuple test_typechecks -;; test_ucn test_unary test_undocumented_details test_unicode -;; test_unicode_file test_unicodedata test_univnewlines -;; test_univnewlines2k test_unpack test_urllib test_urllib2 -;; test_urllib2_localnet test_urllib2net test_urllibnet test_urlparse -;; test_userdict test_userlist test_userstring test_uu test_uuid -;; test_wait3 test_wait4 test_warnings test_wave test_weakref -;; test_weakset test_whichdb test_winreg test_winsound test_with -;; test_wsgiref test_xdrlib test_xml_etree test_xml_etree_c -;; test_xmllib test_xmlrpc test_xpickle test_xrange test_zipfile -;; test_zipfile64 test_zipimport test_zipimport_support test_zlib -;; 31 tests skipped: -;; test_aepack test_al test_applesingle test_ascii_formatd test_bsddb -;; test_bsddb185 test_bsddb3 test_cd test_cl test_codecmaps_cn -;; test_codecmaps_hk test_codecmaps_jp test_codecmaps_kr -;; test_codecmaps_tw test_ctypes test_curses test_dl test_gdb test_gl -;; test_imageop test_imgfile test_ioctl test_kqueue -;; test_linuxaudiodev test_macos test_macostools test_msilib -;; test_multiprocessing test_ossaudiodev test_pep277 -;; test_scriptpackages -;; 7 skips unexpected on linux2: -;; test_ascii_formatd test_bsddb test_bsddb3 test_ctypes test_gdb -;; test_ioctl test_multiprocessing -;; One of the typical errors: -;; test_unicode -;; test test_unicode crashed -- <type 'exceptions.OSError'>: [Errno 2] No such file or directory + ;; 268 tests OK. + ;; 103 tests failed: + ;; test_distutils test_shutil test_signal test_site test_slice + ;; test_smtplib test_smtpnet test_socket test_socketserver + ;; test_softspace test_sort test_spwd test_sqlite test_ssl + ;; test_startfile test_stat test_str test_strftime test_string + ;; test_stringprep test_strop test_strptime test_strtod test_struct + ;; test_structmembers test_structseq test_subprocess test_sunau + ;; test_sunaudiodev test_sundry test_symtable test_syntax test_sys + ;; test_sys_setprofile test_sys_settrace test_sysconfig test_tarfile + ;; test_tcl test_telnetlib test_tempfile test_textwrap test_thread + ;; test_threaded_import test_threadedtempfile test_threading + ;; test_threading_local test_threadsignals test_time test_timeit + ;; test_timeout test_tk test_tokenize test_tools test_trace + ;; test_traceback test_transformer test_ttk_guionly test_ttk_textonly + ;; test_tuple test_typechecks test_ucn test_unary + ;; test_undocumented_details test_unicode test_unicode_file + ;; test_unicodedata test_univnewlines test_univnewlines2k test_unpack + ;; test_urllib test_urllib2 test_urllib2_localnet test_urllib2net + ;; test_urllibnet test_urlparse test_userdict test_userlist + ;; test_userstring test_uu test_uuid test_wait3 test_wait4 + ;; test_warnings test_wave test_weakref test_weakset test_whichdb + ;; test_winreg test_winsound test_with test_wsgiref test_xdrlib + ;; test_xml_etree test_xml_etree_c test_xmllib test_xmlrpc + ;; test_xpickle test_xrange test_zipfile test_zipfile64 + ;; test_zipimport test_zipimport_support test_zlib + ;; 30 tests skipped: + ;; test_aepack test_al test_applesingle test_bsddb test_bsddb185 + ;; test_bsddb3 test_cd test_cl test_codecmaps_cn test_codecmaps_hk + ;; test_codecmaps_jp test_codecmaps_kr test_codecmaps_tw test_crypt + ;; test_curses test_dl test_gdb test_gl test_idle test_imageop + ;; test_imgfile test_ioctl test_kqueue test_linuxaudiodev test_macos + ;; test_macostools test_msilib test_nis test_ossaudiodev + ;; test_scriptpackages + ;; 6 skips unexpected on linux2: + ;; test_bsddb test_bsddb3 test_crypt test_gdb test_idle test_ioctl + ;; One of the typical errors: + ;; test_unicode + ;; test test_unicode crashed -- <type 'exceptions.OSError'>: [Errno 2] No + ;; such file or directory #:test-target "test" #:configure-flags (let ((bz2 (assoc-ref %build-inputs "bzip2")) -- 2.4.3 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH] gnu: python-2: update to 2.7.10. 2015-08-02 22:56 ` eric @ 2015-08-03 2:13 ` Mark H Weaver 2015-08-03 8:59 ` Andreas Enge 2015-08-04 14:52 ` Mark H Weaver 0 siblings, 2 replies; 14+ messages in thread From: Mark H Weaver @ 2015-08-03 2:13 UTC (permalink / raw) To: eric; +Cc: guix-devel eric@dvorsak.fr writes: > From 5665e477589d97672cc6e27a1f454585a2ae773e Mon Sep 17 00:00:00 2001 > From: Eric Dvorsak <yenda1@gmail.com> > Date: Sun, 2 Aug 2015 19:27:24 +0200 > Subject: [PATCH] gnu: python-2: Update to 2.7.10. > > * gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch, > gnu/packages/patches/python-libffi-mips-n32-fix.patch: Remove files. > * gnu-system.am (dist_patch_DATA): Remove them. > * gnu/packages/python.scm (python-2): Update to 2.7.10. Remove patches. > Update comment showing test failures. Your updated patch looks good to me, thanks! After hydra is finished building the 'icu4c-update' branch and we've merged that into master, I'll create a new branch for this python update and start hydra building it. Thanks! Mark ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] gnu: python-2: update to 2.7.10. 2015-08-03 2:13 ` Mark H Weaver @ 2015-08-03 8:59 ` Andreas Enge 2015-08-04 14:52 ` Mark H Weaver 1 sibling, 0 replies; 14+ messages in thread From: Andreas Enge @ 2015-08-03 8:59 UTC (permalink / raw) To: Mark H Weaver; +Cc: guix-devel Thanks also from me! This will make it possible to try a calibre update. Andreas ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] gnu: python-2: update to 2.7.10. 2015-08-03 2:13 ` Mark H Weaver 2015-08-03 8:59 ` Andreas Enge @ 2015-08-04 14:52 ` Mark H Weaver 2015-08-07 0:12 ` Mark H Weaver 1 sibling, 1 reply; 14+ messages in thread From: Mark H Weaver @ 2015-08-04 14:52 UTC (permalink / raw) To: eric; +Cc: guix-devel Mark H Weaver <mhw@netris.org> writes: > eric@dvorsak.fr writes: > >> From 5665e477589d97672cc6e27a1f454585a2ae773e Mon Sep 17 00:00:00 2001 >> From: Eric Dvorsak <yenda1@gmail.com> >> Date: Sun, 2 Aug 2015 19:27:24 +0200 >> Subject: [PATCH] gnu: python-2: Update to 2.7.10. >> >> * gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch, >> gnu/packages/patches/python-libffi-mips-n32-fix.patch: Remove files. >> * gnu-system.am (dist_patch_DATA): Remove them. >> * gnu/packages/python.scm (python-2): Update to 2.7.10. Remove patches. >> Update comment showing test failures. > > Your updated patch looks good to me, thanks! After hydra is finished > building the 'icu4c-update' branch and we've merged that into master, > I'll create a new branch for this python update and start hydra building > it. FYI, Hydra is now evaluating the 'python-update' jobset, and will then proceed to build it. http://hydra.gnu.org/jobset/gnu/python-update Mark ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] gnu: python-2: update to 2.7.10. 2015-08-04 14:52 ` Mark H Weaver @ 2015-08-07 0:12 ` Mark H Weaver 2015-08-10 13:56 ` Andreas Enge 0 siblings, 1 reply; 14+ messages in thread From: Mark H Weaver @ 2015-08-07 0:12 UTC (permalink / raw) To: eric; +Cc: guix-devel eric@dvorsak.fr writes: > From 5665e477589d97672cc6e27a1f454585a2ae773e Mon Sep 17 00:00:00 2001 > From: Eric Dvorsak <yenda1@gmail.com> > Date: Sun, 2 Aug 2015 19:27:24 +0200 > Subject: [PATCH] gnu: python-2: Update to 2.7.10. > > * gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch, > gnu/packages/patches/python-libffi-mips-n32-fix.patch: Remove files. > * gnu-system.am (dist_patch_DATA): Remove them. > * gnu/packages/python.scm (python-2): Update to 2.7.10. Remove patches. > Update comment showing test failures. This update is now pushed to master. Thanks! Mark ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] gnu: python-2: update to 2.7.10. 2015-08-07 0:12 ` Mark H Weaver @ 2015-08-10 13:56 ` Andreas Enge 2015-08-10 23:45 ` Mark H Weaver 0 siblings, 1 reply; 14+ messages in thread From: Andreas Enge @ 2015-08-10 13:56 UTC (permalink / raw) To: Mark H Weaver; +Cc: guix-devel Hello Mark, something does not work as expected in your commit 9f6509c655b766b0fb9dfab181a8533e698473b0 to accomodate python version numbers with two-digit components. Now the files are installed into lib/python.7. for python-2 modules (see, for instance, python2-sip). Everything seems to work as expected for python-3. Andreas ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] gnu: python-2: update to 2.7.10. 2015-08-10 13:56 ` Andreas Enge @ 2015-08-10 23:45 ` Mark H Weaver 2015-08-11 7:35 ` Andreas Enge 0 siblings, 1 reply; 14+ messages in thread From: Mark H Weaver @ 2015-08-10 23:45 UTC (permalink / raw) To: Andreas Enge; +Cc: guix-devel Hi Andreas, Andreas Enge <andreas@enge.fr> writes: > something does not work as expected in your commit > 9f6509c655b766b0fb9dfab181a8533e698473b0 to accomodate python version > numbers with two-digit components. Now the files are installed into > lib/python.7. for python-2 modules Actually, that's precisely the problem that was fixed by 9f6509c655b766b0fb9dfab181a8533e698473b0. > (see, for instance, python2-sip). The reason it still fails for python2-sip is because python-sip contains another copy of the same faulty code that I fixed in 9f6509c655b766b0fb9dfab181a8533e698473b0: --8<---------------cut here---------------start------------->8--- (python-version (string-take (string-take-right (assoc-ref inputs "python") 5) 3)) --8<---------------cut here---------------end--------------->8--- The commit logs show that you wrote both of these pieces of code: the one above, and the one I already fixed. Please don't assume that version numbers contain only single-digit components. In Scheme we have the tools to conveniently do this job properly. I'll leave it to you to fix this instance of the bug. If you know of any other occurrences of the same bug, can you fix them also? Thanks, Mark ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] gnu: python-2: update to 2.7.10. 2015-08-10 23:45 ` Mark H Weaver @ 2015-08-11 7:35 ` Andreas Enge 0 siblings, 0 replies; 14+ messages in thread From: Andreas Enge @ 2015-08-11 7:35 UTC (permalink / raw) To: Mark H Weaver; +Cc: guix-devel On Mon, Aug 10, 2015 at 07:45:23PM -0400, Mark H Weaver wrote: > Actually, that's precisely the problem that was fixed by > 9f6509c655b766b0fb9dfab181a8533e698473b0. > The reason it still fails for python2-sip is because python-sip > contains another copy of the same faulty code that I fixed in > 9f6509c655b766b0fb9dfab181a8533e698473b0: Ah, okay, sorry for the noise, I will have a look. > I'll leave it to you to fix this instance of the bug. If you know of > any other occurrences of the same bug, can you fix them also? I will have a quick look around if I spot any more of them. Andreas ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] gnu: python-2: update to 2.7.10. 2015-08-02 15:42 ` [PATCH] gnu: python-2: update to 2.7.10 eric 2015-08-02 19:56 ` Mark H Weaver @ 2015-08-18 15:30 ` Ludovic Courtès 2015-08-18 16:23 ` Eric Dvorsak 1 sibling, 1 reply; 14+ messages in thread From: Ludovic Courtès @ 2015-08-18 15:30 UTC (permalink / raw) To: eric; +Cc: guix-devel eric@dvorsak.fr skribis: > Altough the tests are still failing, I ran them after the build failed > with : > > guix build -K > cd tmp/nix-build-* > env -i $(which bash) > source environment-variables > > And they all passed except for some skips and a module that failed > trying to write to a dir without permissions. > > Maybe there is a fix to do to enable the tests, the problem might be > coming from the OS module. They fail because of an OSError exception, > so I wonder if it could be because the module doesn't work withing the > chroot. Wild guess: Could it be because Python’s bindings for ‘popen’ or something like that refer to /bin/sh, which is unavailable in the chroot, leading to ENOENT? Could you ‘grep -r /bin/sh’ in the source? Thanks, Ludo’. ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] gnu: python-2: update to 2.7.10. 2015-08-18 15:30 ` Ludovic Courtès @ 2015-08-18 16:23 ` Eric Dvorsak 2015-08-18 17:48 ` Eric Bavier 0 siblings, 1 reply; 14+ messages in thread From: Eric Dvorsak @ 2015-08-18 16:23 UTC (permalink / raw) To: Ludovic Courtès; +Cc: guix-devel Ludovic Courtès writes: > eric@dvorsak.fr skribis: > >> Altough the tests are still failing, I ran them after the build failed >> with : >> >> guix build -K >> cd tmp/nix-build-* >> env -i $(which bash) >> source environment-variables >> >> And they all passed except for some skips and a module that failed >> trying to write to a dir without permissions. >> >> Maybe there is a fix to do to enable the tests, the problem might be >> coming from the OS module. They fail because of an OSError exception, >> so I wonder if it could be because the module doesn't work withing the >> chroot. > > Wild guess: Could it be because Python’s bindings for ‘popen’ or > something like that refer to /bin/sh, which is unavailable in the > chroot, leading to ENOENT? Could you ‘grep -r /bin/sh’ in the source? > > Thanks, > Ludo’. Ag Results for `/bin/sh': plat-freebsd4/regen:1:#! /bin/sh plat-aix3/regen:1:#! /bin/sh plat-beos5/regen:1:#! /bin/sh plat-os2emx/regen:1:#! /bin/sh distutils/tests/test_install_scripts.py:57: write_script("shell.sh", ("#!/bin/sh\n" distutils/tests/test_build_scripts.py:68: ("#!/bin/sh\n" distutils/tests/test_spawn.py:35: self.write_file(exe, '#!/bin/sh\nexit 1') distutils/tests/test_spawn.py:47: self.write_file(exe, '#!/bin/sh\nexit 0') test/test__osx_support.py:47: f.write("#!/bin/sh\n/bin/echo OK\n") test/test__osx_support.py:59: f.write("#!/bin/sh\n/bin/echo ExpectedOutput\n") test/test__osx_support.py:150: f.write("#!/bin/sh\n/bin/echo " + c_output) test/test__osx_support.py:206: f.write("#!/bin/sh\nexit 255") test/test_os.py:365: if os.path.exists("/bin/sh"): test/test_os.py:367: with os.popen("/bin/sh -c 'echo $HELLO'") as popen: test/test_subprocess.py:862: os.write(f, "#!/bin/sh\n") test/test_subprocess.py:906: os.write(f, "#!/bin/sh\n") test/test_subprocess.py:925: sh = '/bin/sh' test/test_subprocess.py:927: # Test will fail if /bin/sh is a symlink to csh. plat-irix5/regen:1:#! /bin/sh plat-generic/regen:1:#! /bin/sh plat-linux2/regen:1:#! /bin/sh plat-netbsd1/regen:1:#! /bin/sh ctypes/macholib/fetch_macholib:1:#!/bin/sh plat-atheos/regen:1:#! /bin/sh plat-aix4/regen:1:#! /bin/sh plat-irix6/regen:1:#! /bin/sh plat-freebsd6/regen:1:#! /bin/sh plat-next3/regen:1:#! /bin/sh plat-freebsd5/regen:1:#! /bin/sh > This one ? > popen2.py:84: cmd = ['/bin/sh', '-c', cmd] plat-freebsd7/regen:1:#! /bin/sh plat-darwin/regen:1:#! /bin/sh subprocess.py:161:/bin/sh implicitly. This means that all characters, including shell subprocess.py:226:Replacing /bin/sh shell backquote subprocess.py:559: >>> check_output(["/bin/sh", "-c", subprocess.py:1209: args = ["/bin/sh", "-c"] + args pipes.py:36:second likewise for the output. The command must be valid /bin/sh pipes.py:262:# Reliably quote a string as a single argument for /bin/sh plat-freebsd8/regen:1:#! /bin/sh plat-sunos5/regen:1:#! /bin/sh plat-unixware7/regen:1:#! /bin/sh Here is the def : def _run_child(self, cmd): if isinstance(cmd, basestring): cmd = ['/bin/sh', '-c', cmd] os.closerange(3, MAXFD) try: os.execvp(cmd[0], cmd) finally: os._exit(1) What should be done to fix this ? Eric ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] gnu: python-2: update to 2.7.10. 2015-08-18 16:23 ` Eric Dvorsak @ 2015-08-18 17:48 ` Eric Bavier 0 siblings, 0 replies; 14+ messages in thread From: Eric Bavier @ 2015-08-18 17:48 UTC (permalink / raw) To: Eric Dvorsak; +Cc: guix-devel, guix-devel-bounces+ericbavier=openmailbox.org On 2015-08-18 11:23, Eric Dvorsak wrote: > Ludovic Courtès writes: > >> eric@dvorsak.fr skribis: >> >>> Altough the tests are still failing, I ran them after the build >>> failed >>> with : >>> >>> guix build -K >>> cd tmp/nix-build-* >>> env -i $(which bash) >>> source environment-variables >>> >>> And they all passed except for some skips and a module that failed >>> trying to write to a dir without permissions. >>> >>> Maybe there is a fix to do to enable the tests, the problem might be >>> coming from the OS module. They fail because of an OSError exception, >>> so I wonder if it could be because the module doesn't work withing >>> the >>> chroot. >> >> Wild guess: Could it be because Python’s bindings for ‘popen’ or >> something like that refer to /bin/sh, which is unavailable in the >> chroot, leading to ENOENT? Could you ‘grep -r /bin/sh’ in the source? >> >> Thanks, >> Ludo’. > > Ag Results for `/bin/sh': > > plat-freebsd4/regen:1:#! /bin/sh > plat-aix3/regen:1:#! /bin/sh > plat-beos5/regen:1:#! /bin/sh > plat-os2emx/regen:1:#! /bin/sh > distutils/tests/test_install_scripts.py:57: > write_script("shell.sh", ("#!/bin/sh\n" > distutils/tests/test_build_scripts.py:68: > ("#!/bin/sh\n" > distutils/tests/test_spawn.py:35: self.write_file(exe, > '#!/bin/sh\nexit 1') > distutils/tests/test_spawn.py:47: self.write_file(exe, > '#!/bin/sh\nexit 0') > test/test__osx_support.py:47: f.write("#!/bin/sh\n/bin/echo > OK\n") > test/test__osx_support.py:59: f.write("#!/bin/sh\n/bin/echo > ExpectedOutput\n") > test/test__osx_support.py:150: > f.write("#!/bin/sh\n/bin/echo " + c_output) > test/test__osx_support.py:206: f.write("#!/bin/sh\nexit > 255") > test/test_os.py:365: if os.path.exists("/bin/sh"): > test/test_os.py:367: with os.popen("/bin/sh -c 'echo > $HELLO'") as popen: > test/test_subprocess.py:862: os.write(f, "#!/bin/sh\n") > test/test_subprocess.py:906: os.write(f, "#!/bin/sh\n") > test/test_subprocess.py:925: sh = '/bin/sh' > test/test_subprocess.py:927: # Test will fail if /bin/sh is > a symlink to csh. > plat-irix5/regen:1:#! /bin/sh > plat-generic/regen:1:#! /bin/sh > plat-linux2/regen:1:#! /bin/sh > plat-netbsd1/regen:1:#! /bin/sh > ctypes/macholib/fetch_macholib:1:#!/bin/sh > plat-atheos/regen:1:#! /bin/sh > plat-aix4/regen:1:#! /bin/sh > plat-irix6/regen:1:#! /bin/sh > plat-freebsd6/regen:1:#! /bin/sh > plat-next3/regen:1:#! /bin/sh > plat-freebsd5/regen:1:#! /bin/sh >> This one ? >> popen2.py:84: cmd = ['/bin/sh', '-c', cmd] > plat-freebsd7/regen:1:#! /bin/sh > plat-darwin/regen:1:#! /bin/sh > subprocess.py:161:/bin/sh implicitly. This means that all characters, > including shell > subprocess.py:226:Replacing /bin/sh shell backquote > subprocess.py:559: >>> check_output(["/bin/sh", "-c", > subprocess.py:1209: args = ["/bin/sh", "-c"] + args > pipes.py:36:second likewise for the output. The command must be valid > /bin/sh > pipes.py:262:# Reliably quote a string as a single argument for /bin/sh > plat-freebsd8/regen:1:#! /bin/sh > plat-sunos5/regen:1:#! /bin/sh > plat-unixware7/regen:1:#! /bin/sh > > > Here is the def : > > def _run_child(self, cmd): > if isinstance(cmd, basestring): > cmd = ['/bin/sh', '-c', cmd] > os.closerange(3, MAXFD) > try: > os.execvp(cmd[0], cmd) > finally: > os._exit(1) > > > What should be done to fix this ? The python recipe already substitutes references to "/bin/sh" in Lib/subprocess.py and Lib/popen2.py in the 'patch-lib-shells' phase. It looks like some of the test files themselves need to be patched, however. -- `~Eric ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2015-08-18 17:48 UTC | newest] Thread overview: 14+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-07-31 18:05 Python 2.7.* Andreas Enge 2015-08-02 15:42 ` [PATCH] gnu: python-2: update to 2.7.10 eric 2015-08-02 19:56 ` Mark H Weaver 2015-08-02 22:56 ` eric 2015-08-03 2:13 ` Mark H Weaver 2015-08-03 8:59 ` Andreas Enge 2015-08-04 14:52 ` Mark H Weaver 2015-08-07 0:12 ` Mark H Weaver 2015-08-10 13:56 ` Andreas Enge 2015-08-10 23:45 ` Mark H Weaver 2015-08-11 7:35 ` Andreas Enge 2015-08-18 15:30 ` Ludovic Courtès 2015-08-18 16:23 ` Eric Dvorsak 2015-08-18 17:48 ` Eric Bavier
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).