[bug#50213] [PATCH] gnu: python-flask: Add missing propagated-inputs.

[bug#50213] [PATCH] gnu: python-flask: Add missing propagated-inputs.

[jgart via Guix-patches via]

* gnu/packages/python-web.scm (python-flask) [propagated-inputs]:
Add python-markupsafe, python-asgiref, and python-dotenv.
---
 gnu/packages/python-web.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index eefdb751a7..938b93a4ba 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2998,6 +2998,9 @@ minimum of WSGI.")
     (propagated-inputs
      `(("python-itsdangerous" ,python-itsdangerous)
        ("python-jinja2" ,python-jinja2)
+       ("python-markupsafe" ,python-markupsafe)
+       ("python-asgiref" ,python-asgiref)
+       ("python-dotenv" ,python-dotenv)
        ("python-click" ,python-click)
        ("python-werkzeug" ,python-werkzeug)))
     (home-page "https://www.palletsprojects.com/p/flask/")
-- 
2.33.0

[bug#50213] [PATCH 01/19] gnu: python-pytest-6: Update to 6.2.4.

[jgart via Guix-patches via]

* gnu/packages/check.scm (python-pytest-6): Update to 6.2.4.
---
 gnu/packages/check.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 894d8397e6..3a5403d5d7 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1002,14 +1002,14 @@ and many external plugins.")
 (define-public python-pytest-6
   (package
     (inherit (strip-python2-variant python-pytest))
-    (version "6.1.2")
+    (version "6.2.4")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pytest" version))
        (sha256
         (base32
-         "0gl2sdm322vzmsh5k4f8kj9raiq2y7kdinnca4m45ifvii5fk9y0"))))
+         "0jy5f83la1864ss42dhsi1mcm5nl79d8bjg7wk474nlw1c5avg2h"))))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-- 
2.33.0

[bug#50213] [PATCH 02/19] gnu: python-pytest-timeout: Update to 1.4.2.

[jgart via Guix-patches via]

* gnu/packages/check.scm (python-pytest-timeout): Update to 1.4.2.
---
 gnu/packages/check.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 3a5403d5d7..c8d52b3b16 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1346,14 +1346,14 @@ result back.")
 (define-public python-pytest-timeout
   (package
     (name "python-pytest-timeout")
-    (version "1.3.4")
+    (version "1.4.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pytest-timeout" version))
        (sha256
         (base32
-         "13n42azbvs5slvy2n1a9nw17r4qdq10dd68nln3jp925safa3yl0"))))
+         "0xnsigs0kmpq1za0d4i522sp3f71x5bgpdh3ski0rs74yqy13cr0"))))
     (build-system python-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
-- 
2.33.0

[bug#50213] [PATCH 03/19] gnu: python-pytest-timeout: Add python-pytest-cov to propagated-inputs.

[jgart via Guix-patches via]

* gnu/packages/check.scm (python-pytest-timeout) [propagated-inputs]:
Add python-pytest-cov.
---
 gnu/packages/check.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index c8d52b3b16..4e8d49a637 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1363,7 +1363,8 @@ result back.")
                       (add-installed-pythonpath inputs outputs)
                       (invoke "pytest" "-vv"))))))
     (propagated-inputs
-     `(("python-pytest" ,python-pytest)))
+     `(("python-pytest" ,python-pytest)
+       ("python-pytest-cov" ,python-pytest-cov)))
     (native-inputs
      `(("python-pexpect" ,python-pexpect)))
     (home-page "https://github.com/pytest-dev/pytest-timeout")
-- 
2.33.0

[bug#50213] [PATCH 04/19] gnu: python-pytest-xprocess: Update to 0.18.1.

[jgart via Guix-patches via]

* gnu/packages/check.scm (python-pytest-xprocess):
Update to 0.18.1.

Co-authored-by: Raghav Gururajan <rg@raghavgururajan.name>
---
 gnu/packages/check.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 4e8d49a637..979f1d491d 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1908,13 +1908,13 @@ framework which enables you to test server connections locally.")
 (define-public python-pytest-xprocess
   (package
     (name "python-pytest-xprocess")
-    (version "0.9.1")
+    (version "0.18.1")
     (source (origin
              (method url-fetch)
              (uri (pypi-uri "pytest-xprocess" version))
              (sha256
               (base32
-               "17zlql1xqw3ywcgwwbqmw633aly99lab12hm02asr8awvg5603pp"))))
+               "0rm2rchrr63imn44xk5slwydxf8gvy579524qcxq7dc42pnk17zx"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-pytest" ,python-pytest)
-- 
2.33.0

[bug#50213] [PATCH 05/19] gnu: python-pytest-xprocess: Add python-setuptools-scm to native-inputs.

[jgart via Guix-patches via]

* gnu/packages/check.scm (python-pytest-xprocess) [native-inputs]:
Add python-setuptools-scm.
---
 gnu/packages/check.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 979f1d491d..846fdf60e6 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1916,6 +1916,8 @@ framework which enables you to test server connections locally.")
               (base32
                "0rm2rchrr63imn44xk5slwydxf8gvy579524qcxq7dc42pnk17zx"))))
     (build-system python-build-system)
+    (native-inputs
+     `(("python-setuptools-scm" ,python-setuptools-scm)))
     (propagated-inputs
      `(("python-pytest" ,python-pytest)
        ("python-pytest-cache" ,python-pytest-cache)
-- 
2.33.0

[bug#50213] [PATCH 06/19] gnu: python-pytest-xprocess: Fix linter warning to follow redirect.

[jgart via Guix-patches via]

* gnu/packages/check.scm (python-pytest-xprocess) [home-page]:
Fix linter warning to follow permanent redirect.
---
 gnu/packages/check.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 846fdf60e6..312628ca55 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1925,7 +1925,7 @@ framework which enables you to test server connections locally.")
     (synopsis "Pytest plugin to manage external processes across test runs")
     (description "Pytest-xprocess is an experimental py.test plugin for managing
 processes across test runs.")
-    (home-page "https://bitbucket.org/pytest-dev/pytest-xprocess")
+    (home-page "https://github.com/pytest-dev/pytest-xprocess")
     (license license:expat)))
 
 (define-public python-pytest-subtesthack
-- 
2.33.0

[bug#50213] [PATCH 07/19] gnu: python-greenlet: Update to 1.1.1.

[jgart via Guix-patches via]

* gnu/packages/python-xyz.scm (python-greenlet): Update to 1.1.1.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 87a90ab680..59eb473857 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14226,13 +14226,13 @@ multiple processes (imagine multiprocessing, billiard, futures, celery etc).
 (define-public python-greenlet
   (package
     (name "python-greenlet")
-    (version "1.0.0")
+    (version "1.1.1")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "greenlet" version))
               (sha256
                (base32
-                "1y6wbg9yhm9dw6m768n4yslp56h85pnxkk3drz6icn15g6f1d7ki"))))
+                "10gllbrcbazxck84nr7dw3js3gq0rxrsr4kkvy5hg542rms2gwn0"))))
     (build-system python-build-system)
     (home-page "https://greenlet.readthedocs.io/")
     (synopsis "Lightweight in-process concurrent programming")
-- 
2.33.0

[bug#50213] [PATCH 08/19] gnu: python-werkzeug: Update to 2.0.1.

[jgart via Guix-patches via]

* gnu/packages/python-web.scm (python-werkzeug): Update to 2.0.1.
---
 gnu/packages/python-web.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 32b4aa4bf0..dfa1187d68 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4097,14 +4097,14 @@ List.  Forked from and using the same API as the publicsuffix package.")
 (define-public python-werkzeug
   (package
     (name "python-werkzeug")
-    (version "1.0.1")
+    (version "2.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "Werkzeug" version))
        (sha256
         (base32
-         "0z74sa1xw5h20yin9faj0vvdbq713cgbj84klc72jr9nmpjv303c"))))
+         "0hlwawnn8c41f254qify5jnjj8xb97n294h09bqimzqhs0qdpq8x"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
-- 
2.33.0

[bug#50213] [PATCH 09/19] gnu: python-werkzeug: Add missing propagated-inputs.

[jgart via Guix-patches via]

* gnu/packages/python-web.scm (python-werkzeug) [propagated-inputs]:
Add python-pytest-xprocess and python-pytest-6.
---
 gnu/packages/python-web.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index dfa1187d68..c464c54301 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4117,8 +4117,9 @@ List.  Forked from and using the same API as the publicsuffix package.")
     (propagated-inputs
      `(("python-requests" ,python-requests)))
     (native-inputs
-     `(("python-pytest" ,python-pytest)
-       ("python-pytest-timeout" ,python-pytest-timeout)))
+     `(("python-pytest" ,python-pytest-6)
+       ("python-pytest-timeout" ,python-pytest-timeout)
+       ("python-pytest-xprocess" ,python-pytest-xprocess)))
     (home-page "https://palletsprojects.com/p/werkzeug/")
     (synopsis "Utilities for WSGI applications")
     (description "One of the most advanced WSGI utility modules.  It includes a
-- 
2.33.0

[bug#50213] [PATCH 10/19] gnu: python-werkzeug: Disable tests that require networking.

[jgart via Guix-patches via]

* gnu/packages/python-web.scm (python-werkzeug) [arguments]:
Disable tests that require an internet connection.

Co-authored-by: Raghav Gururajan <rg@raghavgururajan.name>
---
 gnu/packages/python-web.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index c464c54301..07db685e2a 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4112,8 +4112,13 @@ List.  Forked from and using the same API as the publicsuffix package.")
          (delete 'check)
          (add-after 'install 'check
            (lambda* (#:key inputs outputs #:allow-other-keys)
+             ;; requires networking
+             (for-each delete-file
+               (list "tests/middleware/test_http_proxy.py"
+                     "tests/test_serving.py"
+                     "tests/test_debug.py"))
              (add-installed-pythonpath inputs outputs)
-             (invoke "python" "-m" "pytest"))))))
+             (invoke "pytest" "-vv"))))))
     (propagated-inputs
      `(("python-requests" ,python-requests)))
     (native-inputs
-- 
2.33.0

[bug#50213] [PATCH 10/19] gnu: python-werkzeug: Disable tests that require networking.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 345 bytes --]

I joined the 3 werkzeug patches together (since they seem to all be
parts of updating the package) and the tests failed for me.


-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#50213] [PATCH 11/19] gnu: python-jinja2: Update to 3.0.1.

[jgart via Guix-patches via]

* gnu/packages/python-xyz.scm (python-jinja2): Update to 3.0.1.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 59eb473857..1028aa0d4e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3790,14 +3790,14 @@ for Python.")
 (define-public python-jinja2
   (package
     (name "python-jinja2")
-    (version "2.11.2")
+    (version "3.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "Jinja2" version))
        (sha256
         (base32
-         "1c1v3djnr0ymp5xpy1h3h60abcaqxdlm4wsqmls9rxby88av5al9"))))
+         "197ms1wimxql650245v63wkv04n8bicj549wfhp51bx68x5lhgvh"))))
     (build-system python-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
-- 
2.33.0

[bug#50213] [PATCH 12/19] gnu: python-itsdangerous: Update to 2.0.1.

[jgart via Guix-patches via]

* gnu/packages/python-xyz.scm (python-itsdangerous): Update to 2.0.1.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 1028aa0d4e..cc42d2aeac 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3645,14 +3645,14 @@ visualisation and class tracker statistics.")
 (define-public python-itsdangerous
   (package
     (name "python-itsdangerous")
-    (version "1.1.0")
+    (version "2.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "itsdangerous" version))
        (sha256
         (base32
-         "068zpbksq5q2z4dckh2k1zbcq43ay74ylqn77rni797j0wyh66rj"))))
+         "1w6gfb2zhbcmrfj6digwzw1z68w6zg1q87rm6la2m412zil4swly"))))
     (build-system python-build-system)
     (home-page "https://palletsprojects.com/p/itsdangerous/")
     (synopsis "Python library for passing data to/from untrusted environments")
