[PATCH 01/31] gnu: Add python-exif-read.

[PATCH 01/31] gnu: Add python-exif-read.

[David Thompson]

* gnu/packages/python.scm (python-exif-read, python2-exif-read): New
  variables.
---
 gnu/packages/python.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 641a5df..17147b9 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -968,3 +968,30 @@ technique that encourages collaboration between developers, QA and
 non-technical or business participants in a software project.  Behave uses
 tests written in a natural language style, backed up by Python code.")
     (license x11)))
+
+(define-public python-exif-read
+  (package
+    (name "python-exif-read")
+    (version "1.4.2")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append
+                "https://pypi.python.org/packages/source/E/ExifRead/ExifRead-"
+                version ".tar.gz"))
+              (sha256
+               (base32
+                "17c627gcdmyc05hz4zk8qs4pjgw6rc68qzjzgz8gh1cmpsd7acf1"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (arguments `(#:tests? #f)) ; no tests
+    (home-page "https://github.com/ianare/exif-py")
+    (synopsis "Python library to extract EXIF data from image files")
+    (description
+     "ExifRead is a Python library to extract EXIF data from tiff and jpeg
+files.")
+    (license bsd-3)))
+
+(define-public python2-exif-read
+  (package-with-python2 python-exif-read))
-- 
2.0.1

[PATCH 02/31] gnu: Add python-pyld.

[David Thompson]

* gnu/packages/python.scm (python-pyld, python2-pyld): New variables.
---
 gnu/packages/python.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 17147b9..ad5def2 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -995,3 +995,29 @@ files.")
 
 (define-public python2-exif-read
   (package-with-python2 python-exif-read))
+
+(define-public python-pyld
+  (package
+    (name "python-pyld")
+    (version "0.6.0")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append
+                "https://pypi.python.org/packages/source/P/PyLD/PyLD-"
+                version ".tar.gz"))
+              (sha256
+               (base32
+                "1l9ymj85fsvayqplinzpk0kyiq6m74ps9xd3a9fhlxfn1rldf8x8"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (arguments `(#:tests? #f)) ; no tests
+    (home-page "http://github.com/digitalbazaar/pyld")
+    (synopsis "Python implementation of the JSON-LD specification")
+    (description
+     "PyLD is an implementation of the JSON-LD specification.")
+    (license bsd-3)))
+
+(define-public python2-pyld
+  (package-with-python2 python-pyld))
-- 
2.0.1

[PATCH 03/31] gnu: Add python-certifi.

[David Thompson]

* gnu/packages/python.scm (python-certifi, python2-certifi): New variables.
---
 gnu/packages/python.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index ad5def2..f591605 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1021,3 +1021,30 @@ files.")
 
 (define-public python2-pyld
   (package-with-python2 python-pyld))
+
+(define-public python-certifi
+  (package
+    (name "python-certifi")
+    (version "14.05.14")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append
+                "https://pypi.python.org/packages/source/c/certifi/certifi-"
+                version ".tar.gz"))
+              (sha256
+               (base32
+                "0s8vxzfz6s4m6fvxc7z25k9j35w0rh6jkw3wwcd1az1mssncn6qy"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (arguments `(#:tests? #f)) ; no tests
+    (home-page "http://python-requests.org/")
+    (synopsis "Python CA certificate bundle")
+    (description
+     "Certifi is a Python library that contains a CA certificate bundle, which
+is useful for verifying HTTP requests.")
+    (license asl2.0)))
+
+(define-public python2-certifi
+  (package-with-python2 python-certifi))
-- 
2.0.1

[PATCH 04/31] gnu: Add python2-requests.

[David Thompson]

* gnu/packages/python.scm (python2-requests): New variable.
---
 gnu/packages/python.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index f591605..35fcc2a 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1048,3 +1048,29 @@ is useful for verifying HTTP requests.")
 
 (define-public python2-certifi
   (package-with-python2 python-certifi))
+
+(define-public python2-requests
+  (package
+    (name "python2-requests")
+    (version "2.4.0")
+    (source (origin
+             (method url-fetch)
+             (uri
+              (string-append
+               "https://pypi.python.org/packages/source/r/requests/requests-"
+               version ".tar.gz"))
+             (sha256
+              (base32
+               "0gknlfx1wakrrm1zi8gi03x2lzj4dsns0vjw0nsmgqvkphyf01vh"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)
+       ("python-certifi" ,python-certifi)))
+    (arguments `(#:tests? #f ; no tests
+                 #:python ,python-2))
+    (home-page "http://python-requests.org/")
+    (synopsis "Python HTTP library")
+    (description
+     "Requests is an Apache2 Licensed HTTP library, written in Python, for
+human beings.")
+    (license asl2.0)))
-- 
2.0.1

[PATCH 05/31] gnu: Add python-jsonschema.

[David Thompson]

* gnu/packages/python.scm (python-jsonschema, python2-jsonschema): New
  variables.
---
 gnu/packages/python.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 35fcc2a..f5c5a14 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1074,3 +1074,28 @@ is useful for verifying HTTP requests.")
      "Requests is an Apache2 Licensed HTTP library, written in Python, for
 human beings.")
     (license asl2.0)))
+
+(define-public python-jsonschema
+  (package
+    (name "python-jsonschema")
+    (version "2.4.0")
+    (source (origin
+             (method url-fetch)
+             (uri
+              (string-append
+               "https://pypi.python.org/packages/source/j/jsonschema/jsonschema-"
+               version ".tar.gz"))
+             (sha256
+              (base32
+               "1yik3031ziygvq66rj3mzfqdgxj29sg1bkfc46wsgi7lnbqs560j"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page "http://github.com/Julian/jsonschema")
+    (synopsis "Implementation of JSON Schema for Python")
+    (description
+     "Jsonschema is an implementation of JSON Schema for Python.")
+    (license expat)))
+
+(define-public python2-jsonschema
+  (package-with-python2 python-jsonschema))
-- 
2.0.1

[PATCH 06/31] gnu: Add python-unidecode.

[David Thompson]

* gnu/packages/python.scm (python-unidecode, python2-unidecode): New
  variables.
---
 gnu/packages/python.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index f5c5a14..6dd4922 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1099,3 +1099,32 @@ human beings.")
 
 (define-public python2-jsonschema
   (package-with-python2 python-jsonschema))
+
+(define-public python-unidecode
+  (package
+    (name "python-unidecode")
+    (version "0.04.16")
+    (source (origin
+             (method url-fetch)
+             (uri
+              (string-append
+               "https://pypi.python.org/packages/source/U/Unidecode/Unidecode-"
+               version ".tar.gz"))
+             (sha256
+              (base32
+               "0yv56vc49rvippyxgxvcyz7jklc07ky38rcspax7p00sgmriiljc"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page "https://pypi.python.org/pypi/Unidecode")
+    (synopsis "ASCII transliterations of Unicode text")
+    (description
+     "Unidecode provides ASCII transliterations of Unicode text.  Unidecode is
+useful when integrating with legacy code that doesn't support Unicode, or for
+ease of entry of non-Roman names on a US keyboard, or when constructing ASCII
+machine identifiers from human-readable Unicode strings that should still be
+somewhat intelligeble.")
+    (license gpl2)))
+
+(define-public python2-unidecode
+  (package-with-python2 python-unidecode))
-- 
2.0.1

[PATCH 07/31] gnu: Add python-mimeparse.

[David Thompson]

* gnu/packages/python.scm (python-mimeparse, python2-mimeparse): New
  variables.
---
 gnu/packages/python.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 6dd4922..1db3778 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -939,6 +939,35 @@ In short, SCons is an easier, more reliable and faster way to build
 software.")
     (license x11)))
 
+(define-public python-mimeparse
+  (package
+    (name "python-mimeparse")
+    (version "0.1.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/p/python-mimeparse/python-mimeparse-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "1hyxg09kaj02ri0rmwjqi86wk4nd1akvv7n0dx77azz76wga4s9w"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (arguments
+     '(#:tests? #f)) ; no setup.py test command
+    (home-page
+     "https://github.com/dbtsai/python-mimeparse")
+    (synopsis "Python library for parsing MIME types.")
+    (description
+     "Mimeparse provides basic functions for parsing MIME type names and
+matching them against a list of media-ranges.")
+    (license expat)))
+
+(define-public python2-mimeparse
+  (package-with-python2 python-mimeparse))
+
 (define-public behave
   (package
     (name "behave")
-- 
2.0.1

[PATCH 08/31] gnu: Add python-extras.

[David Thompson]

* gnu/packages/python.scm (python-extras, python2-extras): New variables.
---
 gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 1db3778..05d7ef7 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -939,6 +939,34 @@ In short, SCons is an easier, more reliable and faster way to build
 software.")
     (license x11)))
 
+(define-public python-extras
+  (package
+    (name "python-extras")
+    (version "0.0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/e/extras/extras-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "1h7zx4dfyclalg0fqnfjijpn0f793a9mx8sy3b27gd31nr6dhq3s"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (arguments
+     ;; error in setup.cfg: command 'test' has no such option 'buffer'
+     '(#:tests? #f))
+    (home-page "https://github.com/testing-cabal/extras")
+    (synopsis "Useful extensions to the Python standard library")
+    (description
+     "Extras is a set of extensions to the Python standard library.")
+    (license expat)))
+
+(define-public python2-extras
+  (package-with-python2 python-extras))
+
 (define-public python-mimeparse
   (package
     (name "python-mimeparse")
-- 
2.0.1

[PATCH 09/31] gnu: Add python-nose.

[David Thompson]

* gnu/packages/python.scm (python-nose, python2-nose): New variables.
---
 gnu/packages/python.scm | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 05d7ef7..646ba81 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -23,7 +23,7 @@
 (define-module (gnu packages python)
   #:use-module ((guix licenses)
                 #:select (asl2.0 bsd-3 bsd-style cc0 expat x11 x11-style
-                          gpl2 gpl2+ lgpl2.1+
+                          gpl2 gpl2+ lgpl2.0+ lgpl2.1+
                           psfl public-domain))
   #:use-module ((guix licenses) #:select (zlib)
                                 #:renamer (symbol-prefix-proc 'license:))
@@ -996,6 +996,33 @@ matching them against a list of media-ranges.")
 (define-public python2-mimeparse
   (package-with-python2 python-mimeparse))
 
+(define-public python-nose
+  (package
+    (name "python-nose")
+    (version "1.3.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "https://pypi.python.org/packages/source/n/nose/nose-"
+               version ".tar.gz"))
+        (sha256
+          (base32
+            "00qymfgwg4iam4xi0w9bnv7lcb3fypq1hzfafzgs1rfmwaj67g3n"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (arguments
+     '(#:tests? #f)) ; FIXME: test suite fails
+    (home-page "http://readthedocs.org/docs/nose/")
+    (synopsis "Python testing library")
+    (description
+     "Nose extends the unittest library to make testing easier.")
+    (license lgpl2.0+)))
+
+(define-public python2-nose
+  (package-with-python2 python-nose))
+
 (define-public behave
   (package
     (name "behave")
-- 
2.0.1

[PATCH 10/31] gnu: Add python-unittest2.

[David Thompson]

* gnu/packages/python.scm (python-unittest2, python2-unittest2): New
  variables.
---
 gnu/packages/python.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 646ba81..a68c0b5 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1023,6 +1023,48 @@ matching them against a list of media-ranges.")
 (define-public python2-nose
   (package-with-python2 python-nose))
 
+(define-public python-unittest2
+  (package
+    (name "python-unittest2")
+    (version "0.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/u/unittest2py3k/unittest2py3k-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "00yl6lskygcrddx5zspkhr0ibgvpknl4678kkm6s626539grq93q"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page "http://pypi.python.org/pypi/unittest2")
+    (synopsis "Python unit testing library")
+    (description
+     "Unittest2 is a replacement for the unittest module in the Python
+standard library.")
+    (license psfl)))
+
+(define-public python2-unittest2
+  (package (inherit python-unittest2)
+    (name "python2-unittest2")
+    (version "0.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/u/unittest2/unittest2-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "0wbs4i4x3x7klr3v35ss6p9mcqz883i1xgcpkhvl7n2lyv6yhpda"))))
+    (inputs
+     `(("python2-setuptools" ,python-setuptools)))
+    (arguments
+     `(#:python ,python-2
+       #:tests? #f)))) ; no setup.py test command
+
 (define-public behave
   (package
     (name "behave")
-- 
2.0.1

[PATCH 11/31] gnu: Add python-py.

[David Thompson]

* gnu/packages/python.scm (python-py, python2-py): New variables.
---
 gnu/packages/python.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a68c0b5..6ef19d5 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1065,6 +1065,32 @@ standard library.")
      `(#:python ,python-2
        #:tests? #f)))) ; no setup.py test command
 
+(define-public python-py
+  (package
+    (name "python-py")
+    (version "1.4.23")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/p/py/py-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "1jkhffpai419v5rickm2vz86p9bkg3b3kcm2k4bi5wfajhw2m3xs"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page "http://pylib.readthedocs.org/")
+    (synopsis "Python library for parsing, I/O, instrospection, and logging")
+    (description
+     "Py is a Python library for path parsing, .ini file parsing, I/O, code
+introspection, and logging.")
+    (license expat)))
+
+(define-public python2-py
+  (package-with-python2 python-py))
+
 (define-public behave
   (package
     (name "behave")
-- 
2.0.1

[PATCH 12/31] gnu: Add python-pytest.

[David Thompson]

* gnu/packages/python.scm (python-pytest, python2-pytest): New variables.
---
 gnu/packages/python.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 6ef19d5..959a08b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1091,6 +1091,42 @@ introspection, and logging.")
 (define-public python2-py
   (package-with-python2 python-py))
 
+(define-public python-pytest
+  (package
+    (name "python-pytest")
+    (version "2.6.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/p/pytest/pytest-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "0g2w4p0n42wvz8rq4k6gnzpkakgz3g8sfanxk8jrsra9675snkcr"))
+       (modules '((guix build utils)))
+       (snippet
+        ;; One of the tests involves the /usr directory, so it fails.
+        '(substitute* "testing/test_argcomplete.py"
+           (("def test_remove_dir_prefix\\(self\\):")
+            "@pytest.mark.xfail\n    def test_remove_dir_prefix(self):")))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)
+       ("python-py" ,python-py)
+       ("python-nose" ,python-nose)
+       ("python-mock" ,python-mock)))
+    (home-page "http://pytest.org")
+    (synopsis "Python testing library")
+    (description
+     "Pytest is a testing tool that provides auto-discovery of test modules
+and functions, detailed info on failing assert statements, modular fixtures,
+and many external plugins.")
+    (license expat)))
+
+(define-public python2-pytest
+  (package-with-python2 python-pytest))
+
 (define-public behave
   (package
     (name "behave")
-- 
2.0.1

[PATCH 13/31] gnu: Add python-scripttest.

[David Thompson]

* gnu/packages/python.scm (python-scriptest, python2-scripttest): New
  variables.
---
 gnu/packages/python.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 959a08b..b597126 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1127,6 +1127,33 @@ and many external plugins.")
 (define-public python2-pytest
   (package-with-python2 python-pytest))
 
+(define-public python-scripttest
+  (package
+    (name "python-scripttest")
+    (version "1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/s/scripttest/scripttest-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "0f4w84k8ck82syys7yg9maz93mqzc8p5ymis941x034v44jzq74m"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)
+       ("python-pytest" ,python-pytest)))
+    (home-page "http://pythonpaste.org/scripttest/")
+    (synopsis "Python library to test command-line scripts")
+    (description "Scripttest is a Python helper library for testing
+interactive command-line applications.  With it you can run a script in a
+subprocess and see the output as well as any file modifications.")
+    (license expat)))
+
+(define-public python2-scripttest
+  (package-with-python2 python-scripttest))
+
 (define-public behave
   (package
     (name "behave")
-- 
2.0.1

[PATCH 14/31] gnu: Add python-testtools.

[David Thompson]

* gnu/packages/python.scm (python-testtools, python2-testtools): New
  variables.
---
 gnu/packages/python.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index b597126..2b5a1dd 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1154,6 +1154,36 @@ subprocess and see the output as well as any file modifications.")
 (define-public python2-scripttest
   (package-with-python2 python-scripttest))
 
+(define-public python-testtools
+  (package
+    (name "python-testtools")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/t/testtools/testtools-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "1dyml28ykpl5jb9khdmcdvhy1cxqingys6qvj2k04fzlaj6z3bbx"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)
+       ("python-mimeparse" ,python-mimeparse)
+       ("python-extras" ,python-extras)))
+    (home-page "https://github.com/testing-cabal/testtools")
+    (synopsis
+     "Extensions to the Python standard library unit testing framework")
+    (description
+     "Testtools extends the Python standard library unit testing framework to
+provide matchers, more debugging information, and cross-Python
+compatibility.")
+    (license psfl)))
+
+(define-public python2-testtools
+  (package-with-python2 python-testtools))
+
 (define-public behave
   (package
     (name "behave")
-- 
2.0.1

[PATCH 15/31] gnu: Add python-testscenarios.

[David Thompson]

* gnu/packages/python.scm (python-testscenarios, python2-testscenarios): New
  variables.
---
 gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 2b5a1dd..0338ccc 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1184,6 +1184,34 @@ compatibility.")
 (define-public python2-testtools
   (package-with-python2 python-testtools))
 
+(define-public python-testscenarios
+  (package
+    (name "python-testscenarios")
+    (version "0.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/t/testscenarios/testscenarios-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "1671jvrvqlmbnc42j7pc5y6vc37q44aiwrq0zic652pxyy2fxvjg"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)
+       ("python-testtools" ,python-testtools)
+       ("python-mimeparse" ,python-mimeparse)))
+    (home-page "https://launchpad.net/testscenarios")
+    (synopsis "Pyunit extension for dependency injection")
+    (description
+     "Testscenarios provides clean dependency injection for Python unittest
+style tests.")
+    (license (list bsd-3 asl2.0))))
+
+(define-public python2-testscenarios
+  (package-with-python2 python-testscenarios))
+
 (define-public behave
   (package
     (name "behave")
-- 
2.0.1

[PATCH 16/31] gnu: Add python-testresources.

[David Thompson]

* gnu/packages/python.scm (python-testresources, python2-testresources): New
  variables.
---
 gnu/packages/python.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0338ccc..9af90d2 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1212,6 +1212,33 @@ style tests.")
 (define-public python2-testscenarios
   (package-with-python2 python-testscenarios))
 
+(define-public python-testresources
+  (package
+    (name "python-testresources")
+    (version "0.2.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/t/testresources/testresources-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "0cbj3plbllyz42c4b5xxgwaa7mml54lakslrn4kkhinxhdri22md"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page "https://launchpad.net/testresources")
+    (synopsis
+     "Pyunit extension for managing test resources")
+    (description
+     "Testresources is an extension to Python's unittest to allow declarative
+use of resources by test cases.")
+    (license (list bsd-3 asl2.0))))
+
+(define-public python2-testresources
+  (package-with-python2 python-testresources))
+
 (define-public behave
   (package
     (name "behave")
-- 
2.0.1

[PATCH 17/31] gnu: Add python-subunit.

[David Thompson]

* gnu/packages/python.scm (python-subunit, python2-subunit): New variables.
---
 gnu/packages/python.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9af90d2..e48444d 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1239,6 +1239,35 @@ use of resources by test cases.")
 (define-public python2-testresources
   (package-with-python2 python-testresources))
 
+(define-public python-subunit
+  (package
+    (name "python-subunit")
+    (version "0.0.21")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/p/python-subunit/python-subunit-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "1nkw9wfbvizmpajbj3in8ns07g7lwkiv8hip14jjlwk3cacls6jv"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)
+       ("python-testtools" ,python-testtools)
+       ("python-mimeparse" ,python-mimeparse)
+       ("python-testscenarios" ,python-testscenarios)))
+    (home-page "http://launchpad.net/subunit")
+    (synopsis "Python implementation of the subunit protocol")
+    (description
+     "Python-subunit is a Python implementation of the subunit test streaming
+protocol.")
+    (license (list bsd-3 asl2.0))))
+
+(define-public python2-subunit
+  (package-with-python2 python-subunit))
+
 (define-public behave
   (package
     (name "behave")
-- 
2.0.1

[PATCH 18/31] gnu: Add python-fixtures.

[David Thompson]

* gnu/packages/python.scm (python-fixtures, python2-fixtures): New variables.
---
 gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index e48444d..76899d6 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1268,6 +1268,34 @@ protocol.")
 (define-public python2-subunit
   (package-with-python2 python-subunit))
 
+(define-public python-fixtures
+  (package
+    (name "python-fixtures")
+    (version "0.3.16")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/f/fixtures/fixtures-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "0x9r2gwilcig5g54k60bxzg96zabizq1855lrprlb4zckalp9asc"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (arguments
+     '(#:tests? #f)) ; no setup.py test command
+    (home-page "https://launchpad.net/python-fixtures")
+    (synopsis "Python test fixture library")
+    (description
+     "Fixtures provides a way to create reusable state, useful when writing
+Python tests.")
+    (license (list bsd-3 asl2.0))))
+
+(define-public python2-fixtures
+  (package-with-python2 python-fixtures))
+
 (define-public behave
   (package
     (name "behave")
-- 
2.0.1

[PATCH 19/31] gnu: Add python-testrepository.

[David Thompson]

* gnu/packages/python.scm (python-testrepository, python2-testrepository): New
  variables.
---
 gnu/packages/python.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 76899d6..40e62ac 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1296,6 +1296,36 @@ Python tests.")
 (define-public python2-fixtures
   (package-with-python2 python-fixtures))
 
+(define-public python-testrepository
+  (package
+    (name "python-testrepository")
+    (version "0.0.20")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/t/testrepository/testrepository-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "1ssqb07c277010i6gzzkbdd46gd9mrj0bi0i8vn560n2k2y4j93m"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)
+       ("python-testtools" ,python-testtools)
+       ("python-subunit" ,python-subunit)
+       ("python-fixtures" ,python-fixtures)
+       ("python-mimeparse" ,python-mimeparse)))
+    (home-page "https://launchpad.net/testrepository")
+    (synopsis "Database for Python test results")
+    (description "Testrepository provides a database of test results which can
+be used as part of a developer's workflow to check things such as what tests
+have failed since the last commit or what tests are currently failing.")
+    (license (list bsd-3 asl2.0))))
+
+(define-public python2-testrepository
+  (package-with-python2 python-testrepository))
+
 (define-public behave
   (package
     (name "behave")
-- 
2.0.1

[PATCH 20/31] gnu: Add python-discover.

[David Thompson]

* gnu/packages/python.scm (python-discover, python2-discover): New variables.
---
 gnu/packages/python.scm | 55 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 40e62ac..115168e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1326,6 +1326,61 @@ have failed since the last commit or what tests are currently failing.")
 (define-public python2-testrepository
   (package-with-python2 python-testrepository))
 
+(define-public python-coverage
+  (package
+    (name "python-coverage")
+    (version "3.7.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/c/coverage/coverage-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "0knlbq79g2ww6xzsyknj9rirrgrgc983dpa2d9nkdf31mb2a3bni"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page "http://nedbatchelder.com/code/coverage")
+    (synopsis "Code coverage measurement for Python")
+    (description
+     "Coverage measures code coverage, typically during test execution.  It
+uses the code analysis tools and tracing hooks provided in the Python standard
+library to determine which lines are executable, and which have been
+executed.")
+    (license bsd-3)))
+
+(define-public python2-coverage
+  (package-with-python2 python-coverage))
+
+(define-public python-discover
+  (package
+    (name "python-discover")
+    (version "0.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/d/discover/discover-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "0y8d0zwiqar51kxj8lzmkvwc3b8kazb04gk5zcb4nzg5k68zmhq5"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page "http://pypi.python.org/pypi/discover/")
+    (synopsis
+     "Python test discovery for unittest")
+    (description
+     "Discover provides test discovery for unittest, a feature that has been
+backported from Python 2.7 for Python 2.4+")
+    (license bsd-3)))
+
+(define-public python2-discover
+  (package-with-python2 python-discover))
+
 (define-public behave
   (package
     (name "behave")
-- 
2.0.1

[PATCH 21/31] gnu: Add python-pyjwt.

[David Thompson]

* gnu/packages/python.scm (python-pyjwt, python2-pyjwt): New variables.
---
 gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 115168e..2e16838 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1570,3 +1570,31 @@ somewhat intelligeble.")
 
 (define-public python2-unidecode
   (package-with-python2 python-unidecode))
+
+(define-public python-pyjwt
+  (package
+    (name "python-pyjwt")
+    (version "0.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/P/PyJWT/PyJWT-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "1ahqblfy2sj3xz34wsa48cn9rp0dspzq56p54i5znmws3b8gml6g"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (arguments
+     '(#:tests? #f)) ; test suite doesn't work
+    (home-page "http://github.com/progrium/pyjwt")
+    (synopsis "JSON Web Token implementation in Python")
+    (description
+     "PyJWT is a JSON Web Token implementation written in Python.")
+    (license expat)))
+
+(define-public python2-pyjwt
+  (package-with-python2 python-pyjwt))
+
-- 
2.0.1

[PATCH 22/31] gnu: Add python-pycrypto.

[David Thompson]

* gnu/packages/python.scm (python-pycrypto, python2-pycrypto): New variables.
---
 gnu/packages/python.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 2e16838..886dc03 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1598,3 +1598,35 @@ somewhat intelligeble.")
 (define-public python2-pyjwt
   (package-with-python2 python-pyjwt))
 
+(define-public python-pycrypto
+  (package
+    (name "python-pycrypto")
+    (version "2.6.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "https://pypi.python.org/packages/source/p/pycrypto/pycrypto-"
+               version ".tar.gz"))
+        (sha256
+          (base32
+            "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python" ,python) ;; need libpython3.3m
+       ("python-setuptools" ,python-setuptools)
+       ("gmp" ,gmp)))
+    (arguments
+     '(#:phases (alist-cons-before
+                 'build 'set-config-shell
+                 (lambda _
+                   (setenv "CONFIG_SHELL" (which "sh")))
+                 %standard-phases)))
+    (home-page "http://www.pycrypto.org/")
+    (synopsis "Cryptographic modules for Python.")
+    (description "Cryptographic modules for Python.")
+    (license public-domain)))
+
+(define-public python2-pycrypto
+  (package-with-python2 python-pycrypto))
+
-- 
2.0.1

[PATCH 23/31] gnu: Add python-oauthlib.

[David Thompson]

* gnu/packages/python.scm (python-oauthlib, python2-oauthlib): New variables.
---
 gnu/packages/python.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 886dc03..6c6fdb5 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1613,7 +1613,7 @@ somewhat intelligeble.")
             "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj"))))
     (build-system python-build-system)
     (inputs
-     `(("python" ,python) ;; need libpython3.3m
+     `(("python" ,python) ; need libpython3.3m
        ("python-setuptools" ,python-setuptools)
        ("gmp" ,gmp)))
     (arguments
@@ -1624,9 +1624,57 @@ somewhat intelligeble.")
                  %standard-phases)))
     (home-page "http://www.pycrypto.org/")
     (synopsis "Cryptographic modules for Python.")
-    (description "Cryptographic modules for Python.")
+    (description "Pycrypto is a collection of both secure hash functions (such
+as SHA256 and RIPEMD160), and various encryption algorithms (AES, DES, RSA,
+ElGamal, etc.).")
     (license public-domain)))
 
 (define-public python2-pycrypto
   (package-with-python2 python-pycrypto))
 
+(define-public python-oauthlib
+  (package
+    (name "python-oauthlib")
+    (version "0.6.3")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append
+                "https://pypi.python.org/packages/source/o/oauthlib/oauthlib-"
+                version ".tar.gz"))
+              (sha256
+               (base32
+                "1yaj3j64la4arwsbhbfmpnickzh3jpg9nlpyg409v8pp24isn48a"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)
+       ("python-pyjwt" ,python-pyjwt)
+       ("python-pycrypto" ,python-pycrypto)
+       ("python-nose" ,python-nose)
+       ("python-mock" ,python-mock)))
+    (home-page "https://github.com/idan/oauthlib")
+    (synopsis "OAuth implementation for Python")
+    (description
+     "Oauthlib is a generic, spec-compliant, thorough implementation of the
+OAuth request-signing logic.")
+    (license bsd-3)))
+
+(define-public python2-oauthlib
+  (let ((base (package-with-python2 python-oauthlib)))
+    (package
+      (inherit base)
+      (name "python2-oauthlib")
+      (version "0.6.3")
+      (source (origin
+                (method url-fetch)
+                (uri
+                 (string-append
+                  "https://pypi.python.org/packages/source/o/oauthlib/oauthlib-"
+                  version ".tar.gz"))
+                (sha256
+                 (base32
+                  "1yaj3j64la4arwsbhbfmpnickzh3jpg9nlpyg409v8pp24isn48a"))))
+      (inputs
+       (append (package-inputs base)
+               `(("python2-unittest2" ,python2-unittest2)))))))
+
-- 
2.0.1

[PATCH 24/31] gnu: Add python-itsdangerous.

[David Thompson]

* gnu/packages/python.scm (python-itsdangerous, python2-itsdangerous): New
  variables.
---
 gnu/packages/python.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 6c6fdb5..aa03e83 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1678,3 +1678,29 @@ OAuth request-signing logic.")
        (append (package-inputs base)
                `(("python2-unittest2" ,python2-unittest2)))))))
 
+(define-public python-itsdangerous
+  (package
+    (name "python-itsdangerous")
+    (version "0.24")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/i/itsdangerous/itsdangerous-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "06856q6x675ly542ig0plbqcyab6ksfzijlyf1hzhgg3sgwgrcyb"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page "http://github.com/mitsuhiko/itsdangerous")
+    (synopsis "Python library for passing data to/from untrusted environments")
+    (description
+     "Itsdangerous provides various helpers to pass trusted data to untrusted
+environments and back.")
+    (license bsd-3)))
+
+(define-public python2-itsdangerous
+  (package-with-python2 python-itsdangerous))
+
-- 
2.0.1

[PATCH 25/31] gnu: Add python-virtualenv.

[David Thompson]

* gnu/packages/python.scm (python-virtualenv, python2-virtualenv): New
  variables.
---
 gnu/packages/python.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index aa03e83..cb783e6 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1704,3 +1704,30 @@ environments and back.")
 (define-public python2-itsdangerous
   (package-with-python2 python-itsdangerous))
 
+(define-public python-virtualenv
+  (package
+    (name "python-virtualenv")
+    (version "1.11.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/v/virtualenv/virtualenv-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "1xq4prmg25n9cz5zcvbqx68lmc3kl39by582vd8pzs9f3qalqyiy"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)
+       ("python-mock" ,python-mock)
+       ("python-nose" ,python-nose)))
+    (home-page "https://virtualenv.pypa.io/")
+    (synopsis "Virtual Python environment builder")
+    (description
+     "Virtualenv is a tool to create isolated Python environments.")
+    (license expat)))
+
+(define-public python2-virtualenv
+  (package-with-python2 python-virtualenv))
+
-- 
2.0.1

[PATCH 26/31] gnu: Add python-pip.

[David Thompson]

* gnu/packages/python.scm (python-pip, python2-pip): New variables.
---
 gnu/packages/python.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index cb783e6..3638382 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1731,3 +1731,32 @@ environments and back.")
 (define-public python2-virtualenv
   (package-with-python2 python-virtualenv))
 
+(define-public python-pip
+  (package
+    (name "python-pip")
+    (version "1.5.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/p/pip/pip-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "0v3jy7cxq57yiv7811qzx8lgl1i71k2kfksybaq7w6zjp9kax95i"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)
+       ("python-mock" ,python-mock)
+       ("python-pytest" ,python-pytest)
+       ("python-scripttest" ,python-scripttest)
+       ("python-virtualenv" ,python-virtualenv)))
+    (home-page "https://pip.pypa.io/")
+    (synopsis "Python package manager")
+    (description
+     "Pip is a tool for installing and managing Python packages.")
+    (license expat)))
+
+(define-public python2-pip
+  (package-with-python2 python-pip))
+
-- 
2.0.1

[PATCH 27/31] gnu: Add python-markupsafe.

[David Thompson]

* gnu/packages/python.scm (python-markupsafe, python2-markupsafe): New
  variables.
---
 gnu/packages/python.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 3638382..e2b3fa9 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1760,3 +1760,29 @@ environments and back.")
 (define-public python2-pip
   (package-with-python2 python-pip))
 
+(define-public python-markupsafe
+  (package
+    (name "python-markupsafe")
+    (version "0.23")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "1hvip33wva3fnmvfp9x5klqri7hpl1hkgqmjbss18nmrb7zimv54"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page "http://github.com/mitsuhiko/markupsafe")
+    (synopsis "XML/HTML/XHTML markup safe string implementation for Python")
+    (description
+     "Markupsafe provides an XML/HTML/XHTML markup safe string implementation
+for Python.")
+    (license bsd-3)))
+
+(define-public python2-markupsafe
+  (package-with-python2 python-markupsafe))
+
-- 
2.0.1

[PATCH 28/31] gnu: Add python-jinja2.

[David Thompson]

* gnu/packages/python.scm (python-jinja2, python2-jinja2): New variables.
---
 gnu/packages/python.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index e2b3fa9..6f7d474 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1786,3 +1786,30 @@ for Python.")
 (define-public python2-markupsafe
   (package-with-python2 python-markupsafe))
 
+(define-public python-jinja2
+  (package
+    (name "python-jinja2")
+    (version "2.7.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/J/Jinja2/Jinja2-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "1nwg9yfqgy421lncnm63k1zf9xkd1klc0jm0fr4p3dad01fsq91f"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)
+       ("python-markupsafe" ,python-markupsafe)))
+    (home-page "http://jinja.pocoo.org/")
+    (synopsis "Python template engine")
+    (description
+     "Jinja2 is a small but fast and easy to use stand-alone template engine
+written in pure Python.")
+    (license bsd-3)))
+
+(define-public python2-jinja2
+  (package-with-python2 python-jinja2))
+
-- 
2.0.1

[PATCH 29/31] gnu: Add python-docutils.

[David Thompson]

* gnu/packages/python.scm (python-docutils, python2-docutils): New variables.
---
 gnu/packages/python.scm | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 6f7d474..b90d4d7 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -22,8 +22,8 @@
 
 (define-module (gnu packages python)
   #:use-module ((guix licenses)
-                #:select (asl2.0 bsd-3 bsd-style cc0 expat x11 x11-style
-                          gpl2 gpl2+ lgpl2.0+ lgpl2.1+
+                #:select (asl2.0 bsd-3 bsd-2 bsd-style cc0 expat x11 x11-style
+                          gpl2 gpl3 gpl2+ lgpl2.0+ lgpl2.1+
                           psfl public-domain))
   #:use-module ((guix licenses) #:select (zlib)
                                 #:renamer (symbol-prefix-proc 'license:))
@@ -1813,3 +1813,32 @@ written in pure Python.")
 (define-public python2-jinja2
   (package-with-python2 python-jinja2))
 
+(define-public python-docutils
+  (package
+    (name "python-docutils")
+    (version "0.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/d/docutils/docutils-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "1ylnjnw1x4b2y7blr6x35ncdzn69k253kw4cdkv6asdb21w73ny7"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (arguments
+     '(#:tests? #f)) ; no setup.py test command
+    (home-page "http://docutils.sourceforge.net/")
+    (synopsis "Python Documentation Utilities")
+    (description
+     "Docutils is a modular system for processing documentation into useful
+formats, such as HTML, XML, and LaTeX.  For input Docutils supports
+reStructuredText.")
+    (license (list public-domain psfl bsd-2 gpl3))))
+
+(define-public python2-docutils
+  (package-with-python2 python-docutils))
+
-- 
2.0.1

[PATCH 30/31] gnu: Add python-pygments.

[David Thompson]

* gnu/packages/python.scm (python-pygments, python2-pygments): New variables.
---
 gnu/packages/python.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index b90d4d7..7dc0a46 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1842,3 +1842,28 @@ reStructuredText.")
 (define-public python2-docutils
   (package-with-python2 python-docutils))
 
+(define-public python-pygments
+  (package
+    (name "python-pygments")
+    (version "1.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/P/Pygments/Pygments-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "1h11r6ss8waih51vcksfvzghfxiav2f8svc0812fa5kmyz5d97kr"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page "http://pygments.org/")
+    (synopsis "Syntax highlighting")
+    (description
+     "Pygments is a syntax highlighting package written in Python.")
+    (license bsd-2)))
+
+(define-public python2-pygments
+  (package-with-python2 python-pygments))
+
-- 
2.0.1

[PATCH 31/31] gnu: Add python-sphinx.

[David Thompson]

* gnu/packages/python.scm (python-sphinx, python2-sphinx): New variables.
---
 gnu/packages/python.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7dc0a46..e366e73 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1867,3 +1867,32 @@ reStructuredText.")
 (define-public python2-pygments
   (package-with-python2 python-pygments))
 
+(define-public python-sphinx
+  (package
+    (name "python-sphinx")
+    (version "1.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/S/Sphinx/Sphinx-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "011xizm3jnmf4cvs5i6kgf6c5nn046h79i8j0vd0f27yw9j3p4wl"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-setuptools" ,python-setuptools)
+       ("python-jinja2" ,python-jinja2)
+       ("python-docutils" ,python-docutils)
+       ("python-pygments" ,python-pygments)))
+    (home-page "http://sphinx-doc.org/")
+    (synopsis "Python documentation generator")
+    (description "Sphinx is a tool that makes it easy to create documentation
+for Python projects or other documents consisting of multiple reStructuredText
+sources.")
+    (license bsd-3)))
+
+(define-public python2-sphinx
+  (package-with-python2 python-sphinx))
+
-- 
2.0.1

Re: [PATCH 22/31] gnu: Add python-pycrypto.

[Eric Bavier]

David Thompson writes:

> * gnu/packages/python.scm (python-pycrypto, python2-pycrypto): New variables.
> ---
>  gnu/packages/python.scm | 32 ++++++++++++++++++++++++++++++++
>  1 file changed, 32 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 2e16838..886dc03 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -1598,3 +1598,35 @@ somewhat intelligeble.")
>  (define-public python2-pyjwt
>    (package-with-python2 python-pyjwt))
>  
> +(define-public python-pycrypto

As I pointed out on IRC, this package is redundant with the one added in
cafc3f5a.

> +    (inputs
> +     `(("python" ,python) ;; need libpython3.3m
> +       ("python-setuptools" ,python-setuptools)
> +       ("gmp" ,gmp)))

Should python-setuptools perhaps go in native-inputs (this question
applies to the other patches sent in this batch as well)?  Not all of
the existing python packages follow this, but maybe they should.
Someone more practiced with cross-compilation might know better.

-- 
Eric Bavier

Re: [PATCH 22/31] gnu: Add python-pycrypto.

[David Thompson]

Eric Bavier <ericbavier@gmail.com> writes:

> David Thompson writes:
>
>> * gnu/packages/python.scm (python-pycrypto, python2-pycrypto): New variables.
>> ---
>>  gnu/packages/python.scm | 32 ++++++++++++++++++++++++++++++++
>>  1 file changed, 32 insertions(+)
>>
>> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
>> index 2e16838..886dc03 100644
>> --- a/gnu/packages/python.scm
>> +++ b/gnu/packages/python.scm
>> @@ -1598,3 +1598,35 @@ somewhat intelligeble.")
>>  (define-public python2-pyjwt
>>    (package-with-python2 python-pyjwt))
>>  
>> +(define-public python-pycrypto
>
> As I pointed out on IRC, this package is redundant with the one added in
> cafc3f5a.
>

Thanks for letting me know.  Not sure how I missed that.  This patch
will be dropped.

>> +    (inputs
>> +     `(("python" ,python) ;; need libpython3.3m
>> +       ("python-setuptools" ,python-setuptools)
>> +       ("gmp" ,gmp)))
>
> Should python-setuptools perhaps go in native-inputs (this question
> applies to the other patches sent in this batch as well)?  Not all of
> the existing python packages follow this, but maybe they should.
> Someone more practiced with cross-compilation might know better.

I was wondering about that myself, and also whether to make the test
suite dependencies native inputs as well.  From what I could tell, using
native inputs doesn't work the way you'd hope when using
'package-with-python2'.  Not totally sure, though, I didn't explore it
very much.

Since there's some uncertainty, could we leave setuptools as a regular
input for now and address it later?

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 22/31] gnu: Add python-pycrypto.

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> Eric Bavier <ericbavier@gmail.com> writes:
>
>> David Thompson writes:

[...]

>>> +    (inputs
>>> +     `(("python" ,python) ;; need libpython3.3m
>>> +       ("python-setuptools" ,python-setuptools)
>>> +       ("gmp" ,gmp)))
>>
>> Should python-setuptools perhaps go in native-inputs (this question
>> applies to the other patches sent in this batch as well)?  Not all of
>> the existing python packages follow this, but maybe they should.
>> Someone more practiced with cross-compilation might know better.

If setuptools is used only to drive the installation process, then yes,
it should be native.

> I was wondering about that myself, and also whether to make the test
> suite dependencies native inputs as well.  From what I could tell, using
> native inputs doesn't work the way you'd hope when using
> 'package-with-python2'.  Not totally sure, though, I didn't explore it
> very much.

I wonder what the problem is.  :-)

> Since there's some uncertainty, could we leave setuptools as a regular
> input for now and address it later?

Yes, that’s fine with me.

Ludo’.

Re: [PATCH 01/31] gnu: Add python-exif-read.

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> * gnu/packages/python.scm (python-exif-read, python2-exif-read): New
>   variables.

LGTM.

(I’ll assume you’re confident about the ‘license’ fields.  Presumably
PiPy does some sanity checks?)

Ludo’.

Re: [PATCH 02/31] gnu: Add python-pyld.

[Ludovic Courtès]

OK.

Re: [PATCH 05/31] gnu: Add python-jsonschema.

[Ludovic Courtès]

OK.

Re: [PATCH 03/31] gnu: Add python-certifi.

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> * gnu/packages/python.scm (python-certifi, python2-certifi): New variables.

OK, but:

> +    (description
> +     "Certifi is a Python library that contains a CA certificate bundle, which
> +is useful for verifying HTTP requests.")

“which is used by the Requests library to verify HTTPS requests.”

(My understanding of
<http://docs.python-requests.org/en/latest/user/advanced/#ca-certificates>.)

Thanks,
Ludo’.

Re: [PATCH 04/31] gnu: Add python2-requests.

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> * gnu/packages/python.scm (python2-requests): New variable.

[...]

> +    (description
> +     "Requests is an Apache2 Licensed HTTP library, written in Python, for
> +human beings.")

Rather something more technical and factual:

  Requests is a Python HTTP client library.  It aims to be easier to use
  than Python’s urllib2 library.

Ludo’.

Re: [PATCH 09/31] gnu: Add python-nose.

[Ludovic Courtès]

OK

Re: [PATCH 10/31] gnu: Add python-unittest2.

[Ludovic Courtès]

OK

Re: [PATCH 03/31] gnu: Add python-certifi.

[David Thompson]

Ludovic Courtès <ludo@gnu.org> writes:

> David Thompson <dthompson2@worcester.edu> skribis:
>
>> * gnu/packages/python.scm (python-certifi, python2-certifi): New variables.
>
> OK, but:
>
>> +    (description
>> +     "Certifi is a Python library that contains a CA certificate bundle, which
>> +is useful for verifying HTTP requests.")
>
> “which is used by the Requests library to verify HTTPS requests.”
>
> (My understanding of
> <http://docs.python-requests.org/en/latest/user/advanced/#ca-certificates>.)

Yes, that's a better description.  Fixed in my local git branch.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 11/31] gnu: Add python-py.

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> * gnu/packages/python.scm (python-py, python2-py): New variables.

OK.

> +    (description
> +     "Py is a Python library for path parsing, .ini file parsing, I/O, code

s/path/file name/.

Ludo'.

Re: [PATCH 16/31] gnu: Add python-testresources.

[Ludovic Courtès]

OK

Re: [PATCH 14/31] gnu: Add python-testtools.

[Ludovic Courtès]

OK

Re: [PATCH 17/31] gnu: Add python-subunit.

[Ludovic Courtès]

OK

Re: [PATCH 23/31] gnu: Add python-oauthlib.

[Ludovic Courtès]

OK

Re: [PATCH 12/31] gnu: Add python-pytest.

[Ludovic Courtès]

OK

Re: [PATCH 12/31] gnu: Add python-pytest.

[Ludovic Courtès]

I believe this is the fifth test framework I see in this patch series.

Re: [PATCH 28/31] gnu: Add python-jinja2.

[Ludovic Courtès]

OK

Re: [PATCH 18/31] gnu: Add python-fixtures.

[Ludovic Courtès]

OK

Re: [PATCH 21/31] gnu: Add python-pyjwt.

[Ludovic Courtès]

OK

Re: [PATCH 24/31] gnu: Add python-itsdangerous.

[Ludovic Courtès]

OK

Re: [PATCH 25/31] gnu: Add python-virtualenv.

[Ludovic Courtès]

OK

Re: [PATCH 26/31] gnu: Add python-pip.

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> * gnu/packages/python.scm (python-pip, python2-pip): New variables.

OK.

Does it actually work without patching?  No hard-coded /usr/local or
anything like that?

Ludo’.

Re: [PATCH 07/31] gnu: Add python-mimeparse.

[Ludovic Courtès]

OK

Re: [PATCH 08/31] gnu: Add python-extras.

[Ludovic Courtès]

OK

Re: [PATCH 13/31] gnu: Add python-scripttest.

[Ludovic Courtès]

OK

Re: [PATCH 19/31] gnu: Add python-testrepository.

[Ludovic Courtès]

OK

Re: [PATCH 01/31] gnu: Add python-exif-read.

[David Thompson]

Ludovic Courtès <ludo@gnu.org> writes:

> David Thompson <dthompson2@worcester.edu> skribis:
>
>> * gnu/packages/python.scm (python-exif-read, python2-exif-read): New
>>   variables.
>
> LGTM.
>
> (I’ll assume you’re confident about the ‘license’ fields.  Presumably
> PiPy does some sanity checks?)

I checked them as best as I could since the license info on pypi didn't
specify the version of the license being used.  Most projects were using
expat or BSD 3-clause licenses.  The most likely mistake I could have
made would be accidentally specifiying bsd-3 when it should have been
bsd-2, but I tried to make sure that didn't happen.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 20/31] gnu: Add python-discover.

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> * gnu/packages/python.scm (python-discover, python2-discover): New variables.

[...]

> +(define-public python-coverage
> +  (package
> +    (name "python-coverage")
> +    (version "3.7.1")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> +             "https://pypi.python.org/packages/source/c/coverage/coverage-"
> +             version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "0knlbq79g2ww6xzsyknj9rirrgrgc983dpa2d9nkdf31mb2a3bni"))))
> +    (build-system python-build-system)
> +    (inputs
> +     `(("python-setuptools" ,python-setuptools)))
> +    (home-page "http://nedbatchelder.com/code/coverage")
> +    (synopsis "Code coverage measurement for Python")
> +    (description
> +     "Coverage measures code coverage, typically during test execution.  It
> +uses the code analysis tools and tracing hooks provided in the Python standard
> +library to determine which lines are executable, and which have been
> +executed.")
> +    (license bsd-3)))
> +
> +(define-public python2-coverage
> +  (package-with-python2 python-coverage))

This one looks OK, but you may want to move it to a separate patch, or
to mention it in the commit log.

> +(define-public python-discover

OK.

Ludo’.

Re: [PATCH 06/31] gnu: Add python-unidecode.

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> * gnu/packages/python.scm (python-unidecode, python2-unidecode): New
>   variables.

OK.

> +    (license gpl2)))

v2-only, right?

Ludo’.

Re: [PATCH 15/31] gnu: Add python-testscenarios.

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> * gnu/packages/python.scm (python-testscenarios, python2-testscenarios): New
>   variables.

OK, but...

> +    (license (list bsd-3 asl2.0))))

Please add a comment stating if it’s one or the other at the user’s
option, or if it’s a mixture of both.

Ludo’.

Re: [PATCH 27/31] gnu: Add python-markupsafe.

[Ludovic Courtès]

OK

Re: [PATCH 30/31] gnu: Add python-pygments.

[Ludovic Courtès]

OK

Re: [PATCH 31/31] gnu: Add python-sphinx.

[Ludovic Courtès]

OK

Re: [PATCH 01/31] gnu: Add python-exif-read.

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> I checked them as best as I could since the license info on pypi didn't
> specify the version of the license being used.  Most projects were using
> expat or BSD 3-clause licenses.  The most likely mistake I could have
> made would be accidentally specifiying bsd-3 when it should have been
> bsd-2, but I tried to make sure that didn't happen.

Awesome, thanks for taking the time.

Ludo’.

Re: [PATCH 06/31] gnu: Add python-unidecode.

[David Thompson]

Ludovic Courtès <ludo@gnu.org> writes:

> David Thompson <dthompson2@worcester.edu> skribis:
>
>> * gnu/packages/python.scm (python-unidecode, python2-unidecode): New
>>   variables.
>
> OK.
>
>> +    (license gpl2)))
>
> v2-only, right?

I thought it was... but it's gpl2+!  Fixed!

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 20/31] gnu: Add python-discover.

[David Thompson]

Ludovic Courtès <ludo@gnu.org> writes:

> This one looks OK, but you may want to move it to a separate patch, or
> to mention it in the commit log.

Oops, accidentally merged two patches together.  I've separated coverage
and discover into two patches.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

Re: [PATCH 26/31] gnu: Add python-pip.

[David Thompson]

Ludovic Courtès <ludo@gnu.org> writes:

> David Thompson <dthompson2@worcester.edu> skribis:
>
>> * gnu/packages/python.scm (python-pip, python2-pip): New variables.
>
> OK.
>
> Does it actually work without patching?  No hard-coded /usr/local or
> anything like that?

It needs patching.  There's a library (not in this patch set) that has
pip as a dependency, which is why I made this package.  Considering that
I didn't include it in the patch set and this doesn't really work, I'm
dropping it.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate