Re: [PATCH] python2-ansible, python-ccm and dependencies

[Eric Dvorsak <yenda1@gmail.com>]

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

Thank you Ricardo and Alex for taking the time to review and comment my
patch. I edited it to take your advices into account. I hope I did not miss
anything this time

Eric

2015-07-25 12:07 GMT+02:00 Ricardo Wurmus <rekado@elephly.net>:

>
> Hi Eric,
>
> > I added the following package definitions to python.scm :
> >
> > - python2-ansible
> > - python-passlib
> > - python-py-bcrypt
> > - python-paramiko
> > - python-httplib2
> > - python-ecdsa
> > - python-ccm
>
> we normally make separate commits for separate packages.  The only
> exception is for when we add python-<name> as well as python2-<name>;
> they usually go together in the same commit.
>
> Please also run ‘guix lint package-name’ for each of the new packages.
> It will tell you a couple of things that you could do to improve.
>
> One thing I noticed is that the description you provide for the packages
> is the same as the synopsis.  The description, however, should provide
> more information and it should be complete sentences (with
> punctuation).
>
> Things like ‘("python-setuptools" ,python-setuptools)’ are to be placed
> in the list of ‘native-inputs’.  ‘native-inputs’ are only used at build
> time.
>
> Finally, there is no space between your definition of ‘python2-ccm’ and
> the existing definition of ‘python-pytz’.
>
> The other patch looks good to me, but it appears that this is a patch by
> Mark Weaver.  Did you submit it by accident?
>
> ~~ Ricardo
>
>

[-- Attachment #1.2: Type: text/html, Size: 2012 bytes --]

[-- Attachment #2: 0001-gnu-Add-python2-pycrypto.patch --]
[-- Type: text/x-patch, Size: 839 bytes --]

From c1dde968fb8b0384fb147b4aa4172816478da974 Mon Sep 17 00:00:00 2001
From: Eric Dvorsak <yenda1@gmail.com>
Date: Sat, 25 Jul 2015 21:31:05 +0200
Subject: [PATCH 1/8] gnu: Add python2-pycrypto.

* gnu/packages/python.scm (python2-pycrypto): 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 7709fbd..6235b48 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -538,6 +538,9 @@ and RIPEMD160), and various encryption algorithms (AES, DES, RSA, ElGamal,
 etc.).  The package is structured to make adding new modules easy.")
     (license public-domain)))
 
