From 888dcd025b042cfe2708bd52d2914687cf4244ab Mon Sep 17 00:00:00 2001
From: Muriithi Frederick Muriuki
Date: Fri, 31 May 2019 16:44:32 +0300
Subject: Update the version of python-htmlgen

* Update the version of python-htmlgen to 1.2.2
---
 gn/packages/python.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'gn/packages/python.scm')

diff --git a/gn/packages/python.scm b/gn/packages/python.scm
index 651a635..663edf1 100644
--- a/gn/packages/python.scm
+++ b/gn/packages/python.scm
@@ -695,7 +695,7 @@ the older versions.")
 (define-public python-htmlgen
   (package
     (name "python-htmlgen")
-    (version "1.0.0")
+    (version "1.2.2")
     (source
      (origin
        (method url-fetch)
@@ -704,8 +704,10 @@ the older versions.")
 	     version ".tar.gz"))
        (sha256
 	(base32
-	 "1rwgqxhmc93l60wf4ay7ph619710kvyp73s22i0snjpm5i0bhc46"))))
+	 "0w3pcvm68jfdhnsxwwwifwhqqj9kqg3195b52hqd23qza480xilx"))))
     (build-system python-build-system)
+    (propagated-inputs
+     `(("python-typing" ,python-typing)))
     (arguments
      `(#:tests? #f))
     (synopsis "Python HTML 5 Generator")
@@ -713,6 +715,9 @@ the older versions.")
     (home-page "https://github.com/srittau/python-htmlgen")
     (license license:expat)))
 
