bug#26524: Add conda and dependencies

bug#26524: Add conda and dependencies

[Frederick Muriithi]

[-- Attachment #1: Type: text/plain, Size: 414 bytes --]

Package: guix-patches
Version: 0.12.0

Dear Guix,

This is bug is to track adding conda and its dependencies. I will be
sending patches adding the dependencies for conda here, until we get
conda in mainline.

I will start with version 4.3.7, being the one I have tested, then I
can update it.

I had sent these to guix-devel@gnu.org, and was informed to send the
patches to guix-patches

-- 
Frederick M. Muriithi

[-- Attachment #2: 0001-gnu-Add-python-radon.patch --]
[-- Type: text/x-patch, Size: 2301 bytes --]

From d603aad94b7de48b9762f7bb4720b61ce2e7274f Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Fri, 14 Apr 2017 10:37:24 +0300
Subject: [PATCH 01/20] gnu: Add python-radon

* gnu/packages/python.scm (python-radon): New variable.
---
 gnu/packages/python.scm | 40 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 231c629..23b6d86 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -13950,7 +13950,7 @@ recognize TestCases.")
   (package-with-python2 python-mando))
 
 (define-public python-mando-0.3.1
-  ;; python-radon (version 1.5.0) has a requirement
+  ;; python-radon has a requirement
   ;; for mando<0.4,>=0.3
   (package
     (inherit python-mando)
@@ -13965,3 +13965,41 @@ recognize TestCases.")
        (sha256
         (base32
          "17jlkdpqw22z1nyml5ybslilqkzmnk0dxxjml8bfghav1l5hbwd2"))))))
+
+(define-public python-radon
+  ;; xenon has a hard requirement for radon>=1.4.0,<1.5
+  (package
+    (name "python-radon")
+    (version "1.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "radon" version))
+       (sha256
+        (base32
+         "15xyzavfj1zwb5rn07fs2wfi6ccys9b5q0s8hmnpqz712mifl92g"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-colorama" ,python-colorama)
+       ("python-flake8-polyfill"
+        ,python-flake8-polyfill)
+       ("python-mando" ,python-mando-0.3.1)))
+    (native-inputs
+     `(("python-flake8" ,python-flake8)
+       ("python-tox" ,python-tox)
+       ("python-pytest" ,python-pytest)
+       ("python-paramunittest" ,python-paramunittest)))
+    (home-page "https://radon.readthedocs.org/")
+    (synopsis "Code Metrics in Python")
+    (description "Radon is a Python tool which computes various code metrics.  Supported
+ metrics are:
+@itemize @bullet
+@item raw metrics: SLOC, comment lines, blank lines, &c.
+@item Cyclomatic Complexity (i.e.  McCabe’s Complexity)
+@item Halstead metrics (all of them)
+@item the Maintainability Index (a Visual Studio metric)
+@end itemize")
+    (license license:expat)))
+
+(define-public python2-radon
+  (package-with-python2 python-radon))
-- 
2.10.2


[-- Attachment #3: 0002-gnu-Add-python-httpbin.patch --]
[-- Type: text/x-patch, Size: 1550 bytes --]

From 12faf8960349a8b8b8989af3a606dde59941dbab Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Fri, 14 Apr 2017 10:45:05 +0300
Subject: [PATCH 02/20] gnu: Add python-httpbin

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 23b6d86..618b965 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14003,3 +14003,30 @@ recognize TestCases.")
 
 (define-public python2-radon
   (package-with-python2 python-radon))
+
+(define-public python-httpbin
+  (package
+    (name "python-httpbin")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "httpbin" version))
+       (sha256
+        (base32
+         "1dc92lnk846hpilslrqnr63x55cxll4qx88gif8fm521gv9cbyvr"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-decorator" ,python-decorator)
+       ("python-flask" ,python-flask)
+       ("python-itsdangerous" ,python-itsdangerous)
+       ("python-markupsafe" ,python-markupsafe)
+       ("python-six" ,python-six)))
+    (home-page "https://github.com/Runscope/httpbin")
+    (synopsis "HTTP Request and Response Service")
+    (description "HTTP Request and Response Service which covers all kinds of HTTP
+scenarios")
+    (license license:expat)))
+
+(define-public python2-httpbin
+  (package-with-python2 python-httpbin))
-- 
2.10.2


[-- Attachment #4: 0003-gnu-Add-python-pytest-httpbin.patch --]
[-- Type: text/x-patch, Size: 1576 bytes --]

From e9764356e3601c2927021eb5b687bc432b1eff20 Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Fri, 14 Apr 2017 10:55:59 +0300
Subject: [PATCH 03/20] gnu: Add python-pytest-httpbin

* gnu/packages/python.scm (python-pytest-httpbin): New variable.
---
 gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 618b965..73d217b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14030,3 +14030,31 @@ scenarios")
 
 (define-public python2-httpbin
   (package-with-python2 python-httpbin))
+
+(define-public python-pytest-httpbin
+  ;; httpretty requires pytest-httpbin==0.0.7
+  (package
+    (name "python-pytest-httpbin")
+    (version "0.0.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest-httpbin" version))
+       (sha256
+        (base32
+         "08ghq923dn33rllip3vap2p9fb680g0i96jdn5lcpfy8amq8mbq3"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-six" ,python-six)
+       ("python-httpbin" ,python-httpbin)
+       ("python-pytest" ,python-pytest)))
+    (home-page
+     "https://github.com/kevin1024/pytest-httpbin")
+    (synopsis
+     "Easily test your HTTP library against a local copy of httpbin")
+    (description
+     "Easily test your HTTP library against a local copy of httpbin")
+    (license license:expat)))
+
+(define-public python2-pytest-httpbin
+  (package-with-python2 python-pytest-httpbin))
-- 
2.10.2


[-- Attachment #5: 0004-gnu-Add-python-sphinx-rtd-theme-0.1.9.patch --]
[-- Type: text/x-patch, Size: 1385 bytes --]

From 1f4c44b1d47c2cc75cef75704ccd1cc386d5a862 Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Fri, 14 Apr 2017 11:02:10 +0300
Subject: [PATCH 04/20] gnu: Add python-sphinx-rtd-theme-0.1.9

* gnu/packages/python.scm (python-sphinx-rtd-theme-0.1.9) New variable
---
 gnu/packages/python.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 73d217b..631b6fd 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14058,3 +14058,24 @@ scenarios")
 
 (define-public python2-pytest-httpbin
   (package-with-python2 python-pytest-httpbin))
+
+(define-public python-sphinx-rtd-theme-0.1.9
+  ;; python-httpretty has a hard requirement for
+  ;; python-sphinx-rtd-theme version 0.1.9
+  (package
+    (inherit python-sphinx-rtd-theme)
+    (name "python-sphinx-rtd-theme")
+    (version "0.1.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "sphinx_rtd_theme" version))
+       (sha256
+        (base32
+         "18d0r63w7jpdrk4q5qy26n08vdlmnj9sar93akwjphyambw4cf17"))))
+    (propagated-inputs
+     `(("python-sphinx" ,python-sphinx-1.5.3)
+       ("python-snowballstemmer" ,python-snowballstemmer)))))
+
+(define-public python2-sphinx-rtd-theme-0.1.9
+  (package-with-python2 python-sphinx-rtd-theme-0.1.9))
-- 
2.10.2


[-- Attachment #6: 0005-gnu-Add-python-sphinx-1.3.3.patch --]
[-- Type: text/x-patch, Size: 2024 bytes --]

From 77e2a627333baa82d4f83882e5bda629e5f2a381 Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Fri, 14 Apr 2017 11:06:00 +0300
Subject: [PATCH 05/20] gnu: Add python-sphinx-1.3.3

* gnu/packages/python.scm (python-sphinx-1.3.3): New variable.
---
 gnu/packages/python.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 631b6fd..a849e70 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14079,3 +14079,40 @@ scenarios")
 
 (define-public python2-sphinx-rtd-theme-0.1.9
   (package-with-python2 python-sphinx-rtd-theme-0.1.9))
+
+(define-public python-sphinx-1.3.3
+  ;; python-httpretty has a hard requirement for
+  ;; sphinx == 1.3.3
+  (package
+    (inherit python-sphinx)
+    (name "python-sphinx")
+    (version "1.3.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "Sphinx" version))
+       (sha256
+        (base32
+         "1n3h08qxfx9bywv7nhjz0p5bpp1xgy4nzalxr3mx6syra7rvyxs0"))))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+                  (lambda _
+                    ;; Requires Internet access.
+                    (delete-file "tests/test_build.py")
+                    (delete-file "tests/test_build_applehelp.py")
+                    (delete-file "tests/test_i18n.py")
+                    (delete-file "tests/test_build_html.py")
+                    (delete-file "tests/test_build_texinfo.py")
+                    (delete-file "tests/test_build_latex.py")
+                    (zero? (system* "make" "test")))))))
+    (native-inputs
+     `(("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)
+       ("python-nose" ,python-nose)
+       ("graphviz" ,graphviz)
+       ("python-html5lib" ,python-html5lib)
+       ("python-mock" ,python-mock)))))
+
+(define-public python2-sphinx-1.3.3
+  (package-with-python2 python-sphinx-1.3.3))
-- 
2.10.2


[-- Attachment #7: 0006-gnu-Add-python-coverage-4.0.3.patch --]
[-- Type: text/x-patch, Size: 1148 bytes --]

From 075fec8683fec552e030c4c5f4de92dd3d4942eb Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Fri, 14 Apr 2017 11:08:32 +0300
Subject: [PATCH 06/20] gnu: Add python-coverage-4.0.3

* gnu/packages/python.scm (python-coverage-4.0.3): New variable.
---
 gnu/packages/python.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a849e70..1ec1744 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14116,3 +14116,20 @@ scenarios")
 
 (define-public python2-sphinx-1.3.3
   (package-with-python2 python-sphinx-1.3.3))
+
+(define-public python-coverage-4.0.3
+  ;; httpretty has a hard requirement for coverage==4.0.3
+  (package
+    (inherit python-coverage)
+    (name "python-coverage")
+    (version "4.0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "coverage" version))
+       (sha256
+        (base32
+         "0qjlja8ny4gcfp8abqfwdrvr8qw9kr69lkja0b4cqqbsdmdjgcc5"))))))
+
+(define-public python2-coverage-4.0.3
+  (package-with-python2 python-coverage-4.0.3))
-- 
2.10.2


[-- Attachment #8: 0007-gnu-Add-python-urllib3-1.12.patch --]
[-- Type: text/x-patch, Size: 1078 bytes --]

From 851864f62e82a10720cfe24642d22790f662f6bc Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Fri, 14 Apr 2017 11:12:38 +0300
Subject: [PATCH 07/20] gnu: Add python-urllib3-1.12

* gnu/packages/python.scm (python-urllib3-1.12): New variable.
---
 gnu/packages/python.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 1ec1744..9cb27d8 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14133,3 +14133,19 @@ scenarios")
 
 (define-public python2-coverage-4.0.3
   (package-with-python2 python-coverage-4.0.3))
+
+(define-public python-urllib3-1.12
+  (package
+    (inherit python-urllib3)
+    (name "python-urllib3")
+    (version "1.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "urllib3" version))
+       (sha256
+        (base32
+         "1ikj72kd4cdcq7pmmcd5p6s9dvp7wi0zw01635v4xzkid5vi598f"))))))
+
+(define-public python2-urllib3-1.12
+  (package-with-python2 python-urllib3-1.12))
-- 
2.10.2


[-- Attachment #9: 0008-gnu-Add-python-sure.patch --]
[-- Type: text/x-patch, Size: 1624 bytes --]

From 45f52eee27ac62a7f2b5bc2acbd289d0151a7581 Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Fri, 14 Apr 2017 11:23:33 +0300
Subject: [PATCH 08/20] gnu: Add python-sure

* gnu/package/python.scm (python-sure): New variable.
---
 gnu/packages/python.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9cb27d8..951b7c7 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14149,3 +14149,33 @@ scenarios")
 
 (define-public python2-urllib3-1.12
   (package-with-python2 python-urllib3-1.12))
+
+(define-public python-sure
+  (package
+    ;; httpretty has a hard requirement for sure==1.2.24
+    (name "python-sure")
+    (version "1.2.24")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "sure" version))
+       (sha256
+        (base32
+         "1lyjq0rvkbv585dppjdq90lbkm6gyvag3wgrggjzyh7cpyh5c12w"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-mock" ,python-mock)
+       ("python-six" ,python-six)))
+    (native-inputs
+     `(("python-nose" ,python-nose)))
+    (home-page
+     "http://github.com/gabrielfalcao/sure")
+    (synopsis
+     "Sure is an automated testing library in python for python")
+    (description
+     "Sure is a python library for python that leverages a DSL for writing assertions.
+Sure is heavily inspired by @code{RSpec Expectations} and @code{should.js}")
+    (license license:gpl3)))
+
+(define-public python2-sure
+  (package-with-python2 python-sure))
-- 
2.10.2


