[PATCH 1/6] gnu: Add python-rst2ansi

[PATCH 1/6] gnu: Add python-rst2ansi

[Muriithi Frederick Muriuki]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 5b4d2b0..61b34bf 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -35,6 +35,7 @@
 ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
 ;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au>
+;;; Copyright © 2017 Frederick M. Muriithi <fredmanglis@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -12536,3 +12537,25 @@ console.")
 This implementation is slow (hence the project name) but still useful when
 faster ones are not available.")
     (license license:asl2.0)))
+
+(define-public python-rst2ansi
+  (package
+    (name "python-rst2ansi")
+    (version "0.1.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "rst2ansi" version))
+       (sha256
+        (base32
+         "0vzy6gd60l79ff750scl0sz48r1laalkl6md6dwzah4dcadgn5qv"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-docutils" ,python-docutils)))
+    (home-page "https://github.com/Snaipe/python-rst-to-ansi")
+    (synopsis
+     "Python rst converter to ansi-decorated console output")
+    (description
+     "Python module dedicated to rendering RST (reStructuredText) documents to
+ ansi-escaped strings suitable for display in a terminal.")
+    (license license:expat)))
-- 
2.10.2

[PATCH 2/6] gnu: Add python-flake8-polyfill

[Muriithi Frederick Muriuki]

* gnu/packages/python.scm (python-flake8-polyfill): 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 61b34bf..6b56312 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12559,3 +12559,24 @@ faster ones are not available.")
      "Python module dedicated to rendering RST (reStructuredText) documents to
  ansi-escaped strings suitable for display in a terminal.")
     (license license:expat)))
+
+(define-public python-flake8-polyfill
+  (package
+    (name "python-flake8-polyfill")
+    (version "1.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "flake8-polyfill" version))
+       (sha256
+        (base32
+         "02gn2wxvh9vnf7m7dld7ca4l60mg5c370hv3swwppkngwaqmcw67"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-flake8" ,python-flake8)))
+    (home-page "https://gitlab.com/pycqa/flake8-polyfill")
+    (synopsis "Polyfill package for Flake8 plugins")
+    (description
+     "This package that provides some compatibility helpers for Flake8 plugins that
+ intend to support Flake8 2.x and 3.x simultaneously.")
+    (license license:expat)))
-- 
2.10.2

[PATCH 3/6] gnu: Add python-ddt

[Muriithi Frederick Muriuki]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 6b56312..9e17caf 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12580,3 +12580,27 @@ faster ones are not available.")
      "This package that provides some compatibility helpers for Flake8 plugins that
  intend to support Flake8 2.x and 3.x simultaneously.")
     (license license:expat)))
+
+(define-public python-ddt
+  (package
+    (name "python-ddt")
+    (version "1.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "ddt" version))
+       (sha256
+        (base32
+         "1c00ikkxr7lha97c81k938bzhgd4pbwamkjn0h4nkhr3xk00zp6n"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-mock" ,python-mock)
+       ("python-nose" ,python-nose)))
+    (inputs
+     `(("python-six" ,python-six)
+       ("python-pyyaml" ,python-pyyaml)))
+    (home-page "https://github.com/txels/ddt")
+    (synopsis "Data-Driven Tests")
+    (description "DDT (Data-Driven Tests) allows you to multiply one test case by running
+ it with different test data, and make it appear as multiple test cases.")
+    (license license:expat)))
-- 
2.10.2

[PATCH 4/6] gnu: Add python-pycosat

[Muriithi Frederick Muriuki]

* gnu/packages/python.scm (python-pycosat): 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 9e17caf..e9df67c 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12604,3 +12604,24 @@ faster ones are not available.")
     (description "DDT (Data-Driven Tests) allows you to multiply one test case by running
  it with different test data, and make it appear as multiple test cases.")
     (license license:expat)))
+
+(define-public python-pycosat
+  (package
+    (name "python-pycosat")
+    (version "0.6.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pycosat" version))
+       (sha256
+        (base32
+         "1kl3wh1f47rc712n4bmwplbx3fqz3x9i1b587jrbpmvdva4c8f6l"))))
+    (build-system python-build-system)
+    (home-page
+     "https://github.com/ContinuumIO/pycosat")
+    (synopsis "Bindings to picosat (a SAT solver)")
+    (description
+     "This package provides efficient Python bindings to @code{picosat} on the C level,
+ i.e. when importing pycosat, the @code{picosat} solver becomes part of the Python process
+ itself.  @code{picosat} is a Boolean Satisfiability Problem (SAT) solver")
+    (license license:expat)))
-- 
2.10.2

[PATCH 5/6] gnu: Add python2-ruamel.ordereddict

[Muriithi Frederick Muriuki]

* gnu/packages/python.scm (python2-ruamel.ordereddict): 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 e9df67c..ec9cbb7 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12625,3 +12625,31 @@ faster ones are not available.")
  i.e. when importing pycosat, the @code{picosat} solver becomes part of the Python process
  itself.  @code{picosat} is a Boolean Satisfiability Problem (SAT) solver")
     (license license:expat)))
+
+(define-public python2-ruamel.ordereddict
+  (package
+    (name "python2-ruamel.ordereddict")
+    (version "0.4.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "ruamel.ordereddict" version))
+       (sha256
+        (base32
+         "1xmkl8v9l9inm2pyxgc1fm5005yxm7fkd5gv74q7lj1iy5qc8n3h"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:python ,python-2))
+    (home-page
+     "https://bitbucket.org/ruamel/ordereddict")
+    (synopsis
+     "Version of dict that keeps keys in insertion resp. sorted order")
+    (description
+     "This is an implementation of an ordered dictionary with Key Insertion Order (KIO:
+ updates of values do not affect the position of the key), Key Value Insertion Order
+ (KVIO, an existing key's position is removed and put at the back).  The standard library
+ module OrderedDict, implemented later, implements a subset of ordereddict functionality.
+Sorted dictionaries are also provided.  Currently only with Key Sorted Order (KSO, no
+ sorting function can be specified, but a transform can be specified to apply on the key
+ before comparison (e.g. string.lower)).")
+    (license license:expat)))
-- 
2.10.2

[PATCH 6/6] gnu: Add python-2 variants of packages

[Muriithi Frederick Muriuki]

* gnu/packages/python.scm (python2-rst2ansi, python2-flake8-polyfill,
    python2-ddt, python2-pycosat): New variables.
---
 gnu/packages/python.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index ec9cbb7..e235bb0 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12560,6 +12560,9 @@ faster ones are not available.")
  ansi-escaped strings suitable for display in a terminal.")
     (license license:expat)))
 
+(define-public python2-rst2ansi
+  (package-with-python2 python-rst2ansi))
+
 (define-public python-flake8-polyfill
   (package
     (name "python-flake8-polyfill")
@@ -12581,6 +12584,9 @@ faster ones are not available.")
  intend to support Flake8 2.x and 3.x simultaneously.")
     (license license:expat)))
 
+(define-public python2-flake8-polyfill
+  (package-with-python2 python-flake8-polyfill))
+
 (define-public python-ddt
   (package
     (name "python-ddt")
@@ -12605,6 +12611,9 @@ faster ones are not available.")
  it with different test data, and make it appear as multiple test cases.")
     (license license:expat)))
 
+(define-public python2-ddt
+  (package-with-python2 python-ddt))
+
 (define-public python-pycosat
   (package
     (name "python-pycosat")
@@ -12626,6 +12635,9 @@ faster ones are not available.")
  itself.  @code{picosat} is a Boolean Satisfiability Problem (SAT) solver")
     (license license:expat)))
 
+(define-public python2-pycosat
+  (package-with-python2 python-pycosat))
+
 (define-public python2-ruamel.ordereddict
   (package
     (name "python2-ruamel.ordereddict")
-- 
2.10.2

Re: [PATCH 6/6] gnu: Add python-2 variants of packages

[ng0]

Hi,

On 17-02-09 20:48:37, Muriithi Frederick Muriuki wrote:
> * gnu/packages/python.scm (python2-rst2ansi, python2-flake8-polyfill,
>     python2-ddt, python2-pycosat): New variables.
> ---

Thanks for your contributions.
I think it makes sense to split this patch up into one patch per
package. As I see it none of them are related, and if they are needed
for a package which occurs later / previously in this series, it could
still be split up.

>  gnu/packages/python.scm | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index ec9cbb7..e235bb0 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -12560,6 +12560,9 @@ faster ones are not available.")
>   ansi-escaped strings suitable for display in a terminal.")
>      (license license:expat)))
>  
> +(define-public python2-rst2ansi
> +  (package-with-python2 python-rst2ansi))
> +
>  (define-public python-flake8-polyfill
>    (package
>      (name "python-flake8-polyfill")
> @@ -12581,6 +12584,9 @@ faster ones are not available.")
>   intend to support Flake8 2.x and 3.x simultaneously.")
>      (license license:expat)))
>  
> +(define-public python2-flake8-polyfill
> +  (package-with-python2 python-flake8-polyfill))
> +
>  (define-public python-ddt
>    (package
>      (name "python-ddt")
> @@ -12605,6 +12611,9 @@ faster ones are not available.")
>   it with different test data, and make it appear as multiple test cases.")
>      (license license:expat)))
>  
> +(define-public python2-ddt
> +  (package-with-python2 python-ddt))
> +
>  (define-public python-pycosat
>    (package
>      (name "python-pycosat")
> @@ -12626,6 +12635,9 @@ faster ones are not available.")
>   itself.  @code{picosat} is a Boolean Satisfiability Problem (SAT) solver")
>      (license license:expat)))
>  
> +(define-public python2-pycosat
> +  (package-with-python2 python-pycosat))
> +
>  (define-public python2-ruamel.ordereddict
>    (package
>      (name "python2-ruamel.ordereddict")
> -- 
> 2.10.2
> 
> 

-- 
ng0 -- https://www.inventati.org/patternsinthechaos/

Re: [PATCH 1/6] gnu: Add python-rst2ansi

[Marius Bakke]

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

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

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

Applied, thanks!

I made the synopsis on this package a little more general and trimmed
the description lengths on all of them.

> ---
>  gnu/packages/python.scm | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 5b4d2b0..61b34bf 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -35,6 +35,7 @@
>  ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr>
>  ;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
>  ;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au>
> +;;; Copyright © 2017 Frederick M. Muriithi <fredmanglis@gmail.com>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -12536,3 +12537,25 @@ console.")
>  This implementation is slow (hence the project name) but still useful when
>  faster ones are not available.")
>      (license license:asl2.0)))
> +
> +(define-public python-rst2ansi
> +  (package
> +    (name "python-rst2ansi")
> +    (version "0.1.5")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "rst2ansi" version))
> +       (sha256
> +        (base32
> +         "0vzy6gd60l79ff750scl0sz48r1laalkl6md6dwzah4dcadgn5qv"))))
> +    (build-system python-build-system)
> +    (propagated-inputs
> +     `(("python-docutils" ,python-docutils)))
> +    (home-page "https://github.com/Snaipe/python-rst-to-ansi")
> +    (synopsis
> +     "Python rst converter to ansi-decorated console output")
> +    (description
> +     "Python module dedicated to rendering RST (reStructuredText) documents to
> + ansi-escaped strings suitable for display in a terminal.")
> +    (license license:expat)))
> -- 
> 2.10.2

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

Re: [PATCH 2/6] gnu: Add python-flake8-polyfill

[Marius Bakke]

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

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

> * gnu/packages/python.scm (python-flake8-polyfill): New variable.

Applied, thanks! I moved this closer to the "python-flake8" expression
so it's easier to locate in the source code. Also added the python2
variant on this and others where applicable.

I did remove python-flake8 from propagated-inputs too. While required by
this package, AFAIU from the description, it's designed to be used with
different flake versions, so propagating one may cause conflicts.

> ---
>  gnu/packages/python.scm | 21 +++++++++++++++++++++
>  1 file changed, 21 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 61b34bf..6b56312 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -12559,3 +12559,24 @@ faster ones are not available.")
>       "Python module dedicated to rendering RST (reStructuredText) documents to
>   ansi-escaped strings suitable for display in a terminal.")
>      (license license:expat)))
> +
> +(define-public python-flake8-polyfill
> +  (package
> +    (name "python-flake8-polyfill")
> +    (version "1.0.1")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "flake8-polyfill" version))
> +       (sha256
> +        (base32
> +         "02gn2wxvh9vnf7m7dld7ca4l60mg5c370hv3swwppkngwaqmcw67"))))
> +    (build-system python-build-system)
> +    (native-inputs
> +     `(("python-flake8" ,python-flake8)))
> +    (home-page "https://gitlab.com/pycqa/flake8-polyfill")
> +    (synopsis "Polyfill package for Flake8 plugins")
> +    (description
> +     "This package that provides some compatibility helpers for Flake8 plugins that
> + intend to support Flake8 2.x and 3.x simultaneously.")
> +    (license license:expat)))
> -- 
> 2.10.2

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

Re: [PATCH 3/6] gnu: Add python-ddt

[Marius Bakke]

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

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

> * gnu/packages/python.scm (python-ddt): New variable.
> ---
>  gnu/packages/python.scm | 24 ++++++++++++++++++++++++
>  1 file changed, 24 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 6b56312..9e17caf 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -12580,3 +12580,27 @@ faster ones are not available.")
>       "This package that provides some compatibility helpers for Flake8 plugins that
>   intend to support Flake8 2.x and 3.x simultaneously.")
>      (license license:expat)))
> +
> +(define-public python-ddt
> +  (package
> +    (name "python-ddt")
> +    (version "1.1.1")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "ddt" version))
> +       (sha256
> +        (base32
> +         "1c00ikkxr7lha97c81k938bzhgd4pbwamkjn0h4nkhr3xk00zp6n"))))
> +    (build-system python-build-system)
> +    (native-inputs
> +     `(("python-mock" ,python-mock)
> +       ("python-nose" ,python-nose)))
> +    (inputs
> +     `(("python-six" ,python-six)
> +       ("python-pyyaml" ,python-pyyaml)))

I made these inputs propagated as Hartmut mentioned. Pushed!

> +    (home-page "https://github.com/txels/ddt")
> +    (synopsis "Data-Driven Tests")
> +    (description "DDT (Data-Driven Tests) allows you to multiply one test case by running
> + it with different test data, and make it appear as multiple test cases.")
> +    (license license:expat)))
> -- 
> 2.10.2

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

Re: [PATCH 4/6] gnu: Add python-pycosat

[Marius Bakke]

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

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

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

Applied! This software bundles the "picosat" C program, so I added a
TODO note for removing it (we try to unbundle software and use Guix
versions wherever feasible).

> ---
>  gnu/packages/python.scm | 21 +++++++++++++++++++++
>  1 file changed, 21 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 9e17caf..e9df67c 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -12604,3 +12604,24 @@ faster ones are not available.")
>      (description "DDT (Data-Driven Tests) allows you to multiply one test case by running
>   it with different test data, and make it appear as multiple test cases.")
>      (license license:expat)))
> +
> +(define-public python-pycosat
> +  (package
> +    (name "python-pycosat")
> +    (version "0.6.1")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "pycosat" version))
> +       (sha256
> +        (base32
> +         "1kl3wh1f47rc712n4bmwplbx3fqz3x9i1b587jrbpmvdva4c8f6l"))))
> +    (build-system python-build-system)
> +    (home-page
> +     "https://github.com/ContinuumIO/pycosat")
> +    (synopsis "Bindings to picosat (a SAT solver)")
> +    (description
> +     "This package provides efficient Python bindings to @code{picosat} on the C level,
> + i.e. when importing pycosat, the @code{picosat} solver becomes part of the Python process
> + itself.  @code{picosat} is a Boolean Satisfiability Problem (SAT) solver")
> +    (license license:expat)))
> -- 
> 2.10.2

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

Re: [PATCH 5/6] gnu: Add python2-ruamel.ordereddict

[Marius Bakke]

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

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

> * gnu/packages/python.scm (python2-ruamel.ordereddict): 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 e9df67c..ec9cbb7 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -12625,3 +12625,31 @@ faster ones are not available.")
>   i.e. when importing pycosat, the @code{picosat} solver becomes part of the Python process
>   itself.  @code{picosat} is a Boolean Satisfiability Problem (SAT) solver")
>      (license license:expat)))
> +
> +(define-public python2-ruamel.ordereddict
> +  (package
> +    (name "python2-ruamel.ordereddict")
> +    (version "0.4.9")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "ruamel.ordereddict" version))
> +       (sha256
> +        (base32
> +         "1xmkl8v9l9inm2pyxgc1fm5005yxm7fkd5gv74q7lj1iy5qc8n3h"))))
> +    (build-system python-build-system)
> +    (arguments
> +     `(#:python ,python-2))
> +    (home-page
> +     "https://bitbucket.org/ruamel/ordereddict")
> +    (synopsis
> +     "Version of dict that keeps keys in insertion resp. sorted order")
> +    (description
> +     "This is an implementation of an ordered dictionary with Key Insertion Order (KIO:
> + updates of values do not affect the position of the key), Key Value Insertion Order
> + (KVIO, an existing key's position is removed and put at the back).  The standard library
> + module OrderedDict, implemented later, implements a subset of ordereddict functionality.
> +Sorted dictionaries are also provided.  Currently only with Key Sorted Order (KSO, no
> + sorting function can be specified, but a transform can be specified to apply on the key
> + before comparison (e.g. string.lower)).")

I shortened the lengths a bit and added @dfn{} wrappers around the
various acronym definitions. Pushed!

> +    (license license:expat)))
> -- 
> 2.10.2

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