-- 
2.33.0

[bug#50213] [PATCH 12/19] gnu: python-itsdangerous: Update to 2.0.1.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 314 bytes --]

Is this a big upgrade compared to the 1.x series? I found it made a lot
of packages fail to build.

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#50213] [PATCH 12/19] gnu: python-itsdangerous: Update to 2.0.1.

[jgart via Guix-patches via]

On Fri, 27 Aug 2021 00:50:23 +0300 Efraim Flashner <efraim@flashner.co.il> wrote:
> Is this a big upgrade compared to the 1.x series? I found it made a lot
> of packages fail to build.

Yup, It's a major upgrade for Flask.

What packages failed for you?

all best,

jgart

[bug#50213] [PATCH 13/19] gnu: python-markupsafe: Update to 2.0.1.

[jgart via Guix-patches via]

* gnu/packages/python-xyz.scm (python-markupsafe): Update to 2.0.1.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index cc42d2aeac..9e3576c74e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3750,14 +3750,14 @@ e.g. filters, callbacks and errbacks can all be promises.")
 (define-public python-markupsafe
   (package
     (name "python-markupsafe")
-    (version "1.1.1")
+    (version "2.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "MarkupSafe" version))
        (sha256
         (base32
-         "0sqipg4fk7xbixqd8kq6rlkxj664d157bdwbh93farcphf92x1r9"))))
+         "02k2ynmqvvd0z0gakkf8s4idyb606r7zgga41jrkhqmigy06fk2r"))))
     (build-system python-build-system)
     (arguments
      `(#:modules ((ice-9 ftw)
-- 
2.33.0

[bug#50213] [PATCH 14/19] gnu: python-markupsafe: Fix linter warning to follow redirect.

[jgart via Guix-patches via]

* gnu/packages/python-xyz.scm (python-markupsafe) [home-page]:
Fix linter warning to follow permanent redirect.
---
 gnu/packages/python-xyz.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 9e3576c74e..f379c54164 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3777,7 +3777,7 @@ e.g. filters, callbacks and errbacks can all be promises.")
                       (invoke "pytest" "-vv")))))))
     (native-inputs
      `(("python-pytest" ,python-pytest)))