+(define-public python2-pycrypto
+  (package-with-python2 python-pycrypto))
+
 (define-public python-keyring
   (package
     (name "python-keyring")
-- 
2.4.3


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

From 80fad0306460b97e3a4de0581be1bed45d699698 Mon Sep 17 00:00:00 2001
From: Eric Dvorsak <yenda1@gmail.com>
Date: Sat, 25 Jul 2015 21:34:19 +0200
Subject: [PATCH 2/8] gnu: Add python-ccm.

* gnu/packages/python.scm (python-ccm, python2-ccm): 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 6235b48..15d62fc 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -297,6 +297,34 @@ pidof, tty, taskset, pmap.")
 (define-public python2-psutil
   (package-with-python2 python-psutil))
 
+(define-public python-ccm
+  (package
+    (name "python-ccm")
+    (version "2.0.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/c/ccm/ccm-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "199jw221albs2iv6xczczq88fxnh0aw8hzmys8qkbzkd99dssng9"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (inputs
+     `(("python-pyyaml" ,python-pyyaml)
+       ("python-six" ,python-six)))
+    (home-page "https://github.com/pcmanus/ccm")
+    (synopsis "Cassandra Cluster Manager")
+    (description "A script/library to create, launch and remove an Apache Cassandra cluster on localhost.")
+    (license asl2.0)))
+
+(define-public python2-ccm
+  (package-with-python2 python-ccm))
+
 (define-public python-pytz
   (package
     (name "python-pytz")
-- 
2.4.3


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

From 295fc4b3ccae4d0222ed74e0d6d6031170c8b56e Mon Sep 17 00:00:00 2001
From: Eric Dvorsak <yenda1@gmail.com>
Date: Sat, 25 Jul 2015 21:35:35 +0200
Subject: [PATCH 3/8] gnu: Add python-ecdsa.

* gnu/packages/python.scm (python-ecdsa, python2-ecdsa): 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 15d62fc..76eaafd 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -297,6 +297,36 @@ pidof, tty, taskset, pmap.")
 (define-public python2-psutil
   (package-with-python2 python-psutil))
 
+(define-public python-ecdsa
+  (package
+    (name "python-ecdsa")
+    (version "0.13")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/e/ecdsa/ecdsa-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1yj31j0asmrx4an9xvsaj2icdmzy6pw0glfpqrrkrphwdpi1xkv4"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (inputs
+     `(("openssl" ,openssl)))
+    (home-page
+     "http://github.com/warner/python-ecdsa")
+    (synopsis
+     "ECDSA cryptographic signature library (pure python)")
+    (description
+     "This is an easy-to-use implementation of ECDSA cryptography (Elliptic Curve Digital Signature Algorithm), implemented purely in Python.  With this library, you can quickly create keypairs (signing key and verifying key), sign messages, and verify the signatures.  The keys and signatures are very short, making them easy to handle and incorporate into other protocols.")
+    (license license:expat)))
+
+(define-public python2-ecdsa
+  (package-with-python2 python-ecdsa))
+
 (define-public python-ccm
   (package
     (name "python-ccm")
-- 
2.4.3


[-- Attachment #5: 0004-gnu-Add-python-httplib2.patch --]
[-- Type: text/x-patch, Size: 1591 bytes --]

From f844c8755dce3a53b0ad2a8a7200491fee7d98e0 Mon Sep 17 00:00:00 2001
From: Eric Dvorsak <yenda1@gmail.com>
Date: Sat, 25 Jul 2015 21:36:51 +0200
Subject: [PATCH 4/8] gnu: Add python-httplib2.

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 76eaafd..400b3f3 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -297,6 +297,33 @@ pidof, tty, taskset, pmap.")
 (define-public python2-psutil
   (package-with-python2 python-psutil))
 
+(define-public python-httplib2
+  (package
+    (name "python-httplib2")
+    (version "0.9.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/h/httplib2/httplib2-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1xc3clbrf77r0600kja71j7hk1218sjiq0gfmb8vjdajka8kjqxw"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page
+     "https://github.com/jcgregorio/httplib2")
+    (synopsis "Comprehensive HTTP client library")
+    (description
+     "A comprehensive HTTP client library supporting many features left out of other HTTP libraries.")
+    (license license:expat)))
+
+(define-public python2-httplib2
+  (package-with-python2 python-httplib2))
+
 (define-public python-ecdsa
   (package
     (name "python-ecdsa")
-- 
2.4.3


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

From 9cbb1d6d83dd2282d3583c1ad438cf3421239362 Mon Sep 17 00:00:00 2001
From: Eric Dvorsak <yenda1@gmail.com>
Date: Sat, 25 Jul 2015 21:38:04 +0200
Subject: [PATCH 5/8] gnu: Add python-paramiko.

* gnu/packages/python.scm (python-paramiko, python2-paramiko): 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 400b3f3..cc0ed25 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -297,6 +297,35 @@ pidof, tty, taskset, pmap.")
 (define-public python2-psutil
   (package-with-python2 python-psutil))
 
+(define-public python-paramiko
+  (package
+    (name "python-paramiko")
+    (version "1.15.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/p/paramiko/paramiko-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0mbfzm9zlrz6mla9xakrm8wkll3x035f9rj3c5pbgjzfldqscmjg"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (inputs
+     `(("python-ecdsa" ,python-ecdsa)
+       ("python-pycrypto" ,python-pycrypto)))
+    (home-page "http://www.paramiko.org/")
+    (synopsis "SSHv2 protocol library")
+    (description "Paramiko is a python implementation of the SSHv2 protocol, providing both client and server functionality.  While it leverages a Python C extension for low level cryptography (PyCrypto), Paramiko itself is a pure Python interface around SSH networking concepts.")
+    (license lgpl2.1)))
+
+(define-public python2-paramiko
+  (package-with-python2 python-paramiko))
+
+
 (define-public python-httplib2
   (package
     (name "python-httplib2")
-- 
2.4.3


[-- Attachment #7: 0006-gnu-Add-python-py-bcrypt.patch --]
[-- Type: text/x-patch, Size: 2055 bytes --]

From 52b97d96f0952194560040b9279fcff17c94a728 Mon Sep 17 00:00:00 2001
From: Eric Dvorsak <yenda1@gmail.com>
Date: Sat, 25 Jul 2015 21:39:03 +0200
Subject: [PATCH 6/8] gnu: Add python-py-bcrypt.

* gnu/packages/python.scm (python-py-bcrypt, python2-py-bcrypt): 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 cc0ed25..904ec1e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -297,6 +297,34 @@ pidof, tty, taskset, pmap.")
 (define-public python2-psutil
   (package-with-python2 python-psutil))
 
+(define-public python-py-bcrypt
+  (package
+    (name "python-py-bcrypt")
+    (version "0.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/p/py-bcrypt/py-bcrypt-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0y6smdggwi5s72v6p1nn53dg6w05hna3d264cq6kas0lap73p8az"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page "https://code.google.com/p/py-bcrypt")
+    (synopsis
+     "Bcrypt password hashing and key derivation")
+    (description
+     "A python wrapper of OpenBSD's Blowfish password hashing code.  This system hashes passwords using a version of Bruce Schneier's Blowfish block cipher with modifications designed to raise the cost of off-line password cracking and frustrate fast hardware implementation.  The computation cost of the algorithm is parametised, so it can be increased as computers get faster.  The intent is to make a compromise of a password database less likely to result in an attacker gaining knowledge of the plaintext passwords (e.g. using John the Ripper).")
+    (license bsd-3)))
+
+(define-public python2-py-bcrypt
+  (package-with-python2 python-py-bcrypt))
+
+
 (define-public python-paramiko
   (package
     (name "python-paramiko")
-- 
2.4.3


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

From 024f09d08372146f4ed2e207bc8f8ecd3c277ffd Mon Sep 17 00:00:00 2001
From: Eric Dvorsak <yenda1@gmail.com>
Date: Sat, 25 Jul 2015 21:39:50 +0200
Subject: [PATCH 7/8] gnu: Add python-passlib.

* gnu/packages/python.scm (python-passlib, python2-passlib): 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 904ec1e..314896e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -297,6 +297,43 @@ pidof, tty, taskset, pmap.")
 (define-public python2-psutil
   (package-with-python2 python-psutil))
 
+(define-public python-passlib
+  (package
+    (name "python-passlib")
+    (version "1.6.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/p/passlib/passlib-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "0b9rd161b3mmiwd7nx1v599yh9sp07mlfwac65sjy9qn1l0gd1z9"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-nose" ,python-nose)
+       ("python-setuptools" ,python-setuptools)))
+    (inputs
+     `(("python-py-bcrypt" ,python-py-bcrypt)))
+    (arguments
+     `(#:phases
+       (alist-cons-before
+        'check 'set-PYTHON_EGG_CACHE
+        ;; some tests require access to "$HOME/.cython"
+        (lambda* _ (setenv "PYTHON_EGG_CACHE" "/tmp"))
+         %standard-phases)))
+    (home-page "https://bitbucket.org/ecollins/passlib")
+    (synopsis
+     "Comprehensive password hashing framework")
+    (description
+     "Passlib is a password hashing library for Python 2 & 3, which provides cross-platform implementations of over 30 password hashing algorithms, as well as a framework for managing existing password hashes.  It's designed to be useful for a wide range of tasks, from verifying a hash found in /etc/shadow, to providing full-strength password hashing for multi-user application.")
+    (license bsd-3)))
+
+(define-public python2-passlib
+  (package-with-python2 python-passlib))
+
 (define-public python-py-bcrypt
   (package
     (name "python-py-bcrypt")
-- 
2.4.3


[-- Attachment #9: 0008-gnu-Add-python2-ansible.patch --]
[-- Type: text/x-patch, Size: 2774 bytes --]

From 9d1c4ae575eab89074ab88a99bc57a3031fbf19f Mon Sep 17 00:00:00 2001
From: Eric Dvorsak <yenda1@gmail.com>
Date: Sat, 25 Jul 2015 21:40:24 +0200
Subject: [PATCH 8/8] gnu: Add python2-ansible.

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 314896e..a8fdc56 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -28,7 +28,7 @@
 (define-module (gnu packages python)
   #:use-module ((guix licenses)
                 #:select (asl2.0 bsd-4 bsd-3 bsd-2 non-copyleft cc0 x11 x11-style
-                          gpl2 gpl2+ gpl3+ lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3+
+                          gpl2 gpl2+ gpl3 gpl3+ lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3+
                           psfl public-domain x11-style))
   #:use-module ((guix licenses) #:select (expat zlib) #:prefix license:)
   #:use-module (gnu packages)
@@ -297,6 +297,43 @@ pidof, tty, taskset, pmap.")
 (define-public python2-psutil
   (package-with-python2 python-psutil))
 
+(define-public python2-ansible
+  (package
+    (name "python2-ansible")
+    (version "1.9.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/a/ansible/ansible-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "007fzgsqaahb0y4gjdxxmir9kcni7wph2z14jhqgpz88idrz8pn2"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python2-setuptools" ,python2-setuptools)
+       ("python2-pycrypto" ,python2-pycrypto)
+       ("python2-httplib2" ,python2-httplib2)
+       ("python2-passlib" ,python2-passlib)
+       ("python2-nose" ,python2-nose)
+       ("python2-mock" ,python2-mock)
+       ("python2-jinja2" ,python2-jinja2)
+       ("python2-pyyaml" ,python2-pyyaml)
+       ("python2-paramiko" ,python2-paramiko)))
+    (inputs
+     `(("python2-pycrypto" ,python2-pycrypto)
+       ("python2-jinja2" ,python2-jinja2)
+       ("python2-pyyaml" ,python2-pyyaml)
+       ("python2-paramiko" ,python2-paramiko)))
+    (arguments
+     `(#:python ,python-2)) ; incompatible with Python 3
+    (home-page "http://ansible.com/")
+    (synopsis "Radically simple IT automation")
+    (description "Ansible is a radically simple IT automation system.  It handles configuration-management, application deployment, cloud provisioning, ad-hoc task-execution, and multinode orchestration - including trivializing things like zero downtime rolling updates with load balancers.")
+    (license gpl3)))
+
 (define-public python-passlib
   (package
     (name "python-passlib")
-- 
2.4.3