guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

28/45: gnu: python-flask-combo-jsonapi: Fix build.


From: guix-commits
Subject: 28/45: gnu: python-flask-combo-jsonapi: Fix build.
Date: Wed, 12 Jan 2022 17:58:42 -0500 (EST)

mbakke pushed a commit to branch master
in repository guix.

commit 60bcbfba148c75f1883c2c4f73d8a1793ed81176
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Wed Jan 12 18:51:14 2022 +0100

    gnu: python-flask-combo-jsonapi: Fix build.
    
    * gnu/packages/python-web.scm (python-flask-combo-jsonapi)[arguments]: 
Remove
    version pinning, and override check phase.
    [propagated-inputs]: Change from PYTHON-SQLALCHEMY-1.3 to PYTHON-SQLALCHEMY.
    Change PYTHON-MARSHMALLOW-3.2 to PYTHON-MARSHMALLOW.
---
 gnu/packages/python-web.scm | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 951ab10903..220a93f344 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
 ;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym+a@scratchpost.org>
 ;;; Copyright © 2013, 2014, 2015, 2016, 2020 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2016, 2017, 2019, 2020, 2021 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2016, 2017, 2019-2022 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus 
<rekado@elephly.net>
 ;;; Copyright © 2017, 2021 Roel Janssen <roel@gnu.org>
 ;;; Copyright © 2016, 2017, 2020 Julien Lepiller <julien@lepiller.eu>
@@ -6306,12 +6306,24 @@ provides well-defined APIs to talk to websites lacking 
one.")
        (sha256
         (base32 "07fhcjiyif80z1vyh35za29sqx1mmqh568jrbrrs675j4a797sj1"))))
     (build-system python-build-system)
+    (arguments
+     '(#:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'loosen-requirements
+                    (lambda _
+                      ;; Don't pin specific versions of dependencies.
+                      (substitute* "requirements.txt"
+                        (("^sqlalchemy[=<>].*") "sqlalchemy\n")
+                        (("^marshmallow[=<>].*") "marshmallow\n")
+                        (("^Flask[=<>].*") "Flask\n"))))
+                  (replace 'check
+                    (lambda _
+                      (invoke "pytest" "-vv"))))))
     (propagated-inputs
      (list python-flask
-           python-marshmallow-3.2
+           python-marshmallow
            python-marshmallow-jsonapi
            python-simplejson
-           python-sqlalchemy-1.3
+           python-sqlalchemy
            python-apispec
            python-simplejson
            python-six))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]