-    (home-page "https://github.com/mitsuhiko/markupsafe")
+    (home-page "https://github.com/pallets/markupsafe")
     (synopsis "XML/HTML/XHTML markup safe string implementation for Python")
     (description
      "Markupsafe provides an XML/HTML/XHTML markup safe string implementation
-- 
2.33.0

[bug#50213] [PATCH 15/19] gnu: Add python-dotenv.

[jgart via Guix-patches via]

* gnu/packages/python-xyz.scm (python-dotenv): New variable.
---
 gnu/packages/python-xyz.scm | 43 +++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f379c54164..a63ee98dab 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1931,6 +1931,49 @@ a library.")
     (description "DiskCache is a disk and file backed persistent cache.")
     (license license:asl2.0)))
 
+(define-public python-dotenv
+  (package
+    (name "python-dotenv")
+    (version "0.19.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "python-dotenv" version))
+        (sha256
+          (base32
+            "0wk1kfzbpqk9swvmpa9z3q170ffqql2id4b2dxrkrq58r4mbq8gm"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-sh" ,python-sh)
+       ("python-ipython" ,python-ipython)
+       ("python-pytest" ,python-pytest)
+       ("python-mock" ,python-mock)))
+    (propagated-inputs
+     `(("python-click" ,python-click)))
+    (home-page
+      "https://github.com/theskumar/python-dotenv")
+    (synopsis
+      "Read key-value pairs from a .env file and set them as environment variables")
+    (description
+"Python-dotenv reads key-value pairs from a .env file and can set them as environment
+variables.  It facilitates the development of applications following the 12 factors for
+building software-as-a-service apps as detailed by Adam Wiggins:
+@enumerate
+@item One codebase tracked in revision control, many deploys
+@item Explicitly declare and isolate dependencies
+@item Store config in the environment
+@item Treat backing services as attached resources
+@item Strictly separate build and run stages
+@item Execute the app as one or more stateless processes
+@item Export services via port binding
+@item Scale out via the process model
+@item Maximize robustness with fast startup and graceful shutdown
+@item Keep development, staging, and production as similar as possible
+@item Treat logs as event streams
+@item Run admin/management tasks as one-off processes
+@end enumerate")
+    (license license:bsd-4)))
+
 (define-public python-bitstruct
   (package
     (name "python-bitstruct")
-- 
2.33.0

[bug#50213] [PATCH 16/19] gnu: python-flask: Update to 2.0.1.

[jgart via Guix-patches via]

* gnu/packages/python-web.scm (python-flask): Update to 2.0.1.
---
 gnu/packages/python-web.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 07db685e2a..6784b5038f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2975,13 +2975,13 @@ minimum of WSGI.")
 (define-public python-flask
   (package
     (name "python-flask")
-    (version "1.1.2")
+    (version "2.0.1")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "Flask" version))
               (sha256
                (base32
-                "0q3h295izcil7lswkzfnyg3k5gq4hpmqmpl6i7s5m1n9szi1myjf"))))
+                "0mcgwq7b4qd99mf5bsvs3wphchxarf8kgil4hwww3blj31xjak0w"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
-- 
2.33.0

[bug#50213] [PATCH 17/19] gnu: python-flask: Use add-installed-pythonpath in the check phase.

[jgart via Guix-patches via]

* gnu/packages/python-web.scm (python-flask)[arguments]:
Use add-installed-pythonpath and tests? predicate in the check phase.
---
 gnu/packages/python-web.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 6784b5038f..561c788dde 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2987,10 +2987,10 @@ minimum of WSGI.")
      '(#:phases
        (modify-phases %standard-phases
          (replace 'check
-           (lambda _
-             (setenv "PYTHONPATH" (string-append "./build/lib:"
-                                                 (getenv "PYTHONPATH")))
-             (invoke "pytest" "-vv" "tests"))))))
+         (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+           (when tests?
+             (add-installed-pythonpath inputs outputs)
+             (invoke "pytest" "-vv")))))))
     (native-inputs
      `(("python-pytest" ,python-pytest)))
     (propagated-inputs
-- 
2.33.0

[bug#50213] [PATCH 18/19] gnu: python-flask: Add missing native-inputs.

[jgart via Guix-patches via]

* gnu/packages/python-web.scm (python-flask) [native-inputs]:
Add python-blinker, python-greenlet, and python-pytest-6.
---
 gnu/packages/python-web.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 561c788dde..eefdb751a7 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2992,7 +2992,9 @@ minimum of WSGI.")
              (add-installed-pythonpath inputs outputs)
              (invoke "pytest" "-vv")))))))
     (native-inputs
-     `(("python-pytest" ,python-pytest)))
+     `(("python-blinker" ,python-blinker)
+       ("python-greenlet" ,python-greenlet)
+       ("python-pytest" ,python-pytest-6)))
     (propagated-inputs
      `(("python-itsdangerous" ,python-itsdangerous)
        ("python-jinja2" ,python-jinja2)
-- 
2.33.0

[bug#50213] [PATCH 19/19] gnu: python-flask: Add missing propagated-inputs.

[jgart via Guix-patches via]

* gnu/packages/python-web.scm (python-flask) [propagated-inputs]:
Add python-markupsafe, python-asgiref, and python-dotenv.
---
 gnu/packages/python-web.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index eefdb751a7..938b93a4ba 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2998,6 +2998,9 @@ minimum of WSGI.")
     (propagated-inputs
      `(("python-itsdangerous" ,python-itsdangerous)
        ("python-jinja2" ,python-jinja2)
+       ("python-markupsafe" ,python-markupsafe)
+       ("python-asgiref" ,python-asgiref)
+       ("python-dotenv" ,python-dotenv)
        ("python-click" ,python-click)
        ("python-werkzeug" ,python-werkzeug)))
     (home-page "https://www.palletsprojects.com/p/flask/")