+(define-public python2-htmlgen
+  (package-with-python2 python-htmlgen))
+
 (define-public python-version
 (let ((commit "e5aadc720bb74c535f29e5a2de5cd9697efe8d7c"))
 (package
-- 
cgit v1.2.3


From 73227ba7193a191bea7a11bd3fecea91c60bd01b Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Tue, 18 Jun 2019 08:15:32 -0500
Subject: add python-2.4

---
 gn/packages/python.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

(limited to 'gn/packages/python.scm')

diff --git a/gn/packages/python.scm b/gn/packages/python.scm
index 663edf1..c01c9e2 100644
--- a/gn/packages/python.scm
+++ b/gn/packages/python.scm
@@ -47,6 +47,51 @@
   #:use-module (guix build-system trivial)
   #:use-module (srfi srfi-1))
 
+;; TODO: Check against 'guix lint -c cve python2.4' list:
+;; CVE-2019-9740, CVE-2019-9947, CVE-2019-9948, CVE-2018-1060, CVE-2018-1061,
+;; CVE-2014-9365, CVE-2012-0845, CVE-2012-1150, CVE-2011-1521, CVE-2011-4940,
+;; CVE-2010-3492, CVE-2008-5031, CVE-2008-5983
+(define-public python-2.4
+  (package
+    (inherit python-2)
+    (name "python2.4")
+    (version "2.4.6")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "https://www.python.org/ftp/python/"
+                          version "/Python-" version ".tar.bz2"))
+      (sha256
+       (base32
+        "021y88a4ki07dgq19yhg6zfvmncfiz7h5b2255438i9zmlwl246s"))))
+    (outputs '("out"))
+    (arguments
+      (substitute-keyword-arguments (package-arguments python-2)
+        ((#:phases phases)
+         `(modify-phases ,phases
+            (add-before 'check 'delete-failing-test
+              (lambda _
+                (delete-file "Lib/test/test_socket.py")
+                #t))
+            (add-after 'check 'find-netinet-in-h
+              (lambda* (#:key inputs #:allow-other-keys)
+                (let ((glibc (assoc-ref inputs "libc")))
+                  (substitute* (find-files "Lib/plat-generic" ".*")
+                    (("/usr/include/netinet/in.h")
+                     (string-append glibc "/include/netinet/in.h")))
+                  #t)))
+            (delete 'move-tk-inter)))))
+    ;; Remove the inputs which are not found during building/testing:
+    (inputs
+     `(,@(fold alist-delete (package-inputs python-2)
+               '("bzip2" "gdbm" "tk" "openssl" "zlib"))))
+    (native-search-paths
+      (list (search-path-specification
+              (variable "PYTHONPATH")
+              (files '("lib/python2.4/site-packages")))))
+    (properties '((cpe-name . "python")))))
+
+
 (define-public python-pyvcf
   (package
    (name "python-pyvcf")
-- 
cgit v1.2.3


From 140b63977db7e2b97595f90ab2b26b865794d85f Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Sun, 23 Jun 2019 01:22:53 -0500
Subject: python-version: Remove redundant build-system declaration.

---
 gn/packages/python.scm | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gn/packages/python.scm')

diff --git a/gn/packages/python.scm b/gn/packages/python.scm
index c01c9e2..965cf53 100644
--- a/gn/packages/python.scm
+++ b/gn/packages/python.scm
@@ -780,7 +780,6 @@ the older versions.")
         (base32
           "1rc8kf72v180qlygkh1y0jwv2fxqpx7n97bqfhbwgnn31iwai9g3"))))
   (build-system python-build-system)
-  (build-system python-build-system)
   (propagated-inputs
     `(
     ("python-more-itertools" ,python-more-itertools)
-- 
cgit v1.2.3


From 936cbf0156a27cd60adfd3143d257d6745f531c6 Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Thu, 27 Jun 2019 02:12:48 -0500
Subject: gn: move python2.4 to its own module

---
 gn/packages/python.scm   | 45 ------------------------------------------
 gn/packages/python24.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 45 deletions(-)
 create mode 100644 gn/packages/python24.scm

(limited to 'gn/packages/python.scm')

diff --git a/gn/packages/python.scm b/gn/packages/python.scm
index 965cf53..dcd6026 100644
--- a/gn/packages/python.scm
+++ b/gn/packages/python.scm
@@ -47,51 +47,6 @@
   #:use-module (guix build-system trivial)
   #:use-module (srfi srfi-1))
 
-;; TODO: Check against 'guix lint -c cve python2.4' list:
-;; CVE-2019-9740, CVE-2019-9947, CVE-2019-9948, CVE-2018-1060, CVE-2018-1061,
-;; CVE-2014-9365, CVE-2012-0845, CVE-2012-1150, CVE-2011-1521, CVE-2011-4940,
-;; CVE-2010-3492, CVE-2008-5031, CVE-2008-5983
-(define-public python-2.4
-  (package
-    (inherit python-2)
-    (name "python2.4")
-    (version "2.4.6")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "https://www.python.org/ftp/python/"
-                          version "/Python-" version ".tar.bz2"))
-      (sha256
-       (base32
-        "021y88a4ki07dgq19yhg6zfvmncfiz7h5b2255438i9zmlwl246s"))))
-    (outputs '("out"))
-    (arguments
-      (substitute-keyword-arguments (package-arguments python-2)
-        ((#:phases phases)
-         `(modify-phases ,phases
-            (add-before 'check 'delete-failing-test
-              (lambda _
-                (delete-file "Lib/test/test_socket.py")
-                #t))
-            (add-after 'check 'find-netinet-in-h
-              (lambda* (#:key inputs #:allow-other-keys)
-                (let ((glibc (assoc-ref inputs "libc")))
-                  (substitute* (find-files "Lib/plat-generic" ".*")
-                    (("/usr/include/netinet/in.h")
-                     (string-append glibc "/include/netinet/in.h")))
-                  #t)))
-            (delete 'move-tk-inter)))))
-    ;; Remove the inputs which are not found during building/testing:
-    (inputs
-     `(,@(fold alist-delete (package-inputs python-2)
-               '("bzip2" "gdbm" "tk" "openssl" "zlib"))))
-    (native-search-paths
-      (list (search-path-specification
-              (variable "PYTHONPATH")
-              (files '("lib/python2.4/site-packages")))))
-    (properties '((cpe-name . "python")))))
-
-
 (define-public python-pyvcf
   (package
    (name "python-pyvcf")
diff --git a/gn/packages/python24.scm b/gn/packages/python24.scm
new file mode 100644
index 0000000..720694d
--- /dev/null
+++ b/gn/packages/python24.scm
@@ -0,0 +1,51 @@
+(define-module (gn packages python24)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix utils)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (gnu packages python)
+  #:use-module (srfi srfi-1))
+
+;; TODO: Check against 'guix lint -c cve python2.4' list:
+;; CVE-2019-9740, CVE-2019-9947, CVE-2019-9948, CVE-2018-1060, CVE-2018-1061,
+;; CVE-2014-9365, CVE-2012-0845, CVE-2012-1150, CVE-2011-1521, CVE-2011-4940,
+;; CVE-2010-3492, CVE-2008-5031, CVE-2008-5983
+(define-public python-2.4
+  (package
+    (inherit python-2)
+    (name "python2.4")
+    (version "2.4.6")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "https://www.python.org/ftp/python/"
+                          version "/Python-" version ".tar.bz2"))
+      (sha256
+       (base32
+        "021y88a4ki07dgq19yhg6zfvmncfiz7h5b2255438i9zmlwl246s"))))
+    (outputs '("out"))
+    (arguments
+      (substitute-keyword-arguments (package-arguments python-2)
+        ((#:phases phases)
+         `(modify-phases ,phases
+            (add-before 'check 'delete-failing-test
+              (lambda _
+                (delete-file "Lib/test/test_socket.py")
+                #t))
+            (add-after 'check 'find-netinet-in-h
+              (lambda* (#:key inputs #:allow-other-keys)
+                (let ((glibc (assoc-ref inputs "libc")))
+                  (substitute* (find-files "Lib/plat-generic" ".*")
+                    (("/usr/include/netinet/in.h")
+                     (string-append glibc "/include/netinet/in.h")))
+                  #t)))
+            (delete 'move-tk-inter)))))
+    ;; Remove the inputs which are not found during building/testing:
+    (inputs
+     `(,@(fold alist-delete (package-inputs python-2)
+               '("bzip2" "gdbm" "tk" "openssl" "zlib"))))
+    (native-search-paths
+      (list (search-path-specification
+              (variable "PYTHONPATH")
+              (files '("lib/python2.4/site-packages")))))
+    (properties '((cpe-name . "python")))))
-- 
cgit v1.2.3


From 594ac793787759a4503ad2456102c96f5a4533a0 Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Tue, 2 Jul 2019 06:50:13 -0500
Subject: gn: Add python-plotly-3.2.1.

Add dependant library python-retrying.
---
 gn/packages/python.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

(limited to 'gn/packages/python.scm')

diff --git a/gn/packages/python.scm b/gn/packages/python.scm
index dcd6026..5cf73a1 100644
--- a/gn/packages/python.scm
+++ b/gn/packages/python.scm
@@ -134,6 +134,53 @@ functions.")
   (license license:expat))
 )
 
+(define-public python-plotly-3.2.1
+  (package
+    (inherit python-plotly)
+    (name "python-plotly")
+    (version "3.2.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "plotly" version))
+        (sha256
+         (base32
+          "1ay1plgsckfi7fddl99kvbcx5nifh48ahvszkqvb4d7r008m8sxk"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-decorator" ,python-decorator)
+       ("python-nbformat" ,python-nbformat)
+       ("python-pytz" ,python-pytz)
+       ("python-requests" ,python-requests)
+       ("python-retrying" ,python-retrying)
+       ("python-six" ,python-six)))))
+
+(define-public python-retrying
+  (package
+    (name "python-retrying")
+    (version "1.3.3")
+    (source
+      (origin
+        ;; pypi release doesn't have test library
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/rholder/retrying")
+               (commit (string-append "v" version))))
+        (file-name (git-file-name name version))
+        (sha256
+         (base32
+          "1kqipkbdaw5s1xg0gi29awm03vp1x8dz24pjidgxagvkvrjpzhi7"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-six" ,python-six)))
+    (home-page "https://github.com/rholder/retrying")
+    (synopsis "General-purpose retrying library")
+    (description "Retrying is a general-purpose retrying library, written in
+Python, to simplify the task of adding retry behavior to just about anything.
+The simplest use case is retrying a flaky function whenever an Exception occurs
+until a value is returned.")
+    (license license:asl2.0)))
+
 (define-public python-bagit; guix candidate
 (package
   (name "python-bagit")
-- 
cgit v1.2.3


From 9a391451d7bf03125e2b9a607f108a51bc9f0ef3 Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Sun, 14 Jul 2019 02:16:11 -0500
Subject: python2-pil1: Update to 1.1.7.

* gn/packages/python.scm (python2-pil1): Update to 1.1.7.
[source]: Use upstream source. Update source snippet.
[inputs]: Add lcms, tcl. Remove python2-setuptools.
[arguments]: Build without setuptools. Update custom 'link-libraries
phase.
[description]: Update.
---
 gn/packages/python.scm | 86 ++++++++++++++++++++++++++++----------------------
 1 file changed, 48 insertions(+), 38 deletions(-)

(limited to 'gn/packages/python.scm')

diff --git a/gn/packages/python.scm b/gn/packages/python.scm
index 5cf73a1..0eda295 100644
--- a/gn/packages/python.scm
+++ b/gn/packages/python.scm
@@ -30,6 +30,7 @@
   #:use-module (gnu packages rdf)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages statistics)
+  #:use-module (gnu packages tcl)
   #:use-module (gnu packages tex)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages time)
@@ -580,59 +581,68 @@ project)")
 (define-public python2-pil1 ; guix obsolete
   (package
     (name "python2-pil1")
-    (version "1.1.6")
+    (version "1.1.7")
     (source (origin
              (method url-fetch)
-             (uri (string-append
-                   "http://files.genenetwork.org/software/contrib/Imaging-"
-                   version "-gn.tar.gz"))
+             (uri (string-append "http://effbot.org/downloads/Imaging-"
+                                 version ".tar.gz"))
              (sha256
               (base32
-               "0jhinbcq2k899c76m1jc5a3z39k6ajghiavpzi6991hbg6xhxdzg"))
+               "04aj80jhfbmxqzvmq40zfi4z3cw6vi01m3wkk6diz3lc971cfnw9"))
     (modules '((guix build utils)))
     (snippet
-     ;; Adapt to newer freetype. As the package is unmaintained upstream,
-     ;; there is no use in creating a patch and reporting it.
-     '(substitute* "_imagingft.c"
-                   (("freetype/")
-                    "freetype2/freetype/")))))
+     ;; Adapt to newer freetype and lcms.  As the package is unmaintained
+     ;; upstream, there is no use in creating a patch and reporting it.
+     '(begin (substitute* "_imagingft.c"
+               (("freetype/")
+                "freetype2/freetype/"))
+             (substitute* '("setup.py"
+                            "_imagingcms.c")
+               (("lcms.h") "lcms2.h"))))))
     (build-system python-build-system)
     (inputs
-      `(("freetype" ,freetype)
-        ("libjpeg" ,libjpeg)
-        ("libtiff" ,libtiff)
-        ("python2-setuptools" ,python2-setuptools)
-        ("zlib" ,zlib)))
+     `(("freetype" ,freetype)
+       ("lcms" ,lcms) ; not fully supported
+       ("libjpeg" ,libjpeg)
+       ("libtiff" ,libtiff)
+       ("tcl" ,tcl)
+       ("zlib" ,zlib)))
     (arguments
      ;; Only the fork python-pillow works with Python 3.
      `(#:python ,python-2
        #:tests? #f ; no check target
+       #:use-setuptools? #f
        #:phases
-         (alist-cons-before
-          'build 'configure
-          ;; According to README and setup.py, manual configuration is
-          ;; the preferred way of "searching" for inputs.
-          ;; lcms is not found, TCL_ROOT refers to the unavailable tkinter.
-          (lambda* (#:key inputs #:allow-other-keys)
-            (let ((jpeg (assoc-ref inputs "libjpeg"))
-                  (zlib (assoc-ref inputs "zlib"))
-                  (tiff (assoc-ref inputs "libtiff"))
-                  (freetype (assoc-ref inputs "freetype")))
-              (substitute* "setup.py"
-                (("JPEG_ROOT = None")
-                 (string-append "JPEG_ROOT = libinclude(\"" jpeg "\")"))
-                (("ZLIB_ROOT = None")
-                 (string-append "ZLIB_ROOT = libinclude(\"" zlib "\")"))
-                (("TIFF_ROOT = None")
-                 (string-append "TIFF_ROOT = libinclude(\"" tiff "\")"))
-                (("FREETYPE_ROOT = None")
-                 (string-append "FREETYPE_ROOT = libinclude(\""
-                                freetype "\")")))))
-          %standard-phases)))
+       (modify-phases %standard-phases
+         (add-after 'unpack 'link-libraries
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((freetype (assoc-ref inputs "freetype"))
+                   (jpeg (assoc-ref inputs "libjpeg"))
+                   (lcms (assoc-ref inputs "lcms"))
+                   (tcl (assoc-ref inputs "tcl"))
+                   (tiff (assoc-ref inputs "libtiff"))
+                   (zlib (assoc-ref inputs "zlib")))
+               (substitute* "setup.py"
+                 (("FREETYPE_ROOT .*")
+                  (string-append "FREETYPE_ROOT = libinclude(\"" freetype "\")\n"))
+                 (("JPEG_ROOT .*")
+                  (string-append "JPEG_ROOT = libinclude(\"" jpeg "\")\n"))
+                 (("LCMS_ROOT .*")
+                  (string-append "LCMS_ROOT = libinclude(\"" lcms "\")\n"))
+                 (("^TCL_ROOT .*")
+                  (string-append "TCL_ROOT = libinclude(\"" tcl "\")\n"))
+                 (("TIFF_ROOT .*")
+                  (string-append "TIFF_ROOT = libinclude(\"" tiff "\")\n"))
+                 (("ZLIB_ROOT .*")
+                  (string-append "ZLIB_ROOT = libinclude(\"" zlib "\")\n"))))
+             #t)))))
     (home-page "http://www.pythonware.com/products/pil/")
     (synopsis "Python Imaging Library")
-    (description "The Python Imaging Library (PIL) adds image processing
-capabilities to the Python interpreter.")
+    (description "The @dfn{Python Imaging Library} (PIL) adds image processing
+capabilities to your Python interpreter.  This library supports many file
+formats, and provides powerful image processing and graphics capabilities.
+
+NOTE: This package is superseded by python-pillow")
     (license (license:x11-style
                "file://README"
                "See 'README' in the distribution."))))
-- 
cgit v1.2.3


From 62f4ca3bff753d6353557d4e9d8d54deb6640a4c Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Sun, 14 Jul 2019 02:43:16 -0500
Subject: gn: Add python2-piddle-1.0.15.

* gn/packages/python.scm (python2-piddle-1.0.15): New variable.
* gn/packages/python24.scm (python24-piddle): Inherit from
python2-piddle-1.0.15.
---
 gn/packages/python.scm   | 28 ++++++++++++++++++++++++++++
 gn/packages/python24.scm | 26 ++++----------------------
 2 files changed, 32 insertions(+), 22 deletions(-)

(limited to 'gn/packages/python.scm')

diff --git a/gn/packages/python.scm b/gn/packages/python.scm
index 0eda295..e56844b 100644
--- a/gn/packages/python.scm
+++ b/gn/packages/python.scm
@@ -675,6 +675,34 @@ version ".tgz"))
     (description #f)
     (license #f)))
 
+(define-public python2-piddle-1.0.15
+  (package
+    (name "python2-piddle")
+    (version "1.0.15")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "mirror://sourceforge/piddle/piddle/"
+                            version "/piddle-" version ".zip"))
+        (sha256
+         (base32
+          "0jaxfsrcgqb5cf2wznxnpdws5khlrdixmg85lrhq2zl9cy6dfdya"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:python ,python-2
+       #:use-setuptools? #f
+       #:tests? #f)) ; tests are interactive
+    (native-inputs
+     `(("unzip" ,unzip)))
+    (propagated-inputs
+     `(("python2-pil" ,python2-pil1)))
+    (home-page "http://www.strout.net/info/coding/python/piddle/")
+    (synopsis "Plug-In Drawing, Does Little Else")
+    (description "PIDDLE is designed for vector graphics -- i.e., drawing of
+primitives such as lines and ellipses, rather than manipulation of individual
+pixels.")
+    (license license:gpl2+)))
+
 (define-public python2-parallel ; guix fix number of things
   (package
     (name "python2-parallel")
diff --git a/gn/packages/python24.scm b/gn/packages/python24.scm
index 1751c0b..cc5e61c 100644
--- a/gn/packages/python24.scm
+++ b/gn/packages/python24.scm
@@ -212,31 +212,13 @@ spreadsheets without the need for COM objects.")
 
 (define-public python24-piddle
   (package
+    (inherit python2-piddle-1.0.15)
     (name "python24-piddle")
-    (version "1.0.15")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append "mirror://sourceforge/piddle/piddle/"
-                            version "/piddle-" version ".zip"))
-        (sha256
-         (base32
-          "0jaxfsrcgqb5cf2wznxnpdws5khlrdixmg85lrhq2zl9cy6dfdya"))))
-    (build-system python-build-system)
     (arguments
-     `(#:python ,python-2.4
-       #:use-setuptools? #f
-       #:tests? #f)) ; tests are interactive
-    (native-inputs
-     `(("unzip" ,unzip)))
+     (substitute-keyword-arguments (package-arguments python2-piddle-1.0.15)
+       ((#:python _) python-2.4)))
     (propagated-inputs
-     `(("python24-pil" ,python24-pil)))
-    (home-page "http://www.strout.net/info/coding/python/piddle/")
-    (synopsis "Plug-In Drawing, Does Little Else")
-    (description "PIDDLE is designed for vector graphics -- i.e., drawing of
-primitives such as lines and ellipses, rather than manipulation of individual
-pixels.")
-    (license license:gpl2+)))
+     `(("python24-pil" ,python24-pil)))))
 
 ;; Apparently this is the library which mimics python-2.6+'s json library
 (define-public python24-simplejson
-- 
cgit v1.2.3


From e8ebee8e148d1a338cd352137dd3463d1264d8bd Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Sun, 14 Jul 2019 02:49:27 -0500
Subject: gn: Add python2 versions of GN1 thirdparty packages.

---
 gn/packages/python.scm | 135 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 135 insertions(+)

(limited to 'gn/packages/python.scm')

diff --git a/gn/packages/python.scm b/gn/packages/python.scm
index e56844b..5895015 100644
--- a/gn/packages/python.scm
+++ b/gn/packages/python.scm
@@ -873,3 +873,138 @@ the older versions.")
     "arcp (Archive and Package) URI parser and generator")
   (license license:asl2.0))
 )
+
+(define-public python2-pp
+  (package
+    (name "python2-pp")
+    (version "1.6.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+             "http://www.parallelpython.com/downloads/pp/pp-" version ".zip"))
+        (sha256
+         (base32
+          "0qkxcyclz3vgwpl6xvsrg76q59dj0wwy8qx15567bafv659ypyb1"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:python ,python-2
+       #:use-setuptools? #f
+       #:tests? #f)) ; no tests
+    (native-inputs
+     `(("unzip" ,unzip)))
+    (home-page "http://www.parallelpython.com")
+    (synopsis "Parallel and distributed programming for Python")
+    (description "PP is a python module which provides mechanism for parallel
+execution of python code on SMP (systems with multiple processors or cores) and
+clusters (computers connected via network).")
+    (license license:bsd-3)))
+
+(define GN1-thirdparty-sources
+  (origin
+    (method url-fetch/tarbomb)
+    ;; ipfs get QmTPwYT2pehdxdG1TiHEzVzLgbeuhJ4utXShuz3twA84AB
+    (uri "file:///gnu/store/p33a2sh3x2nhiiphdw9nly80njg6p8fi-thirdparty.tgz")
+    (file-name "GN1-thirdparty")
+    (sha256
+     (base32
+      "0nnp6g412hjfrcn3k2yrfb14sxv06k0149whc7qmv678nyj5zhfa"))))
+
+(define-public python2-json-GN1
+  (package
+    (name "python2-json-GN1")
+    (version "GN1")
+    (source GN1-thirdparty-sources)
+    (build-system python-build-system)
+    (arguments
+     `(#:python ,python-2
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'build)
+         (delete 'check)
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out     (assoc-ref outputs "out"))
+                    (sitedir (string-append out "/lib/python2.7/site-packages/json/")))
+               (mkdir-p sitedir)
+               (copy-recursively "thirdparty/json" sitedir)
+               #t))))))
+    (home-page "")
+    (synopsis "")
+    (description "")
+    (license license:lgpl2.1+)))
+
+(define-public python2-pyx-GN1
+  (package
+    (name "python2-pyx-GN1")
+    (version "0.8")
+    (source GN1-thirdparty-sources)
+    (build-system python-build-system)
+    (arguments
+     `(#:python ,python-2
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'build)
+         (delete 'check)
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out     (assoc-ref outputs "out"))
+                    (sitedir (string-append out "/lib/python2.7/site-packages/pyx/")))
+               (mkdir-p sitedir)
+               (copy-recursively "thirdparty/pyx" sitedir)
+               #t))))))
+    (home-page "")
+    (synopsis "")
+    (description "")
+    (license license:gpl2+)))
+
+(define-public python2-pyxlwriter
+  (package
+    (name "python2-pyxlwriter")
+    (version "0.4a3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "mirror://sourceforge/pyxlwriter/pyxlwriter/"
+                            version "/pyXLWriter-" version ".zip"))
+        (sha256
+         (base32
+          "1kfsi6la9y53rwayszgayfmkjfknpp650v69a0hwd1fcfk1df735"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:python ,python-2
+       #:use-setuptools? #f
+       #:tests? #f)) ; no tests
+    (native-inputs
+     `(("unzip" ,unzip)))
+    (home-page "https://sourceforge.net/projects/pyxlwriter/")
+    (synopsis "Python library for generating Excel compatible spreadsheets")
+    (description "PyXLWriter is a Python library for generating Excel compatible
+spreadsheets.  It's a port of John McNamara's Perl @code{Spreadsheet::WriteExcel}
+module version 1.01 to Python.  It allows writing of Excel compatible
+spreadsheets without the need for COM objects.")
+    (license license:lgpl2.1+)))
+
+(define-public python2-svg-GN1
+  (package
+    (name "python2-svg-GN1")
+    (version "1.0")
+    (source GN1-thirdparty-sources)
+    (build-system python-build-system)
+    (arguments
+     `(#:python ,python-2
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'build)
+         (delete 'check)
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out     (assoc-ref outputs "out"))
+                    (sitedir (string-append out "/lib/python2.7/site-packages/svg/")))
+               (mkdir-p sitedir)
+               (copy-recursively "thirdparty/svg" sitedir)
+               #t))))))
+    (home-page "")
+    (synopsis "")
+    (description "")
+    (license license:bsd-4)))
-- 
cgit v1.2.3


From d6dde66d5f61aca059d993aa8438567fa78e87a3 Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Mon, 29 Jul 2019 11:11:30 -0500
Subject: gn: python-bagit: Clean up package definition.

* gn/packages/python.scm (python-bagit)[source]: Use pypi uri.
[synopsis, description]: Update.
---
 gn/packages/python.scm | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

(limited to 'gn/packages/python.scm')

diff --git a/gn/packages/python.scm b/gn/packages/python.scm
index 5895015..f2d1319 100644
--- a/gn/packages/python.scm
+++ b/gn/packages/python.scm
@@ -183,30 +183,27 @@ until a value is returned.")
     (license license:asl2.0)))
 
 (define-public python-bagit; guix candidate
-(package
-  (name "python-bagit")
-  (version "1.7.0")
-  (source
-    (origin
-      (method url-fetch)
-      (uri "https://files.pythonhosted.org/packages/ee/11/7a7fa81c0d43fb4d449d418eba57fc6c77959754c5c2259a215152810555/bagit-1.7.0.tar.gz")
-      (sha256
-        (base32
+  (package
+    (name "python-bagit")
+    (version "1.7.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "bagit" version))
+        (sha256
+         (base32
           "1m6y04qmig0b5hzb35lnaw3d2yfydb7alyr1579yblvgs3da6j7j"))))
-  (build-system python-build-system)
-  (inputs
+    (build-system python-build-system)
+    (inputs
      `(("python-setuptools-scm" ,python-setuptools-scm)
-      ("python-coverage" ,python-coverage)
-      ("python-mock" ,python-mock)
-      ))
-  (arguments `(#:tests? #f)) ;; No tests.
-  (home-page "https://pypi.python.org/pypi/bagit")
-  (synopsis
-    "Python bagit.")
-  (description
-    "Python bagit.")
-  (license license:gpl2))
-)
+       ("python-coverage" ,python-coverage)
+       ("python-mock" ,python-mock)))
+    (arguments `(#:tests? #f)) ;; No tests.
+    (home-page "https://pypi.python.org/pypi/bagit")
+    (synopsis "Create and validate BagIt packages")
+    (description
+      "Create and validate BagIt packages")
+    (license license:gpl2)))
 
 (define-public python-prov ; guix candidate
 (package
-- 
cgit v1.2.3


From 3c031ce591af76d00b1c670f0c131e1c8ffa3d4c Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Mon, 29 Jul 2019 11:14:35 -0500
Subject: gn: python-typing-extensions: Clean up package definition.

* gn/packages/python.scm (python-typing-extensions): Re-indent.
[source]: Use pypi uri.
---
 gn/packages/python.scm | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'gn/packages/python.scm')

diff --git a/gn/packages/python.scm b/gn/packages/python.scm
index f2d1319..cd9146a 100644
--- a/gn/packages/python.scm
+++ b/gn/packages/python.scm
@@ -233,23 +233,22 @@ until a value is returned.")
   (license license:expat)))
 
 (define-public python-typing-extensions; guix candidate
-(package
-  (name "python-typing-extensions")
-  (version "3.6.6")
-  (source
-    (origin
-      (method url-fetch)
-      (uri "https://files.pythonhosted.org/packages/fc/e6/3d2f306b12f01bde2861d67458d32c673e206d6fcc255537bf452db8f80c/typing_extensions-3.6.6.tar.gz")
-      (sha256
-        (base32
+  (package
+    (name "python-typing-extensions")
+    (version "3.6.6")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "typing_extensions" version))
+        (sha256
+         (base32
           "07vhddjnd3mhdijyc3s0mwi9jgfjp3rr056nxqiavydbvkrvgrsi"))))
-  (build-system python-build-system)
-  (home-page "https://pypi.python.org/pypi/typing_extensions")
-  (synopsis
-    "Python typing_extensions.")
-  (description
-    "Python typing_extensions.")
-  (license license:gpl2))
+    (build-system python-build-system)
+    (home-page "https://pypi.python.org/pypi/typing_extensions")
+    (synopsis "Python typing_extensions.")
+    (description
+     "Python typing_extensions.")
+    (license license:gpl2))
 )
 
 (define-public python-subprocess32 ; guix candidate
-- 
cgit v1.2.3


From 18c78b202937a3239cdccdc8c612f7df5e98bb6a Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Mon, 29 Jul 2019 11:18:38 -0500
Subject: gn: python-subprocess32: Correctly mark as version 3.5.3.

* gn/packages/python.scm (python-subprocess32): Re-indent.
[version]: Correct to 3.5.3, which is what the source was downloading.
[source]: Use pypi uri.
---
 gn/packages/python.scm | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'gn/packages/python.scm')

diff --git a/gn/packages/python.scm b/gn/packages/python.scm
index cd9146a..0e9a229 100644
--- a/gn/packages/python.scm
+++ b/gn/packages/python.scm
@@ -252,24 +252,24 @@ until a value is returned.")
 )
 
 (define-public python-subprocess32 ; guix candidate
-(package
-  (name "python-subprocess32")
-  (version "0.2.9")
-  (source
-    (origin
-      (method url-fetch)
-      (uri "https://files.pythonhosted.org/packages/be/2b/beeba583e9877e64db10b52a96915afc0feabf7144dcbf2a0d0ea68bf73d/subprocess32-3.5.3.tar.gz")
-      (sha256
-        (base32
+  (package
+    (name "python-subprocess32")
+    (version "3.5.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "subprocess32" version))
+        (sha256
+         (base32
           "1hr5fan8i719hmlmz73hf8rhq74014w07d8ryg7krvvf6692kj3b"))))
-  (build-system python-build-system)
-  (arguments `(#:tests? #f)) ;; No tests.
-  (home-page "https://pypi.python.org/pypi/subprocess32")
-  (synopsis
-    "Python subprocess32.")
-  (description
-    "Python subprocess32.")
-  (license license:gpl2))
+    (build-system python-build-system)
+    (arguments `(#:tests? #f)) ;; No tests.
+    (home-page "https://pypi.python.org/pypi/subprocess32")
+    (synopsis
+      "Python subprocess32.")
+    (description
+      "Python subprocess32.")
+    (license license:gpl2))
 )
 
 (define-public python-inotify ; guix candidate
-- 
cgit v1.2.3


From 86420abcd9fe59770c2667e84fd4f2de614c1efd Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Mon, 29 Jul 2019 11:26:53 -0500
Subject: gn: python-shellescape: Clean up package definition.

* gn/packages/python.scm (python-shellescape): Re-indent.
[source]: Use pypi uri.
[inputs]: Move python-setuptools ...
[native-inputs]: ... to here.
[license]: Use 'license' prefix.
---
 gn/packages/python.scm | 41 ++++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

(limited to 'gn/packages/python.scm')

diff --git a/gn/packages/python.scm b/gn/packages/python.scm
index 0e9a229..ee32a61 100644
--- a/gn/packages/python.scm
+++ b/gn/packages/python.scm
@@ -491,30 +491,25 @@ Python 3 support.")
   (package-with-python2 python-avro))
 
 (define-public python-shellescape ; guix ready
-(package
-  (name "python-shellescape")
-  (version "3.4.1")
-  (source
-    (origin
-      (method url-fetch)
-      (uri (string-append
-             "https://pypi.python.org/packages/source/s/shellescape/shellescape-"
-             version
-             ".tar.gz"))
-      (sha256
-        (base32
+  (package
+    (name "python-shellescape")
+    (version "3.4.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "shellescape" version))
+        (sha256
+         (base32
           "0n5ky1b2vw2y0d4xl3qybyp2rk0gq5frjs8nr8ak6mgj2fyb4676"))))
-  (build-system python-build-system)
-  (inputs
-    `(("python-setuptools" ,python-setuptools)))
-  (home-page
-    "https://github.com/chrissimpkins/shellescape")
-  (synopsis
-    "Shell escape a string to safely use it as a token in a shell command (backport of Python shlex.quote for Python versions 2.x & < 3.3)")
-  (description
-    "Shell escape a string to safely use it as a token in a shell command (backport of Python shlex.quote for Python versions 2.x & < 3.3)")
-  (license expat))
-)
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page "https://github.com/chrissimpkins/shellescape")
+    (synopsis
+      "Shell escape a string to safely use it as a token in a shell command (backport of Python shlex.quote for Python versions 2.x & < 3.3)")
+    (description
+      "Shell escape a string to safely use it as a token in a shell command (backport of Python shlex.quote for Python versions 2.x & < 3.3)")
+    (license license:expat)))
 
 (define-public python2-shellescape
   (package-with-python2 python-shellescape))
-- 
cgit v1.2.3