[PATCH 0/5] New packages, simple fixes for openstack/python

[PATCH 0/5] New packages, simple fixes for openstack/python

[Cyril Roelandt]

Nothing too fancy, these patches are probably almost ready to be pushed :)

--
Cyril Roelandt (5):
  gnu: Add python-prettytable
  gnu: Fix the definition of python2-pyflakes-0.8.1.
  gnu: Add python2-pyflakes.
  gnu: Add python-mccabe-0.2.1
  gnu: Add python2-keyring.

 gnu/packages/python.scm | 54 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

-- 
2.1.4

[PATCH 1/5] gnu: Add python-prettytable

[Cyril Roelandt]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 408064d..1818993 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4880,3 +4880,31 @@ object to help create WSGI responses.")
 
 (define-public python2-webob
   (package-with-python2 python-webob))
+
+(define-public python-prettytable
+  (package
+    (name "python-prettytable")
+    (version "0.7.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/P/PrettyTable/"
+             "prettytable-" version ".tar.bz2"))
+       (sha256
+        (base32
+         "0diwsicwmiq2cpzpxri7cyl5fmsvicafw6nfqf6p6p322dji2g45"))))
+    (build-system python-build-system)
+    (inputs
+      `(("python-setuptools" ,python-setuptools)))
+    (home-page "http://code.google.com/p/prettytable/")
+    (synopsis "Display tabular data in an ASCII table format")
+    (description
+      "A library designed to represent tabular data in visually appealing ASCII
+tables.  PrettyTable allows for selection of which columns are to be printed,
+independent alignment of columns (left or right justified or centred) and
+printing of sub-tables by specifying a row range.")
+    (license bsd-3)))
+
+(define-public python2-prettytable
+  (package-with-python2 python-prettytable))
-- 
2.1.4

[PATCH 2/5] gnu: Fix the definition of python2-pyflakes-0.8.1.

[Cyril Roelandt]

* gnu/packages/python.scm (python2-pyflakes-0.8.1): Fix the definition.
---
 gnu/packages/python.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 1818993..0f94a54 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4497,7 +4497,7 @@ complexity of Python source code.")
             "0sbpq6pqm1i9wqi41mlfrsc5rk92jv4mskvlyxmnhlbdnc80ma1z"))))))
 
 (define-public python2-pyflakes-0.8.1
-  (package-with-python2 python-pyflakes))
+  (package-with-python2 python-pyflakes-0.8.1))
 
 (define-public python-flake8
   (package
-- 
2.1.4

[PATCH 3/5] gnu: Add python2-pyflakes.

[Cyril Roelandt]

* gnu/packages/python.scm (python2-pyflakes): 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 0f94a54..0117eb7 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4434,6 +4434,9 @@ PEP 8.")
       "Pyflakes statically checks Python source code for common errors.")
     (license license:expat)))
 
+(define-public python2-pyflakes
+  (package-with-python2 python-pyflakes))
+
 (define-public python-mccabe
   (package
     (name "python-mccabe")
-- 
2.1.4

[PATCH 4/5] gnu: Add python-mccabe-0.2.1

[Cyril Roelandt]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0117eb7..cecd750 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4464,6 +4464,24 @@ complexity of Python source code.")
 (define-public python2-mccabe
   (package-with-python2 python-mccabe))
 
+;; XXX Hacking requires this specific version of mccabe.
+;; This should be removed ASAP.
+(define-public python-mccabe-0.2.1
+  (package (inherit python-mccabe)
+    (version "0.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/m/mccabe/mccabe-"
+             version ".tar.gz"))
+       (sha256
+        (base32
+         "0fi4a81kr5bcv5p4xgibqr595hyj5dafkqgsmfk96mfy8w71fajs"))))))
+
+(define-public python2-mccabe-0.2.1
+  (package-with-python2 python-mccabe-0.2.1))
+
 ;; Flake8 2.4.1 requires an older version of pep8.
 ;; This should be removed ASAP.
 (define-public python-pep8-1.5.7
-- 
2.1.4

[PATCH 5/5] gnu: Add python2-keyring.

[Cyril Roelandt]

* gnu/packages/python.scm (python2-keyring): 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 cecd750..3438f20 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -783,6 +783,9 @@ password storage.")
     ;; "MIT" and PSF dual license
     (license x11)))
 
+(define-public python2-keyring
+  (package-with-python2 python-keyring))
+
 (define-public python-six
   (package
     (name "python-six")
-- 
2.1.4

Re: [PATCH 5/5] gnu: Add python2-keyring.

[Ricardo Wurmus]

Cyril Roelandt <tipecaml@gmail.com> writes:

> * gnu/packages/python.scm (python2-keyring): 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 cecd750..3438f20 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -783,6 +783,9 @@ password storage.")
>      ;; "MIT" and PSF dual license
>      (license x11)))
>  
> +(define-public python2-keyring
> +  (package-with-python2 python-keyring))
> +
>  (define-public python-six
>    (package
>      (name "python-six")

Looks good to me!  (What a cute little patch!)

~~ Ricardo

Re: [PATCH 1/5] gnu: Add python-prettytable

[Mathieu Lirzin]

Cyril Roelandt <tipecaml@gmail.com> writes:

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

LGTM.  Thanks.

--
Mathieu Lirzin

Re: [PATCH 3/5] gnu: Add python2-pyflakes.

[Mathieu Lirzin]

Cyril Roelandt <tipecaml@gmail.com> writes:

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

IMO the previous patch should be squash into this one.  Otherwise LGTM.
Thanks.

--
Mathieu Lirzin

Re: [PATCH 4/5] gnu: Add python-mccabe-0.2.1

[Mathieu Lirzin]

Cyril Roelandt <tipecaml@gmail.com> writes:

> * gnu/packages/python.scm (python-mccabe-0.2.1,
>   python2-mccabe-0.2.1): New variables.
> ---
>  gnu/packages/python.scm | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 0117eb7..cecd750 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -4464,6 +4464,24 @@ complexity of Python source code.")
>  (define-public python2-mccabe
>    (package-with-python2 python-mccabe))
>  
> +;; XXX Hacking requires this specific version of mccabe.
          ^^^
> +;; This should be removed ASAP.
> +(define-public python-mccabe-0.2.1

Could you be more precise about what package(s) or context requires it?

Otherwise LGTM.  Thanks.

--
Mathieu Lirzin

Re: [PATCH 4/5] gnu: Add python-mccabe-0.2.1

[Cyril Roelandt]

On 09/17/2015 07:38 PM, Mathieu Lirzin wrote:
> Could you be more precise about what package(s) or context requires it?

That is python-hacking, though I haven't added it yet, since I stumbled
upon other issues while packaging it :) I'll use a Guix-formatted name.

Cyril.

Re: [PATCH 0/5] New packages, simple fixes for openstack/python

[Cyril Roelandt]

On 09/17/2015 04:23 PM, Cyril Roelandt wrote:
>   gnu: Add python-prettytable
Pushed.

>   gnu: Fix the definition of python2-pyflakes-0.8.1.
>   gnu: Add python2-pyflakes.
Pushed these two as a single commit.

>   gnu: Add python-mccabe-0.2.1
Removed this one, will resubmit with the definition of python-hacking.

>   gnu: Add python2-keyring.
Pushed.


Thanks for the reviews.