-- 
2.33.0

[bug#50213] Acknowledgement ([PATCH] gnu: python-flask: Add missing propagated-inputs.)

[jgart via Guix-patches via]

Hi,

Ignore the first lone patch. It's a duplicate. I "pushed the button" too quickly with git send-email :)

This patch set upgrades flask to 2.0.1.

https://flask.palletsprojects.com/en/2.0.x/changes/#version-2-0-1

all best,

jgart

[bug#50213] [PATCH 1/6] gnu: python-werkzeug: Update to 2.0.1.

[jgart via Guix-patches via]

* gnu/packages/python-web.scm (python-werkzeug): Update to 2.0.1.
[propagated-inputs]: Add python-pytest-xprocess and python-pytest-6.
[arguments]: Disable tests that require an internet connection.

Co-authored-by: Raghav Gururajan <rg@raghavgururajan.name>
---
 gnu/packages/python-web.scm | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 32b4aa4bf0..07db685e2a 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4097,14 +4097,14 @@ List.  Forked from and using the same API as the publicsuffix package.")
 (define-public python-werkzeug
   (package
     (name "python-werkzeug")
-    (version "1.0.1")
+    (version "2.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "Werkzeug" version))
        (sha256
         (base32
-         "0z74sa1xw5h20yin9faj0vvdbq713cgbj84klc72jr9nmpjv303c"))))
+         "0hlwawnn8c41f254qify5jnjj8xb97n294h09bqimzqhs0qdpq8x"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
@@ -4112,13 +4112,19 @@ List.  Forked from and using the same API as the publicsuffix package.")
          (delete 'check)
          (add-after 'install 'check
            (lambda* (#:key inputs outputs #:allow-other-keys)
+             ;; requires networking
+             (for-each delete-file
+               (list "tests/middleware/test_http_proxy.py"
+                     "tests/test_serving.py"
+                     "tests/test_debug.py"))
              (add-installed-pythonpath inputs outputs)
-             (invoke "python" "-m" "pytest"))))))
+             (invoke "pytest" "-vv"))))))
     (propagated-inputs
      `(("python-requests" ,python-requests)))
     (native-inputs
-     `(("python-pytest" ,python-pytest)
-       ("python-pytest-timeout" ,python-pytest-timeout)))
+     `(("python-pytest" ,python-pytest-6)
+       ("python-pytest-timeout" ,python-pytest-timeout)
+       ("python-pytest-xprocess" ,python-pytest-xprocess)))
     (home-page "https://palletsprojects.com/p/werkzeug/")
     (synopsis "Utilities for WSGI applications")
     (description "One of the most advanced WSGI utility modules.  It includes a
-- 
2.33.0

[bug#50213] [PATCH 2/6] gnu: python-jinja2: Update to 3.0.1.

[jgart via Guix-patches via]

* gnu/packages/python-xyz.scm (python-jinja2): Update to 3.0.1.
[home-page]: Fix url redirect.
---
 gnu/packages/python-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7be4b6a1ff..194650fbe8 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3823,14 +3823,14 @@ for Python.")
 (define-public python-jinja2
   (package
     (name "python-jinja2")
-    (version "2.11.2")
+    (version "3.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "Jinja2" version))
        (sha256
         (base32
-         "1c1v3djnr0ymp5xpy1h3h60abcaqxdlm4wsqmls9rxby88av5al9"))))
+         "197ms1wimxql650245v63wkv04n8bicj549wfhp51bx68x5lhgvh"))))
     (build-system python-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
@@ -3848,7 +3848,7 @@ for Python.")
      `(("python-pytest" ,python-pytest)))
     (propagated-inputs
      `(("python-markupsafe" ,python-markupsafe)))
-    (home-page "http://jinja.pocoo.org/")
+    (home-page "https://jinja.palletsprojects.com/")
     (synopsis "Python template engine")
     (description
      "Jinja2 is a small but fast and easy to use stand-alone template engine
-- 
2.33.0

[bug#50213] [PATCH 3/6] gnu: python-itsdangerous: Update to 2.0.1.

[jgart via Guix-patches via]

* gnu/packages/python-xyz.scm (python-itsdangerous): Update to 2.0.1.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 194650fbe8..f0203790a2 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3678,14 +3678,14 @@ visualisation and class tracker statistics.")
 (define-public python-itsdangerous
   (package
     (name "python-itsdangerous")
-    (version "1.1.0")
+    (version "2.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "itsdangerous" version))
        (sha256
         (base32
-         "068zpbksq5q2z4dckh2k1zbcq43ay74ylqn77rni797j0wyh66rj"))))
+         "1w6gfb2zhbcmrfj6digwzw1z68w6zg1q87rm6la2m412zil4swly"))))
     (build-system python-build-system)
     (home-page "https://palletsprojects.com/p/itsdangerous/")
     (synopsis "Python library for passing data to/from untrusted environments")
-- 
2.33.0

[bug#50213] [PATCH 4/6] gnu: python-markupsafe: Update to 2.0.1.

[jgart via Guix-patches via]

* gnu/packages/python-xyz.scm (python-markupsafe): Update to 2.0.1.
[home-page]: Fix linter warning to follow permanent redirect.
---
 gnu/packages/python-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f0203790a2..aec8cc682a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3783,14 +3783,14 @@ e.g. filters, callbacks and errbacks can all be promises.")
 (define-public python-markupsafe
   (package
     (name "python-markupsafe")
-    (version "1.1.1")
+    (version "2.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "MarkupSafe" version))
        (sha256
         (base32
-         "0sqipg4fk7xbixqd8kq6rlkxj664d157bdwbh93farcphf92x1r9"))))
+         "02k2ynmqvvd0z0gakkf8s4idyb606r7zgga41jrkhqmigy06fk2r"))))
     (build-system python-build-system)
     (arguments
      `(#:modules ((ice-9 ftw)
@@ -3810,7 +3810,7 @@ e.g. filters, callbacks and errbacks can all be promises.")
                       (invoke "pytest" "-vv")))))))
     (native-inputs
      `(("python-pytest" ,python-pytest)))
-    (home-page "https://github.com/mitsuhiko/markupsafe")
+    (home-page "https://github.com/pallets/markupsafe")
     (synopsis "XML/HTML/XHTML markup safe string implementation for Python")
     (description
      "Markupsafe provides an XML/HTML/XHTML markup safe string implementation
-- 
2.33.0

[bug#50213] [PATCH 5/6] gnu: Add python-dotenv.

[jgart via Guix-patches via]

* gnu/packages/python-xyz.scm (python-dotenv): New variable.
---
 gnu/packages/python-xyz.scm | 43 +++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index aec8cc682a..b7898e4586 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1964,6 +1964,49 @@ a library.")
     (description "DiskCache is a disk and file backed persistent cache.")
     (license license:asl2.0)))
 
+(define-public python-dotenv
+  (package
+    (name "python-dotenv")
+    (version "0.19.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "python-dotenv" version))
+        (sha256
+          (base32
+            "0wk1kfzbpqk9swvmpa9z3q170ffqql2id4b2dxrkrq58r4mbq8gm"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-sh" ,python-sh)
+       ("python-ipython" ,python-ipython)
+       ("python-pytest" ,python-pytest)
+       ("python-mock" ,python-mock)))
+    (propagated-inputs
+     `(("python-click" ,python-click)))
+    (home-page
+      "https://github.com/theskumar/python-dotenv")
+    (synopsis
+      "Read key-value pairs from a .env file and set them as environment variables")
+    (description
+"Python-dotenv reads key-value pairs from a .env file and can set them as environment
+variables.  It facilitates the development of applications following the 12 factors for
+building software-as-a-service apps as detailed by Adam Wiggins:
+@enumerate
+@item One codebase tracked in revision control, many deploys
+@item Explicitly declare and isolate dependencies
+@item Store config in the environment
+@item Treat backing services as attached resources
+@item Strictly separate build and run stages
+@item Execute the app as one or more stateless processes
+@item Export services via port binding
+@item Scale out via the process model
+@item Maximize robustness with fast startup and graceful shutdown
+@item Keep development, staging, and production as similar as possible
+@item Treat logs as event streams
+@item Run admin/management tasks as one-off processes
+@end enumerate")
+    (license license:bsd-4)))
+
 (define-public python-bitstruct
   (package
     (name "python-bitstruct")
-- 
2.33.0

[bug#50213] [PATCH 6/6] gnu: python-flask: Update to 2.0.1.

[jgart via Guix-patches via]

* gnu/packages/python-web.scm (python-flask): Update to 2.0.1.
[arguments]:
Use add-installed-pythonpath and tests? predicate in the check phase.
[native-inputs]:
Add python-blinker, python-greenlet, and python-pytest-6.
[propagated-inputs]:
Add python-markupsafe, python-asgiref, and python-dotenv.
---
 gnu/packages/python-web.scm | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 07db685e2a..938b93a4ba 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2975,27 +2975,32 @@ minimum of WSGI.")
 (define-public python-flask
   (package
     (name "python-flask")
-    (version "1.1.2")
+    (version "2.0.1")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "Flask" version))
               (sha256
                (base32
-                "0q3h295izcil7lswkzfnyg3k5gq4hpmqmpl6i7s5m1n9szi1myjf"))))
+                "0mcgwq7b4qd99mf5bsvs3wphchxarf8kgil4hwww3blj31xjak0w"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
          (replace 'check
-           (lambda _
-             (setenv "PYTHONPATH" (string-append "./build/lib:"
-                                                 (getenv "PYTHONPATH")))
-             (invoke "pytest" "-vv" "tests"))))))
+         (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+           (when tests?
+             (add-installed-pythonpath inputs outputs)
+             (invoke "pytest" "-vv")))))))
     (native-inputs
-     `(("python-pytest" ,python-pytest)))
+     `(("python-blinker" ,python-blinker)
+       ("python-greenlet" ,python-greenlet)
+       ("python-pytest" ,python-pytest-6)))
     (propagated-inputs
      `(("python-itsdangerous" ,python-itsdangerous)
        ("python-jinja2" ,python-jinja2)
+       ("python-markupsafe" ,python-markupsafe)
+       ("python-asgiref" ,python-asgiref)
+       ("python-dotenv" ,python-dotenv)
        ("python-click" ,python-click)
        ("python-werkzeug" ,python-werkzeug)))
     (home-page "https://www.palletsprojects.com/p/flask/")
-- 
2.33.0

[bug#50213] Updated patch set

[jgart via Guix-patches via]

Hi Efraim,

I updated the patchset and squashed some of the commits that can be logically grouped together as a single commit.

I removed python-pytest-6 from the patch set since Maxim updated it since then in 66071cd85ea323292eb60258d3cef9ffaf8306d4.

I tested this new patch set and everything builds fine for me. Let me know if builds are still failing for you.

all best,

jgart