From 02dafea1083877360b7fce93e5f43bcfe9845467 Mon Sep 17 00:00:00 2001
From: Efraim Flashner
Date: Sun, 9 Aug 2020 15:47:40 +0300
Subject: Remove upstreamed python packages.

upstreamed python-certipy, python-pamela, python-cfgraph.
python-retrying already upstream
---
 gn/packages/jupyterhub.scm | 68 ++--------------------------------------------
 gn/packages/python.scm     | 46 -------------------------------
 2 files changed, 2 insertions(+), 112 deletions(-)

(limited to 'gn/packages')

diff --git a/gn/packages/jupyterhub.scm b/gn/packages/jupyterhub.scm
index f3afa65..bf7c489 100644
--- a/gn/packages/jupyterhub.scm
+++ b/gn/packages/jupyterhub.scm
@@ -266,72 +266,8 @@ balancing and can configure itself automatically and dynamically.")
      "Simple, generic API for escaping strings.")
     (license license:expat)))
 
-(define-public python-certipy
-  (package
-    (name "python-certipy")
-    (version "0.1.3")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "certipy" version))
-        (sha256
-         (base32
-          "0n980gqpzh0fm58h3i4mi2i10wgj606lscm1r5sk60vbf6vh8mv9"))))
-    (build-system python-build-system)
-    (propagated-inputs
-     `(("python-pyopenssl" ,python-pyopenssl)))
-    (native-inputs
-     `(("python-pytest" ,python-pytest)))
-    (home-page "https://github.com/LLNL/certipy")
-    (synopsis "Utility to create and sign CAs and certificates")
-    (description
-     "Utility to create and sign CAs and certificates")
-    (license license:bsd-3)))
-
-(define-public python-pamela
-  (package
-    (name "python-pamela")
-    (version "1.0.0")
-    (source
-      (origin
-        ;; Tests not distributed in pypi release.
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/minrk/pamela.git")
-               (commit version)))
-        (file-name (git-file-name name version))
-        (sha256
-         (base32
-          "0cg3w6np1fbjpvzhv54xg567hpf38szwp2d4gvzb9r736nxbv0vr"))))
-    (build-system python-build-system)
-    (arguments
-     '(#:tests? #f ; Tests aren't designed to be run inside a container.
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'hardcode-pam.so
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((pam (assoc-ref inputs "linux-pam")))
-               (substitute* "pamela.py"
-               ;  (("\"pam\"") (string-append "\"" pam "/lib/libpam.so\"")))
-                 (("find_library\\(\"pam\")") (string-append "'" pam "/lib/libpam.so'")))
-               ;  (("LIBPAM =.*") (string-append "LIBPAM = \"" pam "/lib\"\n")))
-               #t)))
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (if tests?
-               (if (file-exists? "test_pamela.py")
-                 (invoke "py.test" "--assert=plain" "test_pamela.py")
-                 (invoke "python" "-m" "pamela" "-a" "`whoami`"))
-               #t))))))
-    (inputs
-     `(("linux-pam" ,linux-pam)))
-    (native-inputs
-     `(("python-pytest" ,python-pytest)))
-    (home-page "https://github.com/minrk/pamela")
-    (synopsis "PAM interface using ctypes")
-    (description "PAM interface using ctypes")
-    (license license:expat)))
-
+;; This package is deprecated upstream.
+;; Author suggests using python-toml
 (define-public python-pytoml
   (package
     (name "python-pytoml")
diff --git a/gn/packages/python.scm b/gn/packages/python.scm
index ca058c5..91899f4 100644
--- a/gn/packages/python.scm
+++ b/gn/packages/python.scm
@@ -155,32 +155,6 @@ functions.")
 (define-public python2-plotly-3.2.1
   (package-with-python2 python-plotly-3.2.1))
 
-(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")
@@ -1172,26 +1146,6 @@ generation, and transformation to RDF.  Salad provides a bridge between document
 and record oriented data modeling and the Semantic Web.")
     (license license:asl2.0)))
 
-(define-public python-cfgraph
-  (package
-    (name "python-cfgraph")
-    (version "0.2.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "CFGraph" version))
-        (sha256
-         (base32
-          "0x7yz0lvqb6mkhl5fbml27sppmscgpf8v2ism9jzzf0h982ffzxm"))))
-    (build-system python-build-system)
-    (propagated-inputs
-     `(("python-rdflib" ,python-rdflib)))
-    (home-page "https://github.com/hsolbrig/CFGraph")
-    (synopsis "Rdflib collections flattening graph")
-    (description
-     "Rdflib collections flattening graph.")
-    (license license:asl2.0)))
-
 (define-public python-pyshex
   (package
     (name "python-pyshex")
-- 
cgit v1.2.3