On Wed, Jun 22, 2016 at 08:15:02AM -0500, Christopher Allan Webber wrote: > Ludovic Courtès writes: > >> From bbc1f68204318d79ece3fa46ed71d7c21d6ec8a2 Mon Sep 17 00:00:00 2001 > >> From: Christopher Allan Webber > > >> diff --git a/gnu/packages/patches/python-fix-tests-py3.5.patch b/gnu/packages/patches/python-fix-tests-py3.5.patch > >> new file mode 100644 > >> index 0000000..47dded4 > >> --- /dev/null > >> +++ b/gnu/packages/patches/python-fix-tests-py3.5.patch > >> @@ -0,0 +1,35 @@ > >> +Additional test fixes which affect Python 3.5 (and presumably later) but not > >> +prior revisions of Python. > >> + > >> +--- Lib/test/test_pathlib.py 2014-03-01 03:02:36.088311000 +0100 > >> ++++ Lib/test/test_pathlib.py 2014-03-01 04:56:37.768311000 +0100 > >> +@@ -1986,8 +1986,9 @@ > >> + expect = set() if not support.fs_is_case_insensitive(BASE) else given > >> + self.assertEqual(given, expect) > >> + self.assertEqual(set(p.rglob("FILEd*")), set()) > >> + > >> ++ @unittest.skipIf(True, "Guix builder home is '/' which causes trouble for these tests") > > > > Could it be that adding a phase that does (setenv "HOME" (getcwd)) would > > help? IIUC, we already do that in python-2, and python-3 inherits from python-2. So, it seems that it's not enough. > I'll try to get the rest of this done this afternoon, but it might > happen sometime later this week. ;) I picked this up. I've attached two patches. They upgrade python-3.4 to 3.4.5, and then upgrade python-3 to 3.5.2 while preserving a python-3.4. These are the latest releases in their respective series. I had to split part of the python-fix-tests.patch into 3.4 and 3.5 specific patches, since those packages' codebases have diverged. python@3.4.5 and python@3.5.2 both build on master and wip-python. python-setuptools builds with python@3.5.2 on master. I'd like to put these on core-updates. The wip-python branch will take a while to get ready. I found this saga about what Nix had to do to upgrade setuptools: https://github.com/NixOS/nixpkgs/pull/12552