Subject: [PATCH 04/12] gnu: python-sqlalchemy: Update to 1.4.21.

From: Pierre Langlois <[email-masked]>
Date: Wed, 21 Jul 2021 14:50:18 +0100

* gnu/packages/databases.scm (python-sqlalchemy): Update to 1.4.21.
[propagated-inputs]: Add python-greenlet.
(python-sqlalchemy-1.3): New variable.
(python-sadisplay)[propagated-inputs]: Use python-sqlalchemy-1.3.
---
 gnu/packages/databases.scm | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index d8a70cb873..c0d94e56ab 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -2942,18 +2942,20 @@ Database API 2.0T.")
 (define-public python-sqlalchemy
   (package
     (name "python-sqlalchemy")
-    (version "1.3.20")
+    (version "1.4.21")
     (source
      (origin
       (method url-fetch)
       (uri (pypi-uri "SQLAlchemy" version))
       (sha256
-       (base32 "18b9am7bsqc4nj3d2h5r93i002apczxfvpfpcqbd6f0385zmrwnj"))))
+       (base32 "1iwggnq2n7wd6vqqvym1fjnzrgs648saba1cs6nvw4pn9m7hbs87"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-cython" ,python-cython) ; for C extensions
        ("python-pytest" ,python-pytest)
        ("python-mock"   ,python-mock))) ; for tests
+    (propagated-inputs
+     `(("python-greenlet" ,python-greenlet)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -2969,6 +2971,17 @@ designed for efficient and high-performing database access, adapted into a
 simple and Pythonic domain language.")
     (license license:x11)))

+;; Required by python-sadisplay.
+(define-public python-sqlalchemy-1.3
+  (package (inherit python-sqlalchemy)
+    (version "1.3.24")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (pypi-uri "SQLAlchemy" version))
+      (sha256
+       (base32 "06bmxzssc66cblk1hamskyv5q3xf1nh1py3vi6dka4lkpxy7gfzb"))))))
+
 (define-public python2-sqlalchemy
   (package-with-python2 python-sqlalchemy))

@@ -3305,6 +3318,9 @@ designed to be easy and intuitive to use.")
 (define-public python2-psycopg2
   (package-with-python2 python-psycopg2))

+;; FIXME: This package appears to be unmaintained upstream and relies on an
+;; older version of sqlalchemy, so may not actually be useful anymore,
+;; consider removing it.
 (define-public python-sadisplay
   (package
     (name "python-sadisplay")
@@ -3318,7 +3334,7 @@ designed to be easy and intuitive to use.")
           "01d9lxhmgpb68gy8rd6zj6fcwp84n2qq210n1qsk3qbsir79bzh4"))))
     (build-system python-build-system)
     (propagated-inputs
-      `(("python-sqlalchemy" ,python-sqlalchemy)))
+      `(("python-sqlalchemy" ,python-sqlalchemy-1.3)))
     (native-inputs
      ;; For tests.
       `(("python-nose" ,python-nose)))
--
2.32.0