Merge branch 'python-tests'
authorMarius Bakke <mbakke@fastmail.com>
Fri, 3 Mar 2017 15:55:43 +0000 (16:55 +0100)
committerMarius Bakke <mbakke@fastmail.com>
Fri, 3 Mar 2017 15:55:43 +0000 (16:55 +0100)
1  2 
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/bioinformatics.scm
gnu/packages/enlightenment.scm
gnu/packages/mail.scm
gnu/packages/pdf.scm
gnu/packages/python.scm

diff --cc gnu/local.mk
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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