[PATCH] Some dependencies for the planned IPython upgrade.

[Ricardo Wurmus]

Hi Guix,

last time I sent a patch to upgrade IPython but forgot to actually send
all the other required packages to make this upgrade work.  So this
email contains a first set of new packages that are needed for the
upgrade.  A couple of patches still need some work before I can send
them out.

~~ Ricardo

>From 22c5a75aae3fec3bef18f2186ba87d6891439006 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <address@hidden>
Date: Tue, 22 Sep 2015 14:58:16 +0200
Subject: [PATCH 1/8] gnu: Add python-pexpect.

* gnu/packages/python.scm (python-pexpect, python2-pexpect): 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 2c9772e..6b41ba7 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3620,6 +3620,36 @@ cluster without needing to write any wrapper code 
yourself.")
 (define-public python2-gridmap
   (package-with-python2 python-gridmap))
 
+(define-public python-pexpect
+  (package
+    (name "python-pexpect")
+    (version "3.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://pypi.python.org/packages/source/p/";
+                           "pexpect/pexpect-" version ".tar.gz"))
+       (sha256
+        (base32 "1fp5gm976z7ghm8jw57463rj19cv06c8zw842prgyg788f6n3snz"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check (lambda _ (zero? (system* "nosetests")))))))
+    (native-inputs
+     `(("python-nose" ,python-nose)))
+    (home-page "http://pexpect.readthedocs.org/";)
+    (synopsis "Controlling interactive console applications")
+    (description
+     "Pexpect is a pure Python module for spawning child applications;
+controlling them; and responding to expected patterns in their output.
+Pexpect works like Don Libes’ Expect.  Pexpect allows your script to spawn a
+child application and control it as if a human were typing commands.")
+    (license isc)))
+
+(define-public python2-pexpect
+  (package-with-python2 python-pexpect))
+
 (define-public python-ipython
   (package
     (name "python-ipython")
-- 
2.1.0

>From 3f760ee200cf7353dd51c91507ecab570ff715cd Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <address@hidden>
Date: Tue, 22 Sep 2015 14:59:13 +0200
Subject: [PATCH 2/8] gnu: Add python-setuptools-scm.

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 6b41ba7..ecdebf8 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3650,6 +3650,30 @@ child application and control it as if a human were 
typing commands.")
 (define-public python2-pexpect
   (package-with-python2 python-pexpect))
 
+(define-public python-setuptools-scm
+  (package
+    (name "python-setuptools-scm")
+    (version "1.8.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://pypi.python.org/packages/source/s/";
+                                  "setuptools_scm/setuptools_scm-"
+                                  version ".tar.bz2"))
+              (sha256
+               (base32
+                "00p60v2yfqy1r58pjcx9wy6dvqd7wkpfs5z1dzwf7y75c1g3dgyx"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/pypa/setuptools_scm/";)
+    (synopsis "Manage Python package versions in scm metadata")
+    (description
+     "setuptools_scm handles managing your Python package versions in scm
+metadata instead of declaring them as the version argument or in a scm managed
+file.")
+    (license license:expat)))
+
+(define-public python2-setuptools-scm
+  (package-with-python2 python-setuptools-scm))
+
 (define-public python-ipython
   (package
     (name "python-ipython")
-- 
2.1.0

>From 469a4c3ffdbbf3687413d5ce695bbaa51d1ddf28 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <address@hidden>
Date: Wed, 23 Sep 2015 12:46:24 +0200
Subject: [PATCH 3/8] gnu: Add python-pytest-runner.

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index ecdebf8..066c233 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1534,6 +1534,44 @@ and many external plugins.")
 (define-public python2-pytest
   (package-with-python2 python-pytest))
 
+(define-public python-pytest-runner
+  (package
+    (name "python-pytest-runner")
+    (version "2.6.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://pypi.python.org/packages/source/p/";
+                           "pytest-runner/pytest-runner-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "1nwcqx0l3fv52kv8526wy8ypzghbq96c96di318d98d3wh7a8xg7"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; The fancy way of setting the version with setuptools_scm does not
+         ;; seem to work here.
+         (add-after 'unpack 'set-version
+          (lambda _
+            (substitute* "docs/conf.py"
+              (("version = setuptools_scm\\.get_version\\(root='\\.\\.')")
+               (string-append "version = \"" ,version "\"")))
+            #t)))))
+    (native-inputs
+     `(("python-pytest" ,python-pytest)
+       ("python-setuptools-scm" ,python-setuptools-scm)))
+    (home-page "https://bitbucket.org/pytest-dev/pytest-runner";)
+    (synopsis "Invoke py.test as distutils command")
+    (description
+     "Setup scripts can use pytest-runner to add setup.py test support for
+pytest runner.")
+    (license license:expat)))
+
+(define-public python2-pytest-runner
+  (package-with-python2 python-pytest-runner))
+
 (define-public python-scripttest
   (package
     (name "python-scripttest")
-- 
2.1.0

>From 09e628d8cf7eeb258f4cb849bf0150f639d13325 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <address@hidden>
Date: Wed, 23 Sep 2015 12:47:16 +0200
Subject: [PATCH 4/8] gnu: Add python-pathpy.

* gnu/packages/python.scm (python-pathpy, python2-pathpy): 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 066c233..b82e551 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3712,6 +3712,34 @@ file.")
 (define-public python2-setuptools-scm
   (package-with-python2 python-setuptools-scm))
 
+(define-public python-pathpy
+  (package
+    (name "python-pathpy")
+    (version "8.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://pypi.python.org/packages/source/p/";
+                           "path.py/path.py-" version ".tar.gz"))
+       (sha256
+        (base32 "1p8s1l2vfkqhqxdhqlj0g1jjw4f1as2frr35sjcpjjpd5a89y41f"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-appdirs" ,python-appdirs)))
+    (native-inputs
+     `(("python-setuptools-scm" ,python-setuptools-scm)
+       ("python-pytest" ,python-pytest)
+       ("python-pytest-runner" ,python-pytest-runner)))
+    (home-page "http://github.com/jaraco/path.py";)
+    (synopsis "Python module wrapper for built-in os.path")
+    (description
+     "path.py implements path objects as first-class entities, allowing common
+operations on files to be invoked on those path objects directly.")
+    (license license:expat)))
+
+(define-public python2-pathpy
+  (package-with-python2 python-pathpy))
+
 (define-public python-ipython
   (package
     (name "python-ipython")
-- 
2.1.0

>From 284d19ae5b604ba0cfa76c1e0343725283ce013c Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <address@hidden>
Date: Wed, 23 Sep 2015 12:48:27 +0200
Subject: [PATCH 5/8] gnu: Add python-pickleshare.

* gnu/packages/python.scm (python-pickleshare, python2-pickleshare): 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 b82e551..c230837 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3740,6 +3740,35 @@ operations on files to be invoked on those path objects 
directly.")
 (define-public python2-pathpy
   (package-with-python2 python-pathpy))
 
+(define-public python-pickleshare
+  (package
+    (name "python-pickleshare")
+    (version "0.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://pypi.python.org/packages/source/p/";
+                           "pickleshare/pickleshare-" version ".tar.gz"))
+       (sha256
+        (base32 "11ljr90j3p6qswdrbl7p4cjb2i93f6vn0vx9anzpshsx0d2mggn0"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-pathpy" ,python-pathpy)))
+    (home-page "https://github.com/vivainio/pickleshare";)
+    (synopsis "Tiny key value database with concurrency support")
+    (description
+     "PickleShare is a small ‘shelve’-like datastore with concurrency support.
+Like shelve, a PickleShareDB object acts like a normal dictionary.  Unlike
+shelve, many processes can access the database simultaneously.  Changing a
+value in database is immediately visible to other processes accessing the same
+database.  Concurrency is possible because the values are stored in separate
+files.  Hence the “database” is a directory where all files are governed by
+PickleShare.")
+    (license license:expat)))
+
+(define-public python2-pickleshare
+  (package-with-python2 python-pickleshare))
+
 (define-public python-ipython
   (package
     (name "python-ipython")
-- 
2.1.0

>From e18a12cbfdfe55a7bcfe4542fa9bea3540bbbf29 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <address@hidden>
Date: Wed, 23 Sep 2015 12:50:13 +0200
Subject: [PATCH 6/8] gnu: Add python-simplegeneric.

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index c230837..14d570f 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -32,7 +32,7 @@
   #: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+ 
agpl3+
-                          isc psfl public-domain x11-style))
+                          isc psfl public-domain x11-style zpl2.1))
   #:use-module ((guix licenses) #:select (expat zlib) #:prefix license:)
   #:use-module (gnu packages)
   #:use-module (gnu packages attr)
@@ -3769,6 +3769,34 @@ PickleShare.")
 (define-public python2-pickleshare
   (package-with-python2 python-pickleshare))
 
+(define-public python-simplegeneric
+  (package
+    (name "python-simplegeneric")
+    (version "0.8.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://pypi.python.org/packages/source/s/";
+                           "simplegeneric/simplegeneric-" version ".zip"))
+       (sha256
+        (base32 "0wwi1c6md4vkbcsfsf8dklf3vr4mcdj4mpxkanwgb6jb1432x5yw"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("unzip" ,unzip)))
+    (home-page "http://cheeseshop.python.org/pypi/simplegeneric";)
+    (synopsis "Python module for simple generic functions")
+    (description
+     "The simplegeneric module lets you define simple single-dispatch generic
+functions, akin to Python’s built-in generic functions like @code{len()},
address@hidden()} and so on.  However, instead of using specially-named methods,
+these generic functions use simple lookup tables, akin to those used by
+e.g. @code{pickle.dump()} and other generic functions found in the Python
+standard library.")
+    (license zpl2.1)))
+
+(define-public python2-simplegeneric
+  (package-with-python2 python-simplegeneric))
+
 (define-public python-ipython
   (package
     (name "python-ipython")
-- 
2.1.0

>From 16790e99b89aa9f63f08ce49d3c79dc8b226cda6 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <address@hidden>
Date: Wed, 23 Sep 2015 13:51:03 +0200
Subject: [PATCH 7/8] gnu: Add python-ipython-genutils.

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 14d570f..780b96e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3797,6 +3797,29 @@ standard library.")
 (define-public python2-simplegeneric
   (package-with-python2 python-simplegeneric))
 
+(define-public python-ipython-genutils
+  (package
+    (name "python-ipython-genutils")
+    (version "0.1.0")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "https://pypi.python.org/packages/source/i/";
+                          "ipython_genutils/ipython_genutils-"
+                          version ".tar.gz"))
+      (sha256
+       (base32 "19l2pp1c64ansr89l3cqh19jdi2ixhssdzx0vz4n6r52a6i281is"))))
+    (build-system python-build-system)
+    (arguments `(#:tests? #f)) ; no tests
+    (home-page "http://ipython.org";)
+    (synopsis "Vestigial utilities from IPython")
+    (description
+     "This package provides retired utilities from IPython.")
+    (license bsd-3)))
+
+(define-public python2-ipython-genutils
+  (package-with-python2 python-ipython-genutils))
+
 (define-public python-ipython
   (package
     (name "python-ipython")
-- 
2.1.0

>From e6bdd41570a37a4df7d151309b6997365b64164f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <address@hidden>
Date: Wed, 23 Sep 2015 13:51:50 +0200
Subject: [PATCH 8/8] gnu: Add python-traitlets.

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 780b96e..9a19524 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3820,6 +3820,37 @@ standard library.")
 (define-public python2-ipython-genutils
   (package-with-python2 python-ipython-genutils))
 
+(define-public python-traitlets
+  (package
+    (name "python-traitlets")
+    (version "4.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://pypi.python.org/packages/source/t/";
+                           "traitlets/traitlets-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0fr3w2xwb46c591dp7zw02bgf4d21mjy9g6rhwc9bwd4ji50n50b"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check (lambda _ (zero? (system* "nosetests")))))))
+    (propagated-inputs
+     `(("python-ipython-genutils" ,python-ipython-genutils)
+       ("python-decorator" ,python-decorator)))
+    (native-inputs
+     `(("python-nose" ,python-nose)))
+    (home-page "http://ipython.org";)
+    (synopsis "Configuration system for Python applications")
+    (description
+     "Traitlets is a configuration system for Python applications.")
+    (license bsd-3)))
+
+(define-public python2-traitlets
+  (package-with-python2 python-traitlets))
+
 (define-public python-ipython
   (package
     (name "python-ipython")
-- 
2.1.0