[-- Attachment #10: 0009-gnu-Add-python-couleur.patch --]
[-- Type: text/x-patch, Size: 1666 bytes --]

From fc1780bf7930de8c6b96966e19e7ba4aecf52589 Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Fri, 14 Apr 2017 11:35:40 +0300
Subject: [PATCH 09/20] gnu: Add python-couleur

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 951b7c7..148ed74 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14179,3 +14179,32 @@ Sure is heavily inspired by @code{RSpec Expectations} and @code{should.js}")
 
 (define-public python2-sure
   (package-with-python2 python-sure))
+
+(define-public python-couleur
+  (package
+    (name "python-couleur")
+    (version "0.6.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "couleur" version))
+       (sha256
+        (base32
+         "1qqaxyqz74wvid0cr119dhcwz0h0if5b5by44zl49pd5z65v58k1"))))
+    (build-system python-build-system)
+    (arguments
+     `(;; The package builds successfully with python3, but the
+       ;; tests are python-2 dependent, (strings of the form
+       ;; ur'val-of-str' and imports of python-2 specific
+       ;; modules)
+       #:tests? #f))
+    (home-page
+     "http://github.com/gabrielfalcao/couleur")
+    (synopsis
+     "ANSI terminal tool for python, colored shell and other handy fancy features")
+    (description
+     "Couleur is a handy tool to play around with ANSI features in a unix terminal.")
+    (license license:asl2.0)))
+
+(define-public python2-couleur
+  (package-with-python2 python-couleur))
-- 
2.10.2


[-- Attachment #11: 0010-gnu-Add-python-misaka.patch --]
[-- Type: text/x-patch, Size: 2106 bytes --]

From f6c4bfbe8a463181c43577e4a76b40be4b654110 Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Fri, 14 Apr 2017 11:41:20 +0300
Subject: [PATCH 10/20] gnu: Add python-misaka

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 148ed74..0e3860f 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14208,3 +14208,39 @@ Sure is heavily inspired by @code{RSpec Expectations} and @code{should.js}")
 
 (define-public python2-couleur
   (package-with-python2 python-couleur))
+
+(define-public python-misaka
+  (package
+    (name "python-misaka")
+    (version "2.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "misaka" version))
+       (sha256
+        (base32
+         "011nyw2xnwp9xzqzrp6qmqvfc5xg5165ryd9gmmh8h5q38wg2vik"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-cffi" ,python-cffi)))
+    (arguments
+     `(;; Line 37 of setup.py calls self.run_command('develop')
+       ;; in the 'check' phase. This command seems to be trying
+       ;; to write to
+       ;; /gnu/store/3aw9x...-python-3.5.3/lib/python3.5/site-packages/
+       ;; which is not the appropriate output directory, and unlike the
+       ;; install command, passing the --prefix or --install-dir
+       ;; arguments to the test command fails.
+       ;; This seems to be required by easy_install, to run the tests
+       #:tests? #f))
+    (home-page "https://github.com/FSX/misaka")
+    (synopsis
+     "Misaka is a CFFI binding for Hoedown, a markdown parsing library")
+    (description
+     "Misaka is a CFFI-based binding for Hoedown, a fast markdown processing library
+written in C.  It features a fast HTML renderer and functionality to make custom renderers
+(e.g. man pages or LaTeX).")
+    (license license:expat)))
+
+(define-public python2-misaka
+  (package-with-python2 python-misaka))
-- 
2.10.2


[-- Attachment #12: 0011-gnu-Add-python-steadymark.patch --]
[-- Type: text/x-patch, Size: 1916 bytes --]

From bfffb715e7311cded920fcbcd09bd1d856a1b576 Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Fri, 14 Apr 2017 11:57:45 +0300
Subject: [PATCH 11/20] gnu: Add python-steadymark

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0e3860f..9bae47b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14244,3 +14244,37 @@ written in C.  It features a fast HTML renderer and functionality to make custom
 
 (define-public python2-misaka
   (package-with-python2 python-misaka))
+
+(define-public python-steadymark
+  (package
+    (name "python-steadymark")
+    (version "0.7.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "steadymark" version))
+       (sha256
+        (base32
+         "1640i9g8dycql3cc8j0bky0jkzj0q39blfbp4lsgpkprkfgcdk8v"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-couleur" ,python-couleur)
+       ("python-sure" ,python-sure)
+       ("python-misaka" ,python-misaka)))
+    (arguments
+     `(;; These tests seem to depend on python-couleurs tests, which
+       ;; are dependent on python2-specific features, preventing those,
+       ;; and hence, these tests from running
+       #:tests? #f))
+    (home-page
+     "http://github.com/gabrielfalcao/steadymark")
+    (synopsis
+     "Markdown-based test runner for python. Good for github projects")
+    (description
+     "Steadymark allows testing of code snippets in documentation written in
+github-flavoured markdown, to ensure that the examples in the documentation are up-to-date
+and correct.")
+    (license license:expat)))
+
+(define-public python2-steadymark
+  (package-with-python2 python-steadymark))
-- 
2.10.2


[-- Attachment #13: 0012-gnu-Add-python-requests-2.8.1.patch --]
[-- Type: text/x-patch, Size: 1109 bytes --]

From 104f00dbac173a64b88c7a31c9a9a18d1612745b Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Fri, 14 Apr 2017 12:01:41 +0300
Subject: [PATCH 12/20] gnu: Add python-requests-2.8.1

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9bae47b..82258b5 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14278,3 +14278,19 @@ and correct.")
 
 (define-public python2-steadymark
   (package-with-python2 python-steadymark))
+
+(define-public python-requests-2.8.1
+  ;; httpretty has a hard requirement for requests==2.8.1
+  (package
+    (inherit python-requests)
+    (version "2.8.1")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (pypi-uri "requests" version))
+      (sha256
+        (base32
+         "0ny2nr1sqr4hcn3903ghmh7w2yni8shlfv240a8c9p6wyidqvzl4"))))))
+
+(define-public python2-requests-2.8.1
+  (package-with-python2 python-requests-2.8.1))
-- 
2.10.2


[-- Attachment #14: 0013-gnu-Add-python-rednose-0.4.3.patch --]
[-- Type: text/x-patch, Size: 1138 bytes --]

From 84249c3e772c2381726532973ee89aaf4e9fbd08 Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Fri, 14 Apr 2017 12:05:46 +0300
Subject: [PATCH 13/20] gnu: Add python-rednose-0.4.3

* gnu/packages/python.scm (python-rednose-0.4.3): New variable.
---
 gnu/packages/python.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 82258b5..7aba1ca 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14294,3 +14294,20 @@ and correct.")
 
 (define-public python2-requests-2.8.1
   (package-with-python2 python-requests-2.8.1))
+
+(define-public python-rednose-0.4.3
+  ;; httpretty has a hard requirement for rednose==0.4.3
+  (package
+    (inherit python-rednose)
+    (name "python-rednose")
+  (version "0.4.3")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (pypi-uri "rednose" version))
+      (sha256
+        (base32
+         "1mv4aknbl80wday41924l1gfqia2n6q7h5l4n8irlmn5fh2x9rbc"))))))
+
+(define-public python2-rednose-0.4.3
+  (package-with-python2 python-rednose-0.4.3))
-- 
2.10.2


[-- Attachment #15: 0014-gnu-Add-python-nose-randomly.patch --]
[-- Type: text/x-patch, Size: 2328 bytes --]

From 19a9ecacf1b90447bedd7ede85f686dbffb464fb Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Fri, 14 Apr 2017 12:17:47 +0300
Subject: [PATCH 14/20] gnu: Add python-nose-randomly

* gnu/packages/python.scm (python-nose-randomly): New variable.
---
 gnu/packages/python.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7aba1ca..37b736e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14311,3 +14311,41 @@ and correct.")
 
 (define-public python2-rednose-0.4.3
   (package-with-python2 python-rednose-0.4.3))
+
+(define-public python-nose-randomly
+  (package
+    (name "python-nose-randomly")
+    (version "1.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "nose-randomly" version))
+       (sha256
+        (base32
+         "17iggrvhvxzgci34x14x31i1ym8f7jdkklmq1yfnwjcglh7z70hk"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-nose" ,python-nose)))
+    (home-page
+     "https://github.com/adamchainz/nose-randomly")
+    (synopsis
+     "Nose plugin to randomly order tests and control random.seed")
+    (description
+     "Nose plugin to randomly order tests and control random.seed.  It has the following
+features:
+@itemize @bullet
+@item Randomly shuffles the submodules, @code{TestCase} classes + test functions when
+loading a module of tests.
+@item Randomly shuffles the test functions inside a @code{TestCase} when loading it.
+@item Resets @code{random.seed()} at the start of every test case and test to a fixed
+number - this defaults to @code{time.time()} from the start of your test run, but you can
+pass in @code{--randomly-seed} to repeat a randomness-induced failure.
+@item If @code{factory boy} is installed, its random state is reset at the start of every
+test.  This allows for repeatable use of its random @code{fuzzy} features.
+@item If @code{faker} is installed, its random state is reset at the start of every test.
+This is also for repeatable fuzzy data in tests - factory boy uses faker for lots of data.
+@end itemize")
+    (license license:bsd-3)))
+
+(define-public python2-nose-randomly
+  (package-with-python2 python-nose-randomly))
-- 
2.10.2


[-- Attachment #16: 0015-gnu-Add-python-pbr-2.0.0.patch --]
[-- Type: text/x-patch, Size: 1160 bytes --]

From 13cd1e20ab3a525f9655b6326bd9e834c9064abc Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Fri, 14 Apr 2017 12:21:05 +0300
Subject: [PATCH 15/20] gnu: Add python-pbr-2.0.0

* gnu/packages/python.scm (python-pbr-2.0.0): New variable.
---
 gnu/packages/python.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 37b736e..9b2debc 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14349,3 +14349,20 @@ This is also for repeatable fuzzy data in tests - factory boy uses faker for lot
 
 (define-public python2-nose-randomly
   (package-with-python2 python-nose-randomly))
+
+(define-public python-pbr-2.0.0
+  ;; mock-1.3.0 has a requirement for pbr>=1.3
+  (package
+    (inherit python-pbr)
+    (name "python-pbr")
+  (version "2.0.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (pypi-uri "pbr" version))
+      (sha256
+        (base32
+         "0p96pbx32x8fh250y5s177h3vm012kq225avh7gp1l5g56sjvk8c"))))))
+
+(define-public python2-pbr-2.0.0
+  (package-with-python2 python-pbr-2.0.0))
-- 
2.10.2


[-- Attachment #17: 0016-gnu-Add-python-mock-1.3.0.patch --]
[-- Type: text/x-patch, Size: 1232 bytes --]

From e1a56e8d2f59441cd6ad08c67d514c41ea66e396 Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Fri, 14 Apr 2017 12:24:03 +0300
Subject: [PATCH 16/20] gnu: Add python-mock-1.3.0

* gnu/packages/python.scm (python-mock-1.3.0): New variable.
---
 gnu/packages/python.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9b2debc..f2355bd 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14366,3 +14366,22 @@ This is also for repeatable fuzzy data in tests - factory boy uses faker for lot
 
 (define-public python2-pbr-2.0.0
   (package-with-python2 python-pbr-2.0.0))
+
+(define-public python-mock-1.3.0
+  ;; httpretty has a hard requirement for mock==1.3.0
+  (package
+    (inherit python-mock)
+    (name "python-mock")
+  (version "1.3.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (pypi-uri "mock" version))
+      (sha256
+        (base32
+         "1xm0xkaz8d8d26kdk09f2n9vn543ssd03vmpkqlmgq3crjz7s90y"))))
+  (propagated-inputs
+   `(("python-pbr" ,python-pbr-2.0.0)))))
+
+(define-public python2-mock-1.3.0
+  (package-with-python2 python-mock-1.3.0))
-- 
2.10.2


[-- Attachment #18: 0017-gnu-Add-python-httpretty.patch --]
[-- Type: text/x-patch, Size: 2455 bytes --]

From fd836c52504c472d3480bd54a6446a8977c82cb3 Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Fri, 14 Apr 2017 12:31:00 +0300
Subject: [PATCH 17/20] gnu: Add python-httpretty

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index f2355bd..71ea495 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14385,3 +14385,47 @@ This is also for repeatable fuzzy data in tests - factory boy uses faker for lot
 
 (define-public python2-mock-1.3.0
   (package-with-python2 python-mock-1.3.0))
+
+(define-public python-httpretty
+  (package
+    (name "python-httpretty")
+    (version "0.8.14")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "httpretty" version))
+       (sha256
+        (base32
+         "0vlp5qkyw3pxwwsg7xmdcfh1csvypvaz4m6abida8s4xmjxpdhc3"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme-0.1.9)
+       ("python-sphinx" ,python-sphinx-1.3.3)
+       ("python-coverage" ,python-coverage-4.0.3)
+       ("python-tornado" ,python-tornado)
+       ("python-urllib3" ,python-urllib3-1.12)
+       ("python-sure" ,python-sure)
+       ("python-steadymark" ,python-steadymark)
+       ("python-requests" ,python-requests-2.8.1)
+       ("python-rednose" ,python-rednose-0.4.3)
+       ("python-nose-randomly" ,python-nose-randomly)
+       ("python-mock" ,python-mock-1.3.0)
+       ("python-misaka" ,python-misaka)
+       ("python-pytest-httpbin" ,python-pytest-httpbin)))
+    (arguments
+     `(;; One of ipdb's dependency keeps failing with a response
+       ;; of 410, "Gone"
+       ;; The dependency seems to have a name "texlive-texmf-2016"
+       ;; and seems to be one of texlive's dependencies
+       ;; As such, the tests for this will fail due to the missing
+       ;; dependency ("python-ipdb" ,python-ipdb)
+       #:tests? #f))
+    (home-page
+     "http://github.com/gabrielfalcao/httpretty")
+    (synopsis "HTTP client mock for Python")
+    (description "@code{httpretty} is a helper for faking web requests, inspired by Ruby's
+@code{fakeweb}.")
+    (license license:expat)))
+
+(define-public python2-httpretty
+  (package-with-python2 python-httpretty))
-- 
2.10.2


[-- Attachment #19: 0018-gnu-Add-python-pyyaml-3.11.patch --]
[-- Type: text/x-patch, Size: 1161 bytes --]

From 3d1abf2e7f036f5b3f5bc616a841d0d47a95f2e8 Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Fri, 14 Apr 2017 12:35:08 +0300
Subject: [PATCH 18/20] gnu: Add python-pyyaml-3.11

* gnu/packages/python.scm (python-pyyaml-3.11): New variable.
---
 gnu/packages/python.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 71ea495..96849b5 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14429,3 +14429,20 @@ This is also for repeatable fuzzy data in tests - factory boy uses faker for lot
 
 (define-public python2-httpretty
   (package-with-python2 python-httpretty))
+
+(define-public python-pyyaml-3.11
+  ;; Required by python-xenon
+  (package
+    (inherit python-pyyaml)
+    (name "python-pyyaml")
+    (version "3.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "PyYAML" version))
+       (sha256
+        (base32
+         "1s26125vfnskng58ym37xhwv8v0mm95b2cwbjfag8prfhy596v63"))))))
+
+(define-public python2-pyyaml-3.11
+  (package-with-python2 python-pyyaml-3.11))
-- 
2.10.2


[-- Attachment #20: 0019-gnu-Add-python-requests-2.10.0.patch --]
[-- Type: text/x-patch, Size: 1193 bytes --]

From 84dd30d0ffecd9c97991702d10c84b204eb9fd56 Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Fri, 14 Apr 2017 12:38:12 +0300
Subject: [PATCH 19/20] gnu: Add python-requests-2.10.0

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 96849b5..fe911de 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14446,3 +14446,20 @@ This is also for repeatable fuzzy data in tests - factory boy uses faker for lot
 
 (define-public python2-pyyaml-3.11
   (package-with-python2 python-pyyaml-3.11))
+
+(define-public python-requests-2.10.0
+  ;; Required by python-xenon
+  (package
+    (inherit python-requests)
+    (name "python-requests")
+    (version "2.10.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "requests" version))
+       (sha256
+        (base32
+         "0m2vaasjdhrsf9nk05q0bybqw0w4w4p3p4vaw7730w8mi1bq3wb3"))))))
+
+(define-public python2-requests-2.10.0
+  (package-with-python2 python-requests-2.10.0))
-- 
2.10.2


[-- Attachment #21: 0020-gnu-Add-python-xenon.patch --]
[-- Type: text/x-patch, Size: 1969 bytes --]

From afc29873b09bfb0c69f2d89749521c972f73c197 Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Fri, 14 Apr 2017 12:41:43 +0300
Subject: [PATCH 20/20] gnu: Add python-xenon

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index fe911de..a0dc4fb 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14463,3 +14463,36 @@ This is also for repeatable fuzzy data in tests - factory boy uses faker for lot
 
 (define-public python2-requests-2.10.0
   (package-with-python2 python-requests-2.10.0))
+
+(define-public python-xenon
+  (package
+    (name "python-xenon")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "xenon" version))
+       (sha256
+        (base32
+         "1c03nis488ls50cgcq7ghbj55nxsi6a9683lsvg6z6vaj4smc8g8"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-pyyaml" ,python-pyyaml-3.11)
+       ("python-radon" ,python-radon)
+       ("python-requests" ,python-requests-2.10.0)
+       ("python-pyyaml" ,python-pyyaml)
+       ("python-httpretty" ,python-httpretty)
+       ("python-flake8" ,python-flake8)
+       ("python-tox" ,python-tox)))
+    (home-page "https://xenon.readthedocs.org/")
+    (synopsis
+     "Monitor code metrics for Python on your CI server")
+    (description
+     "Xenon is a monitoring tool based on Radon.  It monitors code’s complexity.  Ideally,
+ Xenon is run every time code is committed.  Through command line options, various
+ thresholds can be set for the complexity of code.  It will fail (i.e.  it will exit with
+ a non-zero exit code) when any of these requirements is not met")
+    (license license:expat)))
+
+(define-public python2-xenon
+  (package-with-python2 python-xenon))
-- 
2.10.2

bug#26524: Add conda and dependencies

[Ricardo Wurmus]

Hi Frederick,

> This is bug is to track adding conda and its dependencies. I will be
> sending patches adding the dependencies for conda here, until we get
> conda in mainline.

Thanks a lot for your patches!

I have a couple of comments for the first batch of patches.

I’m not sure that the strict version requirements are actually
reasonable.  Instead of packaging older versions it may make more sense
to patch away the version range from the setup.py files.

> * gnu/packages/python.scm (python-radon): New variable.
> ---
>  gnu/packages/python.scm | 40 +++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 39 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 231c629..23b6d86 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -13950,7 +13950,7 @@ recognize TestCases.")
>    (package-with-python2 python-mando))
>
>  (define-public python-mando-0.3.1
> -  ;; python-radon (version 1.5.0) has a requirement
> +  ;; python-radon has a requirement
>    ;; for mando<0.4,>=0.3
>    (package
>      (inherit python-mando)
> @@ -13965,3 +13965,41 @@ recognize TestCases.")
>         (sha256
>          (base32
>           "17jlkdpqw22z1nyml5ybslilqkzmnk0dxxjml8bfghav1l5hbwd2"))))))
> +
> +(define-public python-radon
> +  ;; xenon has a hard requirement for radon>=1.4.0,<1.5
> +  (package
> +    (name "python-radon")
> +    (version "1.4.2")

It would be good to add “python-radon” at the latest version and then
create a variant called “python-radon-1.4” with the comment that it is
required by “python-xenon”.

> +(define-public python2-radon
> +  (package-with-python2 python-radon))

You only mentioned “python-radon” in the commit summary.  Unless you
really need the Python 2 variant I’m thinking that maybe we shouldn’t
add it.

What do you think?

If it’s needed for conda then please keep it but mention it in the
commit summary, e.g.:

--8<---------------cut here---------------start------------->8---
gnu: Add python-radon.

* gnu/packages/python.scm (python-radon, python2-radon): New variables.
--8<---------------cut here---------------end--------------->8---


> * gnu/packages/python.scm (python-httpbin): New variable.
> ---
>  gnu/packages/python.scm | 27 +++++++++++++++++++++++++++
>  1 file changed, 27 insertions(+)

The same comment as above applies.  Please mention or drop the python2
variant.  I think this package should go to “(gnu packages web)” where
we keep similar packages; the “(gnu packages python)” module is a little
too crowded.

> +
> +(define-public python-httpbin
> +  (package
> +    (name "python-httpbin")
> +    (version "0.5.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "httpbin" version))
> +       (sha256
> +        (base32
> +         "1dc92lnk846hpilslrqnr63x55cxll4qx88gif8fm521gv9cbyvr"))))
> +    (build-system python-build-system)
> +    (propagated-inputs
> +     `(("python-decorator" ,python-decorator)
> +       ("python-flask" ,python-flask)
> +       ("python-itsdangerous" ,python-itsdangerous)
> +       ("python-markupsafe" ,python-markupsafe)
> +       ("python-six" ,python-six)))
> +    (home-page "https://github.com/Runscope/httpbin")
> +    (synopsis "HTTP Request and Response Service")

Please change this to “HTTP request and response service”.

> +    (description "HTTP Request and Response Service which covers all kinds of HTTP
> +scenarios")

Please use full sentences and punctuation in the description.

> +    (license license:expat)))

Actually, this is under the ISC license:

    https://github.com/kennethreitz/httpbin/blob/master/LICENSE

> +
> +(define-public python2-httpbin
> +  (package-with-python2 python-httpbin))

See above.

> From e9764356e3601c2927021eb5b687bc432b1eff20 Mon Sep 17 00:00:00 2001
> From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
> Date: Fri, 14 Apr 2017 10:55:59 +0300
> Subject: [PATCH 03/20] gnu: Add python-pytest-httpbin
>
> * gnu/packages/python.scm (python-pytest-httpbin): New variable.
> ---
>  gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++
>  1 file changed, 28 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 618b965..73d217b 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -14030,3 +14030,31 @@ scenarios")
>
>  (define-public python2-httpbin
>    (package-with-python2 python-httpbin))
> +
> +(define-public python-pytest-httpbin
> +  ;; httpretty requires pytest-httpbin==0.0.7
> +  (package
> +    (name "python-pytest-httpbin")
> +    (version "0.0.7")

Please do the same as I suggested above: package the latest version and
then create a variant using this version, and add a comment on top.
Before creating the variant, however, it would be good to check if this
exact version requirement is actually reasonable.

> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "pytest-httpbin" version))
> +       (sha256
> +        (base32
> +         "08ghq923dn33rllip3vap2p9fb680g0i96jdn5lcpfy8amq8mbq3"))))
> +    (build-system python-build-system)
> +    (propagated-inputs
> +     `(("python-six" ,python-six)
> +       ("python-httpbin" ,python-httpbin)
> +       ("python-pytest" ,python-pytest)))
> +    (home-page
> +     "https://github.com/kevin1024/pytest-httpbin")
> +    (synopsis
> +     "Easily test your HTTP library against a local copy of httpbin")

I would change this to “Test

> +    (description
> +     "Easily test your HTTP library against a local copy of httpbin")

Here’s a better description:

    “Pytest-httpbin creates a @code{pytest} fixture that is
dependency-injected into your tests.  It automatically starts up a HTTP
server in a separate thread running @code{httpbin} and provides your
test with the URL in the fixture.”

> +    (license license:expat)))
> +
> +(define-public python2-pytest-httpbin
> +  (package-with-python2 python-pytest-httpbin))

See above.

> From 1f4c44b1d47c2cc75cef75704ccd1cc386d5a862 Mon Sep 17 00:00:00 2001
> From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
> Date: Fri, 14 Apr 2017 11:02:10 +0300
> Subject: [PATCH 04/20] gnu: Add python-sphinx-rtd-theme-0.1.9
>
> * gnu/packages/python.scm (python-sphinx-rtd-theme-0.1.9) New variable
                                                           ^            ^
                                                           :            .

> ---
>  gnu/packages/python.scm | 21 +++++++++++++++++++++
>  1 file changed, 21 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 73d217b..631b6fd 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -14058,3 +14058,24 @@ scenarios")
>
>  (define-public python2-pytest-httpbin
>    (package-with-python2 python-pytest-httpbin))
> +
> +(define-public python-sphinx-rtd-theme-0.1.9
> +  ;; python-httpretty has a hard requirement for
> +  ;; python-sphinx-rtd-theme version 0.1.9

Are these themes so different?  Does it really make sense to use this
older variant instead of the latest version?

> +  (package
> +    (inherit python-sphinx-rtd-theme)
> +    (name "python-sphinx-rtd-theme")
> +    (version "0.1.9")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "sphinx_rtd_theme" version))
> +       (sha256
> +        (base32
> +         "18d0r63w7jpdrk4q5qy26n08vdlmnj9sar93akwjphyambw4cf17"))))
> +    (propagated-inputs
> +     `(("python-sphinx" ,python-sphinx-1.5.3)
> +       ("python-snowballstemmer" ,python-snowballstemmer)))))

Does it really make sense to override the Sphinx version here?  Can the
latest version be used?

> +
> +(define-public python2-sphinx-rtd-theme-0.1.9
> +  (package-with-python2 python-sphinx-rtd-theme-0.1.9))

See above.

> From 77e2a627333baa82d4f83882e5bda629e5f2a381 Mon Sep 17 00:00:00 2001
> From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
> Date: Fri, 14 Apr 2017 11:06:00 +0300
> Subject: [PATCH 05/20] gnu: Add python-sphinx-1.3.3
>
> * gnu/packages/python.scm (python-sphinx-1.3.3): New variable.
> ---
>  gnu/packages/python.scm | 37 +++++++++++++++++++++++++++++++++++++
>  1 file changed, 37 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 631b6fd..a849e70 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -14079,3 +14079,40 @@ scenarios")
>
>  (define-public python2-sphinx-rtd-theme-0.1.9
>    (package-with-python2 python-sphinx-rtd-theme-0.1.9))
> +
> +(define-public python-sphinx-1.3.3
> +  ;; python-httpretty has a hard requirement for
> +  ;; sphinx == 1.3.3

Hmm, yet another variant of Sphinx?  We already have the latest version
and version 1.5.3.  Can we really not do without this variant?

Also, please put this where the two other Sphinx packages are defined;
it’s best to keep them all together.

> +  (package
> +    (inherit python-sphinx)
> +    (name "python-sphinx")
> +    (version "1.3.3")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "Sphinx" version))
> +       (sha256
> +        (base32
> +         "1n3h08qxfx9bywv7nhjz0p5bpp1xgy4nzalxr3mx6syra7rvyxs0"))))
> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (replace 'check
> +                  (lambda _
> +                    ;; Requires Internet access.
> +                    (delete-file "tests/test_build.py")
> +                    (delete-file "tests/test_build_applehelp.py")
> +                    (delete-file "tests/test_i18n.py")
> +                    (delete-file "tests/test_build_html.py")
> +                    (delete-file "tests/test_build_texinfo.py")
> +                    (delete-file "tests/test_build_latex.py")
> +                    (zero? (system* "make" "test")))))))
> +    (native-inputs
> +     `(("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)

You defined another theme above.  Are you sure that this latest version
of the theme package should be used here?

> +       ("python-nose" ,python-nose)
> +       ("graphviz" ,graphviz)
> +       ("python-html5lib" ,python-html5lib)
> +       ("python-mock" ,python-mock)))))
> +
> +(define-public python2-sphinx-1.3.3
> +  (package-with-python2 python-sphinx-1.3.3))

Please only provide this variant if it is really needed.  See above for
comment on commit summary.

> From 075fec8683fec552e030c4c5f4de92dd3d4942eb Mon Sep 17 00:00:00 2001
> From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
> Date: Fri, 14 Apr 2017 11:08:32 +0300
> Subject: [PATCH 06/20] gnu: Add python-coverage-4.0.3
>
> * gnu/packages/python.scm (python-coverage-4.0.3): New variable.
> ---
>  gnu/packages/python.scm | 17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index a849e70..1ec1744 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -14116,3 +14116,20 @@ scenarios")
>
>  (define-public python2-sphinx-1.3.3
>    (package-with-python2 python-sphinx-1.3.3))
> +
> +(define-public python-coverage-4.0.3
> +  ;; httpretty has a hard requirement for coverage==4.0.3
> +  (package
> +    (inherit python-coverage)
> +    (name "python-coverage")
> +    (version "4.0.3")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "coverage" version))
> +       (sha256
> +        (base32
> +         "0qjlja8ny4gcfp8abqfwdrvr8qw9kr69lkja0b4cqqbsdmdjgcc5"))))))

Please double-check that we httpretty must use this exact version.
Otherwise you could patch the version check in “setup.py”.

> +(define-public python2-coverage-4.0.3
> +  (package-with-python2 python-coverage-4.0.3))

See above :)

> From 851864f62e82a10720cfe24642d22790f662f6bc Mon Sep 17 00:00:00 2001
> From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
> Date: Fri, 14 Apr 2017 11:12:38 +0300
> Subject: [PATCH 07/20] gnu: Add python-urllib3-1.12
>
> * gnu/packages/python.scm (python-urllib3-1.12): New variable.
> ---
>  gnu/packages/python.scm | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 1ec1744..9cb27d8 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -14133,3 +14133,19 @@ scenarios")
>
>  (define-public python2-coverage-4.0.3
>    (package-with-python2 python-coverage-4.0.3))
> +
> +(define-public python-urllib3-1.12
> +  (package
> +    (inherit python-urllib3)
> +    (name "python-urllib3")
> +    (version "1.12")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "urllib3" version))
> +       (sha256
> +        (base32
> +         "1ikj72kd4cdcq7pmmcd5p6s9dvp7wi0zw01635v4xzkid5vi598f"))))))

Why is this needed?  If it is really necessary, please add a comment above.

> +(define-public python2-urllib3-1.12
> +  (package-with-python2 python-urllib3-1.12))

See above :)

> From 45f52eee27ac62a7f2b5bc2acbd289d0151a7581 Mon Sep 17 00:00:00 2001
> From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
> Date: Fri, 14 Apr 2017 11:23:33 +0300
> Subject: [PATCH 08/20] gnu: Add python-sure
>
> * gnu/package/python.scm (python-sure): New variable.
> ---
>  gnu/packages/python.scm | 30 ++++++++++++++++++++++++++++++
>  1 file changed, 30 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 9cb27d8..951b7c7 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -14149,3 +14149,33 @@ scenarios")
>
>  (define-public python2-urllib3-1.12
>    (package-with-python2 python-urllib3-1.12))
> +
> +(define-public python-sure
> +  (package
> +    ;; httpretty has a hard requirement for sure==1.2.24

Please see my comments above for how to handle this.  Create a package
for the latest version, then inherit from it for “python-sure-1.2”.  But
also check that httpretty really won’t work with the latest version.  It
would be much better to patch httpretty than to add dozens of package
variants for one package.

> +    (name "python-sure")
> +    (version "1.2.24")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "sure" version))
> +       (sha256
> +        (base32
> +         "1lyjq0rvkbv585dppjdq90lbkm6gyvag3wgrggjzyh7cpyh5c12w"))))
> +    (build-system python-build-system)
> +    (propagated-inputs
> +     `(("python-mock" ,python-mock)
> +       ("python-six" ,python-six)))
> +    (native-inputs
> +     `(("python-nose" ,python-nose)))
> +    (home-page
> +     "http://github.com/gabrielfalcao/sure")
> +    (synopsis
> +     "Sure is an automated testing library in python for python")
> +    (description
> +     "Sure is a python library for python that leverages a DSL for writing assertions.
> +Sure is heavily inspired by @code{RSpec Expectations} and
> @code{should.js}")

Please change this to:

    "Sure is a Python library that leverages a DSL for writing
assertions.  Sure is heavily inspired by @code{RSpec Expectations} and
@code{should.js}."

> +    (license license:gpl3)))

This is actually GPLv3 or later.  Please use “license:gpl3+”.

> +
> +(define-public python2-sure
> +  (package-with-python2 python-sure))

See above.

> From fc1780bf7930de8c6b96966e19e7ba4aecf52589 Mon Sep 17 00:00:00 2001
> From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
> Date: Fri, 14 Apr 2017 11:35:40 +0300
> Subject: [PATCH 09/20] gnu: Add python-couleur
>
> * gnu/packages/python.scm (python-couleur): New variable.
> ---
>  gnu/packages/python.scm | 29 +++++++++++++++++++++++++++++
>  1 file changed, 29 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 951b7c7..148ed74 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -14179,3 +14179,32 @@ Sure is heavily inspired by @code{RSpec Expectations} and @code{should.js}")
>
>  (define-public python2-sure
>    (package-with-python2 python-sure))
> +
> +(define-public python-couleur
> +  (package
> +    (name "python-couleur")
> +    (version "0.6.2")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "couleur" version))
> +       (sha256
> +        (base32
> +         "1qqaxyqz74wvid0cr119dhcwz0h0if5b5by44zl49pd5z65v58k1"))))
> +    (build-system python-build-system)
> +    (arguments
> +     `(;; The package builds successfully with python3, but the
> +       ;; tests are python-2 dependent, (strings of the form
> +       ;; ur'val-of-str' and imports of python-2 specific
> +       ;; modules)
> +       #:tests? #f))

As far as I can tell, this is not a problem of testing.  The package may
simply not work with Python 3 at all.  I tried to import the package:

--8<---------------cut here---------------start------------->8---
rekado in guix: ./pre-inst-env guix environment --ad-hoc python-wrapper python-couleur
rekado in guix [env]: python
Python 3.5.3 (default, Jan  1 1970, 00:00:01)
[GCC 5.4.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import couleur
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/gnu/store/yc75aildgdxz7zcm0m2ffdn8hgysb777-profile/lib/python3.5/site-packages/couleur/__init__.py", line 104
    up_count_regex = re.compile(wrap_escaped(ur'up'))
                                                  ^
SyntaxError: invalid syntax
>>>
rekado in guix [env]:
--8<---------------cut here---------------end--------------->8---

I don’t think it’s right to disable the tests here.  The Python 3
variant seems to be genuinely broken.

> +    (home-page
> +     "http://github.com/gabrielfalcao/couleur")
> +    (synopsis
> +     "ANSI terminal tool for python, colored shell and other handy
> fancy features")

Please capitalize “python”.  If possible, please shorten it.

> +    (description
> +     "Couleur is a handy tool to play around with ANSI features in a
> unix terminal.")

I would remove “unix”.

> +    (license license:asl2.0)))

The license seems to be GPLv3+.  The license headers in
“couleur/__init.py__” and “setup.py” both state GPLv3+.  Only the
classifiers section in “setup.py” says “License :: OSI Approved ::
Apache Software License”.

> +
> +(define-public python2-couleur
> +  (package-with-python2 python-couleur))

See above.

Could you please review the comments so far and send updated patches?

--
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

bug#26524: Add conda and dependencies

[Frederick Muriithi]

On Sun, Apr 23, 2017 at 4:21 PM, Ricardo Wurmus <rekado@elephly.net> wrote:
>
>
> I’m not sure that the strict version requirements are actually
> reasonable.  Instead of packaging older versions it may make more sense
> to patch away the version range from the setup.py files.
>

Okay. Thanks. I will fix the issues, and resend the patches, but I
think this time,
each patch in a separate email of its own, to make it easier to track.

Thanks for the feedback.

bug#26524: Add conda and dependencies

[Ricardo Wurmus]

Frederick Muriithi <fredmanglis@gmail.com> writes:

> On Sun, Apr 23, 2017 at 4:21 PM, Ricardo Wurmus <rekado@elephly.net> wrote:
>>
>>
>> I’m not sure that the strict version requirements are actually
>> reasonable.  Instead of packaging older versions it may make more sense
>> to patch away the version range from the setup.py files.
>>
>
> Okay. Thanks. I will fix the issues, and resend the patches, but I
> think this time,
> each patch in a separate email of its own, to make it easier to track.

Here’s what I’d do:

   git format-patch -10  # create patches for the past 10 commits
   git send-email --to=26524@debbugs.gnu.org *.patch

This will send one email per patch as a reply to this bug report.  It’s
best to keep this all in one bug report to make sure we don’t lose track
of individual patches.

Thanks!

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

bug#26524: [PATCH 1/3] gnu: Add python-radon

[Muriithi Frederick Muriuki]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index e51405b..b4ebe2d 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -13999,3 +13999,37 @@ exception message with a traceback that points to the culprit.")
 
 (define-public python2-fudge
   (package-with-python2 python-fudge))
+
+(define-public python-radon
+  (package
+    (name "python-radon")
+    (version "1.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "radon" version))
+       (sha256
+        (base32
+         "1h6jv36am0i827182a04ki6291lyx4kp957xfr5njgprj4nd0qsl"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-colorama" ,python-colorama)
+       ("python-flake8-polyfill"
+        ,python-flake8-polyfill)
+       ("python-mando" ,python-mando-0.3.1)))
+    (native-inputs
+     `(("python-flake8" ,python-flake8)
+       ("python-tox" ,python-tox)
+       ("python-pytest" ,python-pytest)
+       ("python-paramunittest" ,python-paramunittest)))
+    (home-page "https://radon.readthedocs.org/")
+    (synopsis "Code Metrics in Python")
+    (description "Radon is a Python tool which computes various code metrics.  Supported
+ metrics are:
+@itemize @bullet
+@item raw metrics: SLOC, comment lines, blank lines, &c.
+@item Cyclomatic Complexity (i.e.  McCabe’s Complexity)
+@item Halstead metrics (all of them)
+@item the Maintainability Index (a Visual Studio metric)
+@end itemize")
+    (license license:expat)))
-- 
2.10.2

bug#26524: [PATCH 2/3] gnu: Add python-httpbin

[Muriithi Frederick Muriuki]

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

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index cb9912e..18a4d04 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -4528,3 +4528,29 @@ exploit attempts.")
     (description "qutebrowser is a keyboard-focused browser with a minimal
 GUI.  It is based on PyQt5 and QtWebKit.")
     (license l:gpl3+)))
+
+(define-public python-httpbin
+  (package
+    (name "python-httpbin")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "httpbin" version))
+       (sha256
+        (base32
+         "1dc92lnk846hpilslrqnr63x55cxll4qx88gif8fm521gv9cbyvr"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-decorator" ,python-decorator)
+       ("python-flask" ,python-flask)
+       ("python-itsdangerous" ,python-itsdangerous)
+       ("python-markupsafe" ,python-markupsafe)
+       ("python-six" ,python-six)))
+    (home-page "https://github.com/Runscope/httpbin")
+    (synopsis "HTTP request and response service")
+    (description "Testing an HTTP Library can become difficult sometimes.
+@code{RequestBin} is fantastic for testing POST requests, but doesn't let you control the
+response.  This exists to cover all kinds of HTTP scenarios.  All endpoint responses are
+JSON-encoded.")
+    (license l:isc)))
-- 
2.10.2

bug#26524: [PATCH 3/3] gnu: Add python-pytest-httpbin

[Muriithi Frederick Muriuki]

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

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 18a4d04..e3f59e6 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -4554,3 +4554,29 @@ GUI.  It is based on PyQt5 and QtWebKit.")
 response.  This exists to cover all kinds of HTTP scenarios.  All endpoint responses are
 JSON-encoded.")
     (license l:isc)))
+
+(define-public python-pytest-httpbin
+  (package
+    (name "python-pytest-httpbin")
+    (version "0.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest-httpbin" version))
+       (sha256
+        (base32
+         "1y0v2v7xpzpyd4djwp7ad8ifnlxp8r1y6dfbxg5ckzvllkgridn5"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-six" ,python-six)
+       ("python-httpbin" ,python-httpbin)
+       ("python-pytest" ,python-pytest)))
+    (home-page
+     "https://github.com/kevin1024/pytest-httpbin")
+    (synopsis
+     "Test your HTTP library against a local copy of httpbin")
+    (description
+     "@code{Pytest-httpbin} creates a @code{pytest} fixture that is dependency-injected
+into your tests.  It automatically starts up a HTTP server in a separate thread running
+@code{httpbin} and provides your test with the URL in the fixture.")
+    (license l:expat)))
-- 
2.10.2

bug#26524: [PATCH] gnu: Add python-radon

[Frederick Muriithi]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: 0001-gnu-Add-python-radon.patch --]
[-- Type: text/x-patch, Size: 1937 bytes --]

From 0081505cb53811073d175b0f012cb6e6932d7913 Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
Date: Thu, 25 May 2017 11:25:34 +0300
Subject: [PATCH] gnu: Add python-radon

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index dc1efd62a..07f10c13c 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14622,3 +14622,40 @@ substitute for redis.")
 
 (define-public python2-fakeredis
   (package-with-python2 python-fakeredis))
+
+(define-public python-radon
+  (package
+    (name "python-radon")
+    (version "1.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "radon" version))
+       (sha256
+        (base32
+         "1h6jv36am0i827182a04ki6291lyx4kp957xfr5njgprj4nd0qsl"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-colorama" ,python-colorama)
+       ("python-flake8-polyfill"
+        ,python-flake8-polyfill)
+       ("python-mando" ,python-mando-0.3.1)))
+    (native-inputs
+     `(("python-flake8" ,python-flake8)
+       ("python-tox" ,python-tox)
+       ("python-pytest" ,python-pytest)
+       ("python-paramunittest" ,python-paramunittest)))
+    (home-page "https://radon.readthedocs.org/")
+    (synopsis "Code Metrics in Python")
+    (description "Radon is a Python tool which computes various code metrics.  Supported
+ metrics are:
+@itemize @bullet
+@item raw metrics: SLOC, comment lines, blank lines, &c.
+@item Cyclomatic Complexity (i.e.  McCabe’s Complexity)
+@item Halstead metrics (all of them)
+@item the Maintainability Index (a Visual Studio metric)
+@end itemize")
+    (license license:expat)))
+
+(define-public python2-radon
+  (package-with-python2 python-radon))
-- 
2.13.0

bug#26524: [PATCH] gnu: Add python-radon

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 433 bytes --]

On Thu, May 25, 2017 at 11:42:38AM +0300, Frederick Muriithi wrote:
> 

> From 0081505cb53811073d175b0f012cb6e6932d7913 Mon Sep 17 00:00:00 2001
> From: Muriithi Frederick Muriuki <fredmanglis@gmail.com>
> Date: Thu, 25 May 2017 11:25:34 +0300
> Subject: [PATCH] gnu: Add python-radon
> 
> * gnu/packages/python.scm (python-radon, python2-radon): New variables.

Thanks! Pushed as 65e7d52a0c0643faf511e9ff7963e0053e41cf42

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#26524: [PATCH 1/5] gnu: Add python-sure

[Muriithi Frederick Muriuki]

* gnu/packages/python.scm (python-sure, python2-sure): 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 3e2141e7f..556d34d0c 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14926,3 +14926,32 @@ Supported metrics are:
 
 (define-public python2-radon
   (package-with-python2 python-radon))
+
+(define-public python-sure
+  (package
+    (name "python-sure")
+    (version "1.4.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "sure" version))
+       (sha256
+        (base32
+         "1iyqsy2d6radi88g1qf0lziy5b39h5cpb3g5jiqyb4xi46ig3x1z"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-mock" ,python-mock)
+       ("python-six" ,python-six)))
+    (native-inputs
+     `(("python-nose" ,python-nose)))
+    (home-page
+     "http://github.com/gabrielfalcao/sure")
+    (synopsis
+     "Sure is an automated testing library in python for python")
+    (description
+     "Sure is a python library for python that leverages a DSL for writing assertions.
+Sure is heavily inspired by @code{RSpec Expectations} and @code{should.js}.")
+    (license license:gpl3)))
+
+(define-public python2-sure
+  (package-with-python2 python-sure))
-- 
2.13.0

bug#26524: [PATCH 2/5] gnu: Add python2-couleur

[Muriithi Frederick Muriuki]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 556d34d0c..989131680 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14955,3 +14955,28 @@ Sure is heavily inspired by @code{RSpec Expectations} and @code{should.js}.")
 
 (define-public python2-sure
   (package-with-python2 python-sure))
+
+(define-public python2-couleur
+  ;; This package does not seem to support python3 at all, hence,
+  ;; only the python2 variant definition is provided.
+  (package
+    (name "python-couleur")
+    (version "0.6.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "couleur" version))
+       (sha256
+        (base32
+         "1qqaxyqz74wvid0cr119dhcwz0h0if5b5by44zl49pd5z65v58k1"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:python ,python-2))
+    (home-page
+     "http://github.com/gabrielfalcao/couleur")
+    (synopsis
+     "ANSI terminal tool for python, colored shell and other handy fancy features")
+    (description
+     "@code{Couleur} provides python programs a way to use the ANSI features in a unix
+terminal such as coloured output in the shell, overwriting output, indentation, etc.")
+    (license license:asl2.0)))
-- 
2.13.0

bug#26524: [PATCH 3/5] gnu: Add python-misaka

[Muriithi Frederick Muriuki]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 989131680..86cb034e4 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14980,3 +14980,36 @@ Sure is heavily inspired by @code{RSpec Expectations} and @code{should.js}.")
      "@code{Couleur} provides python programs a way to use the ANSI features in a unix
 terminal such as coloured output in the shell, overwriting output, indentation, etc.")
     (license license:asl2.0)))
+
+(define-public python-misaka
+  (package
+    (name "python-misaka")
+    (version "2.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "misaka" version))
+       (sha256
+        (base32
+         "1yqrq3a5rracirmvk52n28nn6ckdaz897gnigv89a9gmyn87sqw7"))))
+    (build-system python-build-system)
+    (arguments
+     `(;; Line 37 of setup.py calls self.run_command('develop')
+       ;; in the 'check' phase. This command seems to be trying
+       ;; to write to
+       ;; /gnu/store/...-python-<version>/lib/python<version>/site-packages/
+       ;; for which it does not have the permission to write.
+       #:tests? #f))
+    (propagated-inputs
+     `(("python-cffi" ,python-cffi)))
+    (home-page "https://github.com/FSX/misaka")
+    (synopsis
+     "Misaka is a CFFI binding for Hoedown, a markdown parsing library")
+    (description
+     "@code{Misaka} is a CFFI-based binding for @code{Hoedown}, a fast markdown processing
+library written in C.  It features a fast HTML renderer and functionality to make custom
+renderers (e.g. man pages or LaTeX).")
+    (license license:expat)))
+
+(define-public python2-misaka
+  (package-with-python2 python-misaka))
-- 
2.13.0

bug#26524: [PATCH 4/5] gnu: Add python2-steadymark

[Muriithi Frederick Muriuki]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 86cb034e4..f6b336904 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -15013,3 +15013,45 @@ renderers (e.g. man pages or LaTeX).")
 
 (define-public python2-misaka
   (package-with-python2 python-misaka))
+
+(define-public python2-steadymark
+  ;; This is forced into being a python2 only variant
+  ;; due to its dependence on couleur that has no support
+  ;; for python3
+  (package
+    (name "python-steadymark")
+    (version "0.7.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "steadymark" version))
+       (sha256
+        (base32
+         "1640i9g8dycql3cc8j0bky0jkzj0q39blfbp4lsgpkprkfgcdk8v"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-couleur" ,python2-couleur)
+       ("python-sure" ,python2-sure)
+       ("python-misaka" ,python2-misaka)))
+    (arguments
+     `(#:python ,python-2
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build
+             'patch-setup-py
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; Update requirements from dependecy==version
+             ;; to dependency>=version
+             (substitute* "setup.py"
+               (("==") ">="))
+             #t)))))
+    (home-page
+     "http://github.com/gabrielfalcao/steadymark")
+    (synopsis
+     "Markdown-based test runner for python. Good for github projects")
+    (description
+     "@code{Steadymark} allows documentation to be written in github-flavoured markdown.
+The documentation may contain snippets of code surrounded by python code blocks and
+@code{Steadymark} will find these snippets and run them, making sure that there are no old
+malfunctional examples in the documentation examples.")
+    (license license:expat)))
-- 
2.13.0

bug#26524: [PATCH 5/5] gnu: Add python-nose-randomly

[Muriithi Frederick Muriuki]

* gnu/packages/python.scm (python-nose-randomly, python2-nose-randomly):
* 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 f6b336904..1c812b372 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -15055,3 +15055,33 @@ The documentation may contain snippets of code surrounded by python code blocks
 @code{Steadymark} will find these snippets and run them, making sure that there are no old
 malfunctional examples in the documentation examples.")
     (license license:expat)))
+
+(define-public python-nose-randomly
+  (package
+    (name "python-nose-randomly")
+    (version "1.2.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "nose-randomly" version))
+       (sha256
+        (base32
+         "1cw9dlr1zh3w4i438kin7z0rm8092ki52hayisyc43h9pcplq7rn"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-nose" ,python-nose)
+       ("python-numpy" ,python-numpy)))
+    (home-page
+     "https://github.com/adamchainz/nose-randomly")
+    (synopsis
+     "Nose plugin to randomly order tests and control random.seed")
+    (description
+     "This is a @code{Nose} plugin to randomly order tests which can be quite powerful in
+discovering hidden flaws in the tests themselves, while helping to reduce inter-test
+dependencies.  It also helps in controlling random.seed, by resetting it to a repeatable
+number for each test, enabling the tests to create data based on random numbers and yet
+remain repeatable.")
+    (license license:bsd-3)))
+
+(define-public python2-nose-randomly
+  (package-with-python2 python-nose-randomly))
-- 
2.13.0

bug#26524: [PATCH 1/5] gnu: Add python-sure

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 2420 bytes --]

Muriithi Frederick Muriuki <fredmanglis@gmail.com> writes:

> * gnu/packages/python.scm (python-sure, python2-sure): 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 3e2141e7f..556d34d0c 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -14926,3 +14926,32 @@ Supported metrics are:
>  
>  (define-public python2-radon
>    (package-with-python2 python-radon))
> +
> +(define-public python-sure
> +  (package
> +    (name "python-sure")
> +    (version "1.4.6")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "sure" version))
> +       (sha256
> +        (base32
> +         "1iyqsy2d6radi88g1qf0lziy5b39h5cpb3g5jiqyb4xi46ig3x1z"))))
> +    (build-system python-build-system)
> +    (propagated-inputs
> +     `(("python-mock" ,python-mock)
> +       ("python-six" ,python-six)))
> +    (native-inputs
> +     `(("python-nose" ,python-nose)))
> +    (home-page
> +     "http://github.com/gabrielfalcao/sure")
> +    (synopsis
> +     "Sure is an automated testing library in python for python")
> +    (description
> +     "Sure is a python library for python that leverages a DSL for writing assertions.
> +Sure is heavily inspired by @code{RSpec Expectations} and @code{should.js}.")
> +    (license license:gpl3)))

Committed with this diff:

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 70544058a..5adb35510 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -14944,14 +14944,12 @@ Supported metrics are:
        ("python-six" ,python-six)))
     (native-inputs
      `(("python-nose" ,python-nose)))
-    (home-page
-     "http://github.com/gabrielfalcao/sure")
-    (synopsis
-     "Sure is an automated testing library in python for python")
+    (home-page "http://github.com/gabrielfalcao/sure")
+    (synopsis "Automated testing library in python for python")
     (description
-     "Sure is a python library for python that leverages a DSL for writing assertions.
+     "Sure is a python library that leverages a DSL for writing assertions.
 Sure is heavily inspired by @code{RSpec Expectations} and @code{should.js}.")
-    (license license:gpl3)))
+    (license license:gpl3+)))
 
Thanks!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#26524: [PATCH 2/5] gnu: Add python2-couleur

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 1804 bytes --]

Muriithi Frederick Muriuki <fredmanglis@gmail.com> writes:

> * gnu/packages/python.scm (python2-couleur): New variable.
> ---
>  gnu/packages/python.scm | 25 +++++++++++++++++++++++++
>  1 file changed, 25 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 556d34d0c..989131680 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -14955,3 +14955,28 @@ Sure is heavily inspired by @code{RSpec Expectations} and @code{should.js}.")
>  
>  (define-public python2-sure
>    (package-with-python2 python-sure))
> +
> +(define-public python2-couleur
> +  ;; This package does not seem to support python3 at all, hence,
> +  ;; only the python2 variant definition is provided.
> +  (package
> +    (name "python-couleur")

Applied with this name changed to python2-couleur...

> +    (version "0.6.2")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "couleur" version))
> +       (sha256
> +        (base32
> +         "1qqaxyqz74wvid0cr119dhcwz0h0if5b5by44zl49pd5z65v58k1"))))
> +    (build-system python-build-system)
> +    (arguments
> +     `(#:python ,python-2))
> +    (home-page
> +     "http://github.com/gabrielfalcao/couleur")
> +    (synopsis
> +     "ANSI terminal tool for python, colored shell and other handy fancy features")
> +    (description
> +     "@code{Couleur} provides python programs a way to use the ANSI features in a unix
> +terminal such as coloured output in the shell, overwriting output, indentation, etc.")
> +    (license license:asl2.0)))

...oddly, README.md say ASL2.0, but all source code headers are LGPL3+.

https://github.com/gabrielfalcao/couleur/issues/11

I committed it as lgpl3+ and added this issue as a comment.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#26524: [PATCH 3/5] gnu: Add python-misaka

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 299 bytes --]

Muriithi Frederick Muriuki <fredmanglis@gmail.com> writes:

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

[...]

> +    (synopsis
> +     "Misaka is a CFFI binding for Hoedown, a markdown parsing library")

I changed this to "Python binding for Hoedown". Applied!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#26524: [PATCH 4/5] gnu: Add python2-steadymark

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 2165 bytes --]

Muriithi Frederick Muriuki <fredmanglis@gmail.com> writes:

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

Applied with this diff (description wrapped at 80 chars):

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index c8701f968..ee216116c 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -15017,7 +15017,7 @@ renderers (e.g. man pages or LaTeX).")
   ;; due to its dependence on couleur that has no support
   ;; for python3
   (package
-    (name "python-steadymark")
+    (name "python2-steadymark")
     (version "0.7.3")
     (source
      (origin
@@ -15035,21 +15035,18 @@ renderers (e.g. man pages or LaTeX).")
      `(#:python ,python-2
        #:phases
        (modify-phases %standard-phases
-         (add-before 'build
-             'patch-setup-py
-           (lambda* (#:key inputs #:allow-other-keys)
-             ;; Update requirements from dependecy==version
+         (add-before 'build 'patch-setup-py
+           (lambda _
+             ;; Update requirements from dependency==version
              ;; to dependency>=version
              (substitute* "setup.py"
                (("==") ">="))
              #t)))))
-    (home-page
-     "http://github.com/gabrielfalcao/steadymark")
-    (synopsis
-     "Markdown-based test runner for python. Good for github projects")
+    (home-page "https://github.com/gabrielfalcao/steadymark")
+    (synopsis "Markdown-based test runner for python")
     (description
-     "@code{Steadymark} allows documentation to be written in github-flavoured markdown.
-The documentation may contain snippets of code surrounded by python code blocks and
-@code{Steadymark} will find these snippets and run them, making sure that there are no old
-malfunctional examples in the documentation examples.")
+     "@code{Steadymark} allows documentation to be written in github-flavoured
+markdown.  The documentation may contain snippets of code surrounded by python
+code blocks and @code{Steadymark} will find these snippets and run them, making
+sure that there are no old malfunctional examples in the documentation examples.")
     (license license:expat)))

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#26524: [PATCH 5/5] gnu: Add python-nose-randomly

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

Muriithi Frederick Muriuki <fredmanglis@gmail.com> writes:

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

The star here is only for file paths. Applied with adjusted commit
message and wrapped description (maybe we should make the linter
stricter for descriptions; please try to wrap lines at 80 characters
or less).

I also added the missing python2 variant. Series pushed as
7e488f9991cfec1ef9e8ca5d1910a65920ab2750!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#26524: [PATCH 1/3] gnu: python-sphinx-rtd-theme: Update to 0.2.4

[Muriithi Frederick Muriuki]

* gnu/packages/python.scm (python-sphinx-rtd-theme): Update to 0.2.4
[source]: Change release url and hash
---
 gnu/packages/python.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 44adcba01..366c7ea4e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3134,16 +3134,14 @@ sources.")
 (define-public python-sphinx-rtd-theme
   (package
     (name "python-sphinx-rtd-theme")
-    (version "0.1.6")
+    (version "0.2.4")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append "https://pypi.python.org/packages/source/s/"
-                           "sphinx_rtd_theme/sphinx_rtd_theme-"
-                           version ".tar.gz"))
+       (uri (pypi-uri "sphinx_rtd_theme" version))
        (sha256
         (base32
-         "19nw3rn7awplcdrz63kg1njqwkbymfg9lwn7l2grhdyhyr2gaa8g"))))
+         "05rlhjzdyapr2w74jjs7mrm8hi69qskcr5vya9f9drpsys7lpxrd"))))
     (build-system python-build-system)
     (arguments '(#:tests? #f)) ; No tests.
     (propagated-inputs
-- 
2.13.0

bug#26524: [PATCH 2/3] gnu: Add python2-rednose

[Muriithi Frederick Muriuki]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 366c7ea4e..f4c7a49b6 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -13134,6 +13134,9 @@ asynchronous messaging environments.")
 @command{nosetests} command of the Python Nose unit test framework.")
     (license license:bsd-3)))
 
+(define-public python2-rednose
+  (package-with-python2 python-rednose))
+
 (define-public python-flask-restplus
   (package
     (name "python-flask-restplus")
-- 
2.13.0

bug#26524: [PATCH 3/3] gnu: Add python2-httpretty

[Muriithi Frederick Muriuki]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index f4c7a49b6..b21297bd9 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -15299,3 +15299,54 @@ from your Flask project.  It is a fork of Flask-Swagger.")
 
 (define-public python2-flasgger
   (package-with-python2 python-flasgger))
+
+(define-public python2-httpretty
+  (package
+    (name "python2-httpretty")
+    (version "0.8.14")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "httpretty" version))
+       (sha256
+        (base32
+         "0vlp5qkyw3pxwwsg7xmdcfh1csvypvaz4m6abida8s4xmjxpdhc3"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-sphinx-rtd-theme" ,python2-sphinx-rtd-theme)
+       ("python-sphinx" ,python2-sphinx)
+       ("python-coverage" ,python2-coverage)
+       ("python-tornado" ,python2-tornado)
+       ("python-urllib3" ,python2-urllib3)
+       ("python-sure" ,python2-sure)
+       ("python-steadymark" ,python2-steadymark)
+       ("python-requests" ,python2-requests)
+       ("python-rednose" ,python2-rednose)
+       ("python-nose-randomly" ,python2-nose-randomly)
+       ("python-misaka" ,python2-misaka)
+       ("python-pytest-httpbin" ,python2-pytest-httpbin)
+       ("python-nose" ,python2-nose)))
+    (arguments
+     `(#:tests? #f
+       ;; Requires mock>=1.3.0 which requires a more up-to-date
+       ;; python-pbr. After updating these trying to build the
+       ;; package leads to failures in python-flake8 and other
+       ;; packages. The cascade of updates and failures this
+       ;; leads to, seems to not be worth having the test run.
+       #:python ,python-2
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build
+             'patch-test-requirements
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; Update requirements from dependecy==version
+             ;; to dependency>=version
+             (substitute* "development.txt"
+               (("==") ">="))
+             #t)))))
+    (home-page
+     "http://github.com/gabrielfalcao/httpretty")
+    (synopsis "HTTP client mock for Python")
+    (description "@code{httpretty} is a helper for faking web requests, inspired by Ruby's
+@code{fakeweb}.")
+    (license license:expat)))
-- 
2.13.0

[bug#26524] [PATCH 3/3] gnu: Add python2-httpretty

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 1181 bytes --]

Muriithi Frederick Muriuki <fredmanglis@gmail.com> writes:

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

Thanks!

[...]

> +    (arguments
> +     `(#:tests? #f
> +       ;; Requires mock>=1.3.0 which requires a more up-to-date
> +       ;; python-pbr. After updating these trying to build the
> +       ;; package leads to failures in python-flake8 and other
> +       ;; packages. The cascade of updates and failures this
> +       ;; leads to, seems to not be worth having the test run.

Ugh. If you still have these patches, could you resubmit them to a new
bug report? Let's use them as a basis for a new 'python-updates' branch.
Please also include this patch as it did not apply for me. I've pushed
the other two to 'master' with slightly adjusted commit messages.

You can open a new issue by sending a message to guix-patches@gnu.org,
and send the patch series to [bug id]@debbugs.gnu.org. The initial email
is typically a cover letter generated by git-format-patch(1).

Python 3.6.2 is due in two weeks[0]. If we get 'core-updates' ready by
then, we can start building 3.6 substitutes right away. :-)

[0] https://www.python.org/dev/peps/pep-0494/#id2

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

[bug#26524] [PATCH 3/3] gnu: Add python2-httpretty

[Frederick Muriithi]

On Mon, Jun 12, 2017 at 10:33 PM, Marius Bakke <mbakke@fastmail.com> wrote:
> Muriithi Frederick Muriuki <fredmanglis@gmail.com> writes:
>
> Ugh. If you still have these patches, could you resubmit them to a new
> bug report? Let's use them as a basis for a new 'python-updates' branch.
> Please also include this patch as it did not apply for me. I've pushed
> the other two to 'master' with slightly adjusted commit messages.
>

I did not retain the patches, but I'll regenerate them and send them.

As for httpretty, it is one of the dependencies for conda: do I send
it here, or with the patches for the newer python?

-- 
Frederick M. Muriithi

[bug#26524] [PATCH 3/3] gnu: Add python2-httpretty

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 918 bytes --]

Frederick Muriithi <fredmanglis@gmail.com> writes:

> On Mon, Jun 12, 2017 at 10:33 PM, Marius Bakke <mbakke@fastmail.com> wrote:
>> Muriithi Frederick Muriuki <fredmanglis@gmail.com> writes:
>>
>> Ugh. If you still have these patches, could you resubmit them to a new
>> bug report? Let's use them as a basis for a new 'python-updates' branch.
>> Please also include this patch as it did not apply for me. I've pushed
>> the other two to 'master' with slightly adjusted commit messages.
>>
>
> I did not retain the patches, but I'll regenerate them and send them.

Great!

> As for httpretty, it is one of the dependencies for conda: do I send
> it here, or with the patches for the newer python?

Please do not send patches to closed bug-reports like this one. You can
send it with the others (but mention that it should go to 'master'),
standalone, or preferably along with other Conda-related patches :-)

Thanks!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]