01/01: Merge branch 'python-tests'

[Marius Bakke]

mbakke pushed a commit to branch master
in repository guix.

commit 3f98071ac5d8ffa722b2cf9c74c9c38bf413f059
Merge: 0a77fdf 2bb12f5
Author: Marius Bakke <address@hidden>
Date:   Fri Mar 3 16:55:43 2017 +0100

    Merge branch 'python-tests'

 gnu/local.mk                                       |    4 +
 gnu/packages/admin.scm                             |   22 +-
 gnu/packages/backup.scm                            |   19 +-
 gnu/packages/bioinformatics.scm                    |   37 +-
 gnu/packages/calendar.scm                          |    2 +-
 gnu/packages/django.scm                            |   13 +-
 gnu/packages/enlightenment.scm                     |   12 +-
 gnu/packages/jrnl.scm                              |    2 +-
 gnu/packages/mail.scm                              |    6 +-
 gnu/packages/music.scm                             |    2 +
 gnu/packages/openstack.scm                         |  143 ++-
 .../patches/python-dendropy-fix-tests.patch        |   41 +
 .../python-fake-factory-fix-build-32bit.patch      |   36 +
 .../patches/python-pbr-fix-man-page-support.patch  |   28 +
 .../python-pygit2-disable-network-tests.patch      |   64 ++
 .../python-pyopenssl-skip-network-test.patch       |   50 +
 gnu/packages/pdf.scm                               |    4 +
 gnu/packages/python.scm                            | 1039 +++++++++++++++-----
 gnu/packages/rdf.scm                               |   22 +-
 gnu/packages/terminals.scm                         |    3 +
 gnu/packages/version-control.scm                   |    2 +-
 gnu/packages/vpn.scm                               |    8 +
 guix/build/python-build-system.scm                 |   14 +-
 23 files changed, 1246 insertions(+), 327 deletions(-)

diff --cc gnu/packages/python.scm
index 05ce8d7,a8ba1b8..5631c7a
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -2482,13 -2505,12 +2539,12 @@@ installed with a newer @code{pip} or wi
               (uri (pypi-uri "requests" version))
               (sha256
                (base32
 -               "0d5fwxmw4ibynk3imph3n4n84m0n3ib1vj339fxhkqri0qd4767d"))))
 +               "1s0wg4any4dsv5l3hqjxqk2zgb7pdbqhy9rhc8kh3aigfq4ws8jp"))))
+     ;; TODO: unbundle urllib3 and chardet.
      (build-system python-build-system)
-     (native-inputs
-      `(("python-py" ,python-py)
-        ("python-pytest" ,python-pytest)
-        ("python-pytest-cov" ,python-pytest-cov)
-        ("python-wheel" ,python-wheel)))
+     (arguments
+      ;; FIXME: Some tests require network access.
+      '(#:tests? #f))
      (home-page "http://python-requests.org/";)
      (synopsis "Python HTTP library")
      (description