python-xyz: Fix and upgrade python-pipenv; add missing deps

rekahsoft-gnu/packages/python-xyz.scm

@@ -24,10 +24,12 @@
   #:use-module (gnu packages glib)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages serialization)
+  #:use-module (gnu packages sphinx)
   #:use-module (gnu packages xml)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -86,27 +88,6 @@
     (description "Packrat parser interpreter")
     (license license:expat)))
 
-;; TODO: Candidate for upstream
-(define-public python-ordereddict
-  (package
-    (name "python-ordereddict")
-    (version "1.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "ordereddict" version))
-        (sha256
-          (base32
-            "07qvy11nvgxpzarrni3wrww3vpc9yafgi2bch4j2vvvc42nb8d8w"))))
-    (build-system python-build-system)
-    (home-page "https://pypi.org/project/ordereddict")
-    (synopsis
-      "Drop-in substitute for Py2.7's new collections.OrderedDict for Python 2.4-2.6")
-    (description
-      "A drop-in substitute for Py2.7's new collections.OrderedDict
-that works in Python 2.4-2.6.")
-    (license license:expat)))
-
 ;; TODO: Candidate for upstream
 (define-public python-parver
   (package
@@ -134,39 +115,84 @@ that works in Python 2.4-2.6.")
      "Parse and manipulate version numbers.")
     (license license:expat)))
 
+(define-public python-bs4
+  (package
+    (name "python-bs4")
+    (version "0.0.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "bs4" version))
+        (sha256
+          (base32 "0fnxhql23ql6q5n64xjknx3sc3fm4vgpbw0z99p0qp6cswgymv1n"))))
+    (build-system python-build-system)
+    (propagated-inputs (list python-beautifulsoup4))
+    (home-page "https://pypi.python.org/pypi/beautifulsoup4")
+    (synopsis "Dummy package for Beautiful Soup")
+    (description "Dummy package for Beautiful Soup")
+    (license #f)))
+
+(define-public python-towncrier
+  (package
+    (name "python-towncrier")
+    (version "21.3.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "towncrier" version))
+        (sha256
+          (base32 "1znxavwsiy6czirjn0qi1p5yarnm7gg692nb0309hb6p4k4hpvbf"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      (list python-click
+            python-click-default-group
+            python-incremental
+            python-jinja2
+            python-toml))
+    (native-inputs (list python-packaging))
+    (home-page "https://github.com/hawkowl/towncrier")
+    (synopsis "Building newsfiles for your project.")
+    (description "Building newsfiles for your project.")
+    (license license:expat)))
+
 ;; TODO: Candidate for upstream
 (define-public python-pipenv
   (package
     (name "python-pipenv")
-    (version "2018.11.26")
+    (version "2022.1.8")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pipenv" version))
        (sha256
-        (base32
-         "0ip8zsrwmhrankrix0shig9g8q2knmr7b63sh7lqa8a5x03fcwx6"))))
+        (base32 "1l4zabd1q5aggjhp4v906l8z8g6q37bcgyxqq8man8lv4ccp2kgq"))))
     (build-system python-build-system)
-    (native-inputs
-     `(("python-pytest" ,python-pytest)
-       ("python-arpeggio" ,python-arpeggio)))
     (propagated-inputs
-     `(("python-certifi" ,python-certifi)
-       ("python-invoke" ,python-invoke)
-       ("python-parver" ,python-parver)
-       ("python-ordereddict" ,python-ordereddict)
-       ("python-requests" ,python-requests)
-       ("python-virtualenv" ,python-virtualenv)
-       ("python-virtualenv-clone" ,python-virtualenv-clone)))
+     (list python-certifi
+           python-pip
+           python-setuptools
+           python-virtualenv
+           python-virtualenv-clone))
+    (native-inputs
+     (list python-black
+           python-bs4
+           python-flake8
+           python-flaky
+           python-invoke
+           python-mock
+           python-parver
+           python-pytest
+           python-pytest-timeout
+           python-pytest-xdist
+           python-sphinx
+           python-towncrier
+           python-twine))
     (arguments
-     ;; FIXME: Tests currently fail due to an issue with python-typing and the
-     ;; built in typing in pythong 3.7
+     ;; FIXME: Tests fail with: "TypeError: don't know how to make test from: 2022.1.8"
      '(#:tests? #f))
     (home-page "https://github.com/pypa/pipenv")
-    (synopsis
-     "Python Development Workflow for Humans")
-    (description
-     "Python Development Workflow for Humans.")
+    (synopsis "Python Development Workflow for Humans.")
+    (description "Python Development Workflow for Humans.")
     (license license:expat)))
 
 ;; TODO: Candidate for upstream; upstream has version 4.0.2;