From cf11bb5b9f29c165bdb8818b5695a2483bb2cff7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 12 Apr 2021 02:48:18 +0200 Subject: gnu: python-webtest: Update to 2.0.35. * gnu/packages/python-web.scm (python-webtest): Update to 2.0.35. --- gnu/packages/python-web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 1e57165509..4f34502e86 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2916,14 +2916,13 @@ file.") (define-public python-webtest (package (name "python-webtest") - (version "2.0.33") + (version "2.0.35") (source (origin (method url-fetch) (uri (pypi-uri "WebTest" version)) (sha256 - (base32 - "1l3z0cwqslsf4rcrhi2gr8kdfh74wn2dw76376i4g9i38gz8wd21")))) + (base32 "11xhgdj251zkvz5w30fvspii08ki2vrpr1im9sph1wmlnasnihda")))) (build-system python-build-system) (arguments ;; Tests require python-pyquery, which creates a circular dependency. -- cgit v1.3 From 4cfc87d69949e999c2f13442c0519895fed8613e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 5 May 2021 18:21:15 +0200 Subject: gnu: python-asgiref: Update to 3.3.4. * gnu/packages/python-web.scm (python-asgiref): Update to 3.3.4. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 4f34502e86..f13fb5b5c2 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -307,13 +307,13 @@ comes with a SOCKS proxy client.") (define-public python-asgiref (package (name "python-asgiref") - (version "3.2.10") + (version "3.3.4") (source (origin (method url-fetch) (uri (pypi-uri "asgiref" version)) (sha256 (base32 - "06kg3hnnvh7qg0w9amkvk1hd6n6bs055r04b7if6ipa7w4g92lby")))) + "0y0vdzldjkbs4pxf10pi6jpxq9b2sfp1rlwm153jcf5nvzxns8fi")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.3 From d51daf25c4210bdfe8e4d9db096bb8ccf088d3b4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 6 May 2021 01:00:38 +0200 Subject: gnu: gunicorn: Respect '--without-tests'. * gnu/packages/python-web.scm (gunicorn)[arguments]: Only run tests when TESTS? is #true. --- gnu/packages/python-web.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f13fb5b5c2..8b6b667c3f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2013, 2014, 2015, 2016, 2020 Andreas Enge -;;; Copyright © 2016, 2017, 2019, 2020 Marius Bakke +;;; Copyright © 2016, 2017, 2019, 2020, 2021 Marius Bakke ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2016, 2017, 2020 Julien Lepiller @@ -4708,10 +4708,13 @@ event loop. It is implemented in Cython and uses libuv under the hood.") (delete-file "docs/build/texinfo/Gunicorn.texi") #t)) (replace 'check - (lambda _ - (setenv "PYTHONPATH" - (string-append ".:" (getenv "PYTHONPATH"))) - (invoke "pytest"))) + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + (setenv "PYTHONPATH" + (string-append ".:" (getenv "PYTHONPATH"))) + (invoke "pytest" "-vv")) + (format #t "test suite not run~%")))) (add-after 'install 'install-doc (lambda* (#:key outputs #:allow-other-keys) (let* ((doc (string-append (assoc-ref outputs "doc") -- cgit v1.3 From 0f056f2c3360fe43ed12a554cca34617435fe8ee Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 6 May 2021 01:01:58 +0200 Subject: gnu: gunicorn: Remove unneeded runtime dependencies. * gnu/packages/python-web.scm (gunicorn)[arguments]: Override 'wrap' phase. --- gnu/packages/python-web.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 8b6b667c3f..4d6d4788a8 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4730,8 +4730,22 @@ event loop. It is implemented in Cython and uses libuv under the hood.") (copy-recursively "examples" examples) (for-each (lambda (file) (copy-file file (string-append doc "/" file))) - '("README.rst" "NOTICE" "LICENSE" "THANKS"))) - #t))))) + '("README.rst" "NOTICE" "LICENSE" "THANKS"))))) + ;; XXX: The wrap phase includes native inputs on PYTHONPATH, (see + ;; ), leading to an inflated closure + ;; size. Override it to only add the essential entries. + (replace 'wrap + (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (python (assoc-ref (or native-inputs inputs) "python")) + (sitedir (string-append "/lib/python" + (python-version python) + "/site-packages"))) + (wrap-program (string-append out "/bin/gunicorn") + `("PYTHONPATH" ":" prefix + ,(map (lambda (output) + (string-append output sitedir)) + (list python out)))))))))) (native-inputs `(("binutils" ,binutils) ;; for ctypes.util.find_library() ("python-aiohttp" ,python-aiohttp) -- cgit v1.3 From 4bdc52bc21d501c7d8e2b6d1d3951783288e0398 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 6 May 2021 01:20:51 +0200 Subject: gnu: gunicorn: Update to 2.1.0. * gnu/packages/python-web.scm (gunicorn): Update to 2.1.0. [arguments]: Ignore one test that cannot run in the build container. [native-inputs]: Add PYTHON-GEVENT. --- gnu/packages/python-web.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 4d6d4788a8..5897893de3 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4688,14 +4688,14 @@ event loop. It is implemented in Cython and uses libuv under the hood.") (define-public gunicorn (package (name "gunicorn") - (version "20.0.4") + (version "20.1.0") (source (origin (method url-fetch) (uri (pypi-uri "gunicorn" version)) (sha256 (base32 - "09n6fc019bgrvph1s5h1lwhn2avcsprw6ncd203qhra3i8mvn10r")))) + "1s7670qw36x90bgmazmgib170i5gnpyb2ypxzlla7y0mpasniag0")))) (outputs '("out" "doc")) (build-system python-build-system) (arguments @@ -4713,7 +4713,11 @@ event loop. It is implemented in Cython and uses libuv under the hood.") (begin (setenv "PYTHONPATH" (string-append ".:" (getenv "PYTHONPATH"))) - (invoke "pytest" "-vv")) + (invoke "pytest" "-vv" + ;; Disable the geventlet tests because eventlet uses + ;; dnspython, which does not work in the build + ;; container due to lack of /etc/resolv.conf, etc. + "--ignore=tests/workers/test_geventlet.py")) (format #t "test suite not run~%")))) (add-after 'install 'install-doc (lambda* (#:key outputs #:allow-other-keys) @@ -4749,6 +4753,7 @@ event loop. It is implemented in Cython and uses libuv under the hood.") (native-inputs `(("binutils" ,binutils) ;; for ctypes.util.find_library() ("python-aiohttp" ,python-aiohttp) + ("python-gevent" ,python-gevent) ("python-pytest" ,python-pytest) ("python-pytest-cov" ,python-pytest-cov) ("python-sphinx" ,python-sphinx) -- cgit v1.3 From 5802228fca6ec789f973fcf6cc9bdaf39b40a97a Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Tue, 20 Apr 2021 05:22:33 +0000 Subject: gnu: Add python-tinycss. * gnu/packages/python-web.scm (python-tinycss): New variable. --- gnu/packages/python-web.scm | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 5897893de3..f6ce09aaa5 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -37,7 +37,7 @@ ;;; Copyright © 2020 Holger Peters ;;; Copyright © 2020 Noisytoot ;;; Copyright © 2020 Edouard Klein -;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2020 Konrad Hinsen ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2021 Ekaitz Zarraga @@ -4556,6 +4556,49 @@ library to create slugs from unicode strings while keeping it DRY.") (description "Generate complex HTML+JS pages with Python") (license license:expat))) +(define-public python-tinycss + (package + (name "python-tinycss") + (version "0.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tinycss" version)) + (sha256 + (base32 "0vkifr595h28ymkjhrswwf0bm23lhznh5f44xyp7x7jy1ssnyc0j")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-flake8-isort + ;; Flake8 and isort tests fail. + (lambda _ + (substitute* "setup.cfg" ((" --flake8 --isort") "")) + #t)) + (replace 'check + (lambda _ + ;; Disable failing test. + (invoke "python" "-m" "pytest" "-k" + "not test_speedups")))))) + (native-inputs + `(("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-flake8" ,python-pytest-flake8) + ("python-pytest-isort" ,python-pytest-isort) + ("python-pytest-runner" ,python-pytest-runner))) + (home-page "https://tinycss.readthedocs.io/") + (synopsis "Complete yet simple CSS parser for Python") + (description + "@code{tinycss} is a complete yet simple CSS parser for Python. It +supports the full syntax and error handling for CSS 2.1 as well as some CSS 3 +modules: + +@itemize +@item CSS Color 3 +@item CSS Fonts 3 +@item CSS Paged Media 3 +@end itemize") + (license license:bsd-3))) + (define-public python-tinycss2 (package (name "python-tinycss2") -- cgit v1.3 From e54d18895565561767ef24544aa88a5e89b6507b Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 6 May 2021 15:03:54 +0000 Subject: gnu: python-pycurl: Migrate uri from bintray. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-pycurl)[source]: Download from pypi. Signed-off-by: Ludovic Courtès --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f6ce09aaa5..b7411d21fa 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2020 Konrad Hinsen ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2021 Ekaitz Zarraga +;;; Copyright © 2021 Greg Hogan ;;; ;;; This file is part of GNU Guix. ;;; @@ -1206,8 +1207,7 @@ Amazon S3 compatible object storage server.") (source (origin (method url-fetch) - (uri (string-append "https://dl.bintray.com/pycurl/pycurl/pycurl-" - version ".tar.gz")) + (uri (pypi-uri "pycurl" version)) (sha256 (base32 "1cwlb76vddqp2mxqvjbhf367caddzy82rhangddjjhjqaj8x4zgc")))) (build-system python-build-system) -- cgit v1.3 From 3a396b00675fae70541eb4a9d2e0909654b1d3bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 22 May 2021 18:25:06 +0200 Subject: gnu: python-genshi: Update to 0.7.5. * gnu/packages/python-web.scm (python-genshi): Update to 0.7.5. [propagated-inputs]: Add PYTHON-SIX. --- gnu/packages/python-web.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b7411d21fa..e789f9d837 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3926,7 +3926,7 @@ for Flask programs that are using @code{python-alembic}.") (define-public python-genshi (package (name "python-genshi") - (version "0.7.3") + (version "0.7.5") (source (origin (method git-fetch) @@ -3935,7 +3935,9 @@ for Flask programs that are using @code{python-alembic}.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "04bw7nd4wyn8ixnhik57hny2xpjjpn80k5hp6691inix5gc6rxaf")))) + (base32 "04i0caywiwrgw09grz988n15qr9lr31d9n6a529p8v80cy1fv23c")))) + (propagated-inputs + `(("python-six" ,python-six))) (build-system python-build-system) (home-page "https://genshi.edgewall.org/") (synopsis "Toolkit for generation of output for the web") -- cgit v1.3 From 9419f97a718904889226b28901b40334f1ddca04 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 22 May 2021 18:26:36 +0200 Subject: gnu: python-terminado: Update to 0.10.0. * gnu/packages/python-web.scm (python-terminado): Update to 0.10.0. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e789f9d837..9815ba011b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1749,14 +1749,14 @@ web framework, either via the basic or digest authentication schemes.") (define-public python-terminado (package (name "python-terminado") - (version "0.9.4") + (version "0.10.0") (source (origin (method url-fetch) (uri (pypi-uri "terminado" version)) (sha256 (base32 - "1glqyw97rddyzvisz8rihsn3x2nrm5xbyq82nzp3123pqbxvqzcs")))) + "1smvra3sc9sg64w49kfn5yhagshq3x55839748ck5dvxvk4hgza6")))) (build-system python-build-system) (propagated-inputs `(("python-tornado" ,python-tornado-6) -- cgit v1.3 From 2f97a666a564fea0fdcff00a0513aa8b4c2d60fe Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 22 May 2021 18:51:05 +0200 Subject: gnu: python-urllib3: Don't use 'package/inherit' on replacement package. * gnu/packages/python-web.scm (python-urllib3/fixed): Use regular inheritance instead of PACKAGE/INHERIT. --- gnu/packages/python-web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 9815ba011b..72eb93541b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2784,7 +2784,8 @@ supports url redirection and retries, and also gzip and deflate decoding.") (license license:expat))) (define python-urllib3/fixed - (package/inherit python-urllib3 + (package + (inherit python-urllib3) (version "1.26.4") (source (origin -- cgit v1.3 From dbcf2b61b1f48cbe84d51873f4e4de60897b914c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 23 May 2021 14:07:34 +0200 Subject: gnu: Fix erroneous uses of 'package/inherit'. These packages use a different source/version from the inherited package, and thus should not inherit replacements. * gnu/packages/check.scm (googletest-1.8, python-pytest-runner-2): Use record inheritance instead of PACKAGE/INHERIT. * gnu/packages/crates-io.scm (rust-bindgen-0.49, rust-bytes-0.4, rust-colored-1.9.1, rust-difference-1, rust-docopt-0.8, rust-html5ever-0.23, rust-http-0.1, rust-http-body-0.1, rust-loom-0.2, rust-loom-0.1, rust-pulldown-cmark-0.0.8, rust-ring-0.13, rust-rustls-0.12, rust-sct-0.3, rust-term-0.2, rust-untrusted-0.6, rust-webpki-0.18, rust-webpki-roots-0.17, rust-webpki-roots-0.14): Likewise. * gnu/packages/emacs.scm (emacs-next, emacs-next-pgtk, guile-emacs): Likewise. * gnu/packages/guile.scm (guile-2.2.4): Likewise. * gnu/packages/maths.scm (hdf5-1.10, hdf5-1.12): Likewise. * gnu/packages/protobuf.scm (protobuf-3.6, protobuf-3.5, python-protobuf-3.6): Likewise. * gnu/packages/python-web.scm (python2-html2text): Likewise. * gnu/packages/python-xyz.scm (python-pygments/fixed, python2-numpy, python2-urwid, python2-markdown, python2-fonttools): Likewise. * gnu/packages/racket.scm (racket): Likewise. * gnu/packages/sequoia.scm (sequoia4pEp): Likewise. --- gnu/packages/check.scm | 8 +++---- gnu/packages/crates-io.scm | 57 ++++++++++++++++++++++++++++++--------------- gnu/packages/emacs.scm | 9 ++++--- gnu/packages/guile.scm | 4 ++-- gnu/packages/maths.scm | 6 +++-- gnu/packages/protobuf.scm | 10 ++++---- gnu/packages/python-web.scm | 3 ++- gnu/packages/python-xyz.scm | 18 +++++++------- gnu/packages/racket.scm | 4 ++-- gnu/packages/sequoia.scm | 3 ++- 10 files changed, 76 insertions(+), 46 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 63ed2175ef..7b20d863e6 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -697,8 +697,8 @@ generation.") (license license:bsd-3))) (define-public googletest-1.8 - (package/inherit - googletest + (package + (inherit googletest) (version "1.8.1") (source (origin (method git-fetch) @@ -1188,8 +1188,8 @@ contacting the real http server.") ;; python-bleach 3.1.0 requires this ancient version of pytest-runner. ;; Remove once no longer needed. (define-public python-pytest-runner-2 - (package/inherit - python-pytest-runner + (package + (inherit python-pytest-runner) (version "2.12.2") (source (origin (method url-fetch) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 313c57e90f..318b2c695b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4416,7 +4416,8 @@ bindings to C and C++ libraries.") ("rust-shlex" ,rust-shlex-0.1)))))) (define-public rust-bindgen-0.49 - (package/inherit rust-bindgen-0.50 + (package + (inherit rust-bindgen-0.50) (name "rust-bindgen") (version "0.49.4") (source @@ -5949,7 +5950,8 @@ little-endian.") (("rust-serde" ,rust-serde-1)))))) (define-public rust-bytes-0.4 - (package/inherit rust-bytes-0.5 + (package + (inherit rust-bytes-0.5) (name "rust-bytes") (version "0.4.12") (source @@ -7660,7 +7662,8 @@ colors.") (license license:mpl2.0))) (define-public rust-colored-1.9.1 - (package/inherit rust-colored-1 + (package + (inherit rust-colored-1) (name "rust-colored") (version "1.9.1") (source @@ -11575,7 +11578,8 @@ Diesel.") (license license:expat))) (define-public rust-difference-1 - (package/inherit rust-difference-2 + (package + (inherit rust-difference-2) (name "rust-difference") (version "1.0.0") (source @@ -12123,7 +12127,8 @@ from macros.") (license (list license:expat license:unlicense)))) (define-public rust-docopt-0.8 - (package/inherit rust-docopt-1 + (package + (inherit rust-docopt-1) (name "rust-docopt") (version "0.8.3") (source @@ -18312,7 +18317,8 @@ Hash-based Message Authentication Code algorithm} for SHA1.") ("rust-typed-arena" ,rust-typed-arena-1)))))) (define-public rust-html5ever-0.23 - (package/inherit rust-html5ever-0.24 + (package + (inherit rust-html5ever-0.24) (name "rust-html5ever") (version "0.23.0") (source @@ -18387,7 +18393,8 @@ requests and responses.") (license (list license:asl2.0 license:expat)))) (define-public rust-http-0.1 - (package/inherit rust-http-0.2 + (package + (inherit rust-http-0.2) (name "rust-http") (version "0.1.17") (source @@ -18454,7 +18461,8 @@ HTTP request or response body.") ("rust-http" ,rust-http-0.2)))))) (define-public rust-http-body-0.1 - (package/inherit rust-http-body-0.3 + (package + (inherit rust-http-body-0.3) (name "rust-http-body") (version "0.1.0") (source @@ -22410,7 +22418,8 @@ explosion.") ("rust-serde-json" ,rust-serde-json-1)))))) (define-public rust-loom-0.2 - (package/inherit rust-loom-0.3 + (package + (inherit rust-loom-0.3) (name "rust-loom") (version "0.2.13") (source @@ -22432,7 +22441,8 @@ explosion.") ("rust-serde-json" ,rust-serde-json-1)))))) (define-public rust-loom-0.1 - (package/inherit rust-loom-0.3 + (package + (inherit rust-loom-0.3) (name "rust-loom") (version "0.1.1") (source @@ -30534,7 +30544,8 @@ compliant email address validation.") ("rust-getopts" ,rust-getopts-0.2)))))) (define-public rust-pulldown-cmark-0.0.8 - (package/inherit rust-pulldown-cmark-0.4 + (package + (inherit rust-pulldown-cmark-0.4) (name "rust-pulldown-cmark") (version "0.0.8") (source @@ -33150,7 +33161,8 @@ functionality as retain but gives mutable borrow to the predicate.") ("rust-cc" ,rust-cc-1)))))) (define-public rust-ring-0.13 - (package/inherit rust-ring-0.16 + (package + (inherit rust-ring-0.16) (name "rust-ring") (version "0.13.5") (source @@ -35111,7 +35123,8 @@ rustc compiler.") ("rust-webpki" ,rust-webpki-0.18)))))) (define-public rust-rustls-0.12 - (package/inherit rust-rustls-0.16 + (package + (inherit rust-rustls-0.16) (name "rust-rustls") (version "0.12.0") (source @@ -36158,7 +36171,8 @@ Pwrite traits from the scroll crate.") ("rust-untrusted" ,rust-untrusted-0.6)))))) (define-public rust-sct-0.3 - (package/inherit rust-sct-0.6 + (package + (inherit rust-sct-0.6) (name "rust-sct") (version "0.3.0") (source @@ -41958,7 +41972,8 @@ template language.") ("rust-winapi" ,rust-winapi-0.2)))))) (define-public rust-term-0.2 - (package/inherit rust-term-0.4 + (package + (inherit rust-term-0.4) (name "rust-term") (version "0.2.14") (source @@ -47060,7 +47075,8 @@ untrusted inputs in Rust.") (license license:isc))) (define-public rust-untrusted-0.6 - (package/inherit rust-untrusted-0.7 + (package + (inherit rust-untrusted-0.7) (name "rust-untrusted") (version "0.6.2") (source @@ -48681,7 +48697,8 @@ Verification.") (("rust-base64" ,rust-base64-0.9)))))) (define-public rust-webpki-0.18 - (package/inherit rust-webpki-0.21 + (package + (inherit rust-webpki-0.21) (name "rust-webpki") (version "0.18.1") (source @@ -48767,7 +48784,8 @@ with webpki.") (base32 "1d4ss607rgi9pj01zzqa13c1p3m35z314yh6lmjaj4kzvwv5gkci")))))) (define-public rust-webpki-roots-0.17 - (package/inherit rust-webpki-roots-0.18 + (package + (inherit rust-webpki-roots-0.18) (name "rust-webpki-roots") (version "0.17.0") (source @@ -48818,7 +48836,8 @@ with webpki.") ("rust-webpki" ,rust-webpki-0.18)))))) (define-public rust-webpki-roots-0.14 - (package/inherit rust-webpki-roots-0.18 + (package + (inherit rust-webpki-roots-0.18) (name "rust-webpki-roots") (version "0.14.0") (source diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 5316d25151..1a2b98bec2 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -305,7 +305,8 @@ languages.") (define-public emacs-next (let ((commit "2ea34662c20f71d35dd52a5ed996542c7386b9cb") (revision "0")) - (package/inherit emacs + (package + (inherit emacs) (name "emacs-next") (version (git-version "28.0.50" revision commit)) (source @@ -326,7 +327,8 @@ languages.") (define-public emacs-next-pgtk (let ((commit "ae18c8ec4f0ef37c8c9cda473770ff47e41291e2") (revision "1")) - (package/inherit emacs-next + (package + (inherit emacs-next) (name "emacs-next-pgtk") (version (git-version "28.0.50" revision commit)) (source @@ -450,7 +452,8 @@ editor (with wide ints)" ) (define-public guile-emacs (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b") (revision "0")) - (package/inherit emacs + (package + (inherit emacs) (name "guile-emacs") (version (git-version "0.0.0" revision commit)) (source (origin diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 74c0709ea4..5de4f68093 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -269,8 +269,8 @@ without requiring the source code to be rewritten.") (define-deprecated guile-2.2/bug-fix guile-2.2) (define-public guile-2.2.4 - (package/inherit - guile-2.2 + (package + (inherit guile-2.2) (version "2.2.4") (source (origin (inherit (package-source guile-2.2)) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 8cd64e7697..5062cc0347 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1230,7 +1230,8 @@ extremely large and complex data collections.") "https://www.hdfgroup.org/ftp/HDF5/current/src/unpacked/COPYING")))) (define-public hdf5-1.10 - (package/inherit hdf5-1.8 + (package + (inherit hdf5-1.8) (version "1.10.7") (source (origin @@ -1249,7 +1250,8 @@ extremely large and complex data collections.") (patches (search-patches "hdf5-config-date.patch")))))) (define-public hdf5-1.12 - (package/inherit hdf5-1.8 + (package + (inherit hdf5-1.8) (version "1.12.0") (source (origin diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 995d543059..857adf1703 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -123,7 +123,8 @@ internal RPC protocols and file formats.") ;; Tensorflow requires version 3.6 specifically. (define-public protobuf-3.6 - (package/inherit protobuf + (package + (inherit protobuf) (version "3.6.1") (source (origin (method url-fetch) @@ -136,8 +137,8 @@ internal RPC protocols and file formats.") ;; The 3.5 series are the last versions that do not require C++ 11. (define-public protobuf-3.5 - (package/inherit - protobuf + (package + (inherit protobuf) (version "3.5.1") (source (origin (method url-fetch) @@ -289,7 +290,8 @@ structured data.") ;; For tensorflow. (define-public python-protobuf-3.6 - (package/inherit python-protobuf + (package + (inherit python-protobuf) (name "python-protobuf") (version (package-version protobuf-3.6) ) (source diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 72eb93541b..4468a9b8cd 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -707,7 +707,8 @@ Swartz.") (define-public python2-html2text (let ((base (package-with-python2 python-html2text))) - (package/inherit base + (package + (inherit base) ;; This is the last version with support for Python 2. (version "2019.8.11") (source (origin diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c501b65a55..5a3c6b670e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3980,7 +3980,8 @@ text styles of documentation.") (properties `((python2-variant . ,(delay python2-pygments)))))) (define python-pygments/fixed - (package/inherit python-pygments + (package + (inherit python-pygments) (version "2.7.4") (source (origin @@ -4969,8 +4970,8 @@ capabilities.") (define-public python2-numpy (let ((numpy (package-with-python2 (strip-python2-variant python-numpy)))) - (package/inherit - numpy + (package + (inherit numpy) (version "1.16.5") (source (origin (method url-fetch) @@ -8087,7 +8088,8 @@ features useful for text console applications.") (define-public python2-urwid (let ((base (package-with-python2 (strip-python2-variant python-urwid)))) - (package/inherit base + (package + (inherit base) (version "2.1.0") (source (origin @@ -9528,8 +9530,8 @@ markdown_py is also provided to convert Markdown files to HTML.") ;; Markdown 3.2 dropped support for Python 2. (define-public python2-markdown (let ((base (package-with-python2 (strip-python2-variant python-markdown)))) - (package/inherit - base + (package + (inherit base) (version "3.1.1") (source (origin (method url-fetch) @@ -9697,8 +9699,8 @@ from an XML-based format.") ;; Fonttools 4.x dropped support for Python 2, so stick with 3.x here. (define-public python2-fonttools (let ((base (package-with-python2 (strip-python2-variant python-fonttools)))) - (package/inherit - base + (package + (inherit base) (version "3.44.0") (source (origin (method url-fetch) diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index 18af14b2ec..be33270b30 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -173,8 +173,8 @@ DrRacket IDE, are not included.") (define-public racket - (package/inherit - racket-minimal + (package + (inherit racket-minimal) (name "racket") (version (package-version racket-minimal)) ; needed for origin uri to work (source diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index cb1e2a4872..c83926ef6c 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -221,7 +221,8 @@ with OpenPGP data.") (define-public sequoia4pEp ;; Currently pEp Engine requires sequoia in not-so-current version - (package/inherit sequoia + (package + (inherit sequoia) (name "sequoia") (version "0.15.0-pEp") (source -- cgit v1.3 From 237b744d23254c28123f6bf48b6e5e9e5c33438a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 29 May 2021 23:41:35 +0200 Subject: gnu: python-hupper: Update to 1.10.3. * gnu/packages/python-web.scm (python-hupper): Update to 1.10.3. --- gnu/packages/python-web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 4468a9b8cd..f20f1c1f55 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2015 Cyril Roelandt ;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari ;;; Copyright © 2016, 2019 Hartmut Goebel -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2016–2021 Tobias Geerinckx-Rice ;;; Copyright © 2015, 2017 Ben Woodcroft ;;; Copyright © 2015, 2016 Christopher Allan Webber ;;; Copyright © 2017 Adriano Peluso @@ -5498,13 +5498,13 @@ according to the standard set by PasteDeploy ") (define-public python-hupper (package (name "python-hupper") - (version "1.10.2") + (version "1.10.3") (source (origin (method url-fetch) (uri (pypi-uri "hupper" version)) (sha256 (base32 - "0am0p6g5cz6xmcaf04xq8q6dzdd9qz0phj6gcmpsckf2mcyza61q")))) + "1nbc648d110jx6ziji980cdmzsd14p8fqrcarsdvr1vm5jvm2vyd")))) (build-system python-build-system) (arguments '(#:test-target "pytest")) (native-inputs -- cgit v1.3 From ad7c7b5bf62440ee05ff4da908484721d75ca545 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 31 May 2021 09:21:45 +0200 Subject: gnu: Add python-google. * gnu/packages/python-web.scm (python-google): New variable. --- gnu/packages/python-web.scm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f20f1c1f55..81cd4daea2 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016, 2020 Andreas Enge ;;; Copyright © 2016, 2017, 2019, 2020, 2021 Marius Bakke ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus -;;; Copyright © 2017 Roel Janssen +;;; Copyright © 2017, 2021 Roel Janssen ;;; Copyright © 2016, 2017, 2020 Julien Lepiller ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2014, 2017, 2021 Eric Bavier @@ -4298,6 +4298,25 @@ name resolutions asynchronously.") for URL parsing and changing.") (license license:asl2.0))) +(define-public python-google + (package + (name "python-google") + (version "3.0.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "google" version)) + (sha256 + (base32 + "1gncv3l11za0mpxvmpaf5n5j3jzp282rz62yml4ha4z55q930d8l")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ; There are no tests. + (home-page "https://breakingcode.wordpress.com/") + (synopsis "Python bindings to the Google search engine") + (description "This package provides Python bindings for using the +Google search engine. Its module is called @code{googlesearch}.") + (license license:bsd-3))) + (define-public python-google-api-client (package (name "python-google-api-client") -- cgit v1.3 From 2b0eddbb3926a6b22fffe323ae76e6e51d2cbe1b Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 8 Jun 2021 16:37:47 +0200 Subject: gnu: python2-mechanicalsoup: Remove package. * gnu/packages/python-web.scm (python2-mechanicalsoup): Remove variable. Signed-off-by: Leo Famulari --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 81cd4daea2..86a732fa1b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -826,9 +826,6 @@ websites. It automatically stores and sends cookies, follows redirects, and can follow links and submit forms. It doesn’t do JavaScript.") (license license:expat))) -(define-public python2-mechanicalsoup - (package-with-python2 python-mechanicalsoup)) - (define-public python-hyperframe (package (name "python-hyperframe") -- cgit v1.3 From 5c9f614e699342e9e8afb38287c089e6282a99a1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 21 Jun 2021 14:37:46 +0200 Subject: gnu: python-aws-sam-translator: Update to 1.36.0. * gnu/packages/python-web.scm (python-aws-sam-translator): Update to 1.36.0. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 86a732fa1b..43454d4b59 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -362,13 +362,13 @@ WSGI. This package includes libraries for implementing ASGI servers.") (define-public python-aws-sam-translator (package (name "python-aws-sam-translator") - (version "1.30.1") + (version "1.36.0") (source (origin (method url-fetch) (uri (pypi-uri "aws-sam-translator" version)) (sha256 (base32 - "0d9ppd94x2kw404m49ajswmmxgdngbs4p5ajyrdvnlivfzqbv7dx")))) + "115mcbb4r205c1hln199llqrvvbijfqz075rwx991l99jc6rj6zs")))) (build-system python-build-system) (arguments `(;; XXX: Tests are not distributed with the PyPI archive, and would -- cgit v1.3 From 35b31a18beed9b0492d0eb09d03927c30e7b23f9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 21 Jun 2021 14:38:06 +0200 Subject: gnu: python-cfn-lint: Update to 0.51.0. * gnu/packages/python-web.scm (python-cfn-lint): Update to 0.51.0. [arguments]: Delete another test that attempts to access the internet. --- gnu/packages/python-web.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 43454d4b59..d0a4ee9c16 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -465,7 +465,7 @@ emit information from within their applications to the AWS X-Ray service.") (define-public python-cfn-lint (package (name "python-cfn-lint") - (version "0.41.0") + (version "0.51.0") (home-page "https://github.com/aws-cloudformation/cfn-python-lint") (source (origin (method git-fetch) @@ -475,7 +475,7 @@ emit information from within their applications to the AWS X-Ray service.") (file-name (git-file-name name version)) (sha256 (base32 - "0nqs0fmj3hd7pnd9hkb4z57jvi2iv82hh6n3xxba6i6p8zgx75q4")))) + "1027s243sik25c6sqw6gla7k7vl3jdicrik5zdsa8pafxh2baja4")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -486,6 +486,8 @@ emit information from within their applications to the AWS X-Ray service.") ;; to avoid a dependency on 'git'. (delete-file "test/unit/module/maintenance/test_update_documentation.py") + (delete-file + "test/unit/module/maintenance/test_update_resource_specs.py") (setenv "PYTHONPATH" (string-append "./build/lib:" (getenv "PYTHONPATH"))) -- cgit v1.3 From 5d47f30e93268438609acae31b11d31de66bcd57 Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 23 Jun 2021 17:52:30 +0200 Subject: gnu: python2-wsgiproxy2: Remove package. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python2-wsgiproxy2): Remove variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index d0a4ee9c16..5cddd37d5d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2882,9 +2882,6 @@ It also includes code to sign requests and pass private data, and to spawn subprocesses to handle requests.") (license license:expat))) -(define-public python2-wsgiproxy2 - (package-with-python2 python-wsgiproxy2)) - (define-public python-pastedeploy (package (name "python-pastedeploy") -- cgit v1.3 From b4ba0ddc3d206d877dc094347380bf23eaf11fec Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 29 Jun 2021 15:11:13 +0200 Subject: gnu: python2-terminado: Remove package. * gnu/packages/python-web.scm (python2-terminado): Remove variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-web.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 5cddd37d5d..656f310dc1 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1772,17 +1772,7 @@ web framework, either via the basic or digest authentication schemes.") (synopsis "Terminals served to term.js using Tornado websockets") (description "This package provides a Tornado websocket backend for the term.js Javascript terminal emulator library.") - (license license:bsd-2) - (properties `((python2-variant . ,(delay python2-terminado)))))) - -(define-public python2-terminado - (let ((terminado (package-with-python2 (strip-python2-variant python-terminado)))) - (package/inherit terminado - (propagated-inputs - `(("python2-backport-ssl-match-hostname" - ,python2-backport-ssl-match-hostname) - ("python2-futures" ,python2-futures) - ,@(package-propagated-inputs terminado)))))) + (license license:bsd-2))) (define-public python-wsgi-intercept (package -- cgit v1.3 From a5a90a98d8664c92bb8d744abfde6c68c342d364 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Thu, 8 Jul 2021 17:12:46 +0200 Subject: gnu: python-hyperframe: Respect "--without-tests". * gnu/packages/python-web.scm (python-hyperframe)[arguments]<#:phases>{check}: Respect #:tests?. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-web.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 656f310dc1..cdc5c13b09 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2021 Ekaitz Zarraga ;;; Copyright © 2021 Greg Hogan +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -843,9 +844,10 @@ follow links and submit forms. It doesn’t do JavaScript.") `(#:phases (modify-phases %standard-phases (replace 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-vv" "test")))))) + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv" "test"))))))) (native-inputs `(("python-pytest" ,python-pytest))) (home-page "https://github.com/python-hyper/hyperframe") -- cgit v1.3 From a6e70f3f0c5bdeaeba87ee847e94e60be4cfc08d Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Thu, 8 Jul 2021 17:23:53 +0200 Subject: gnu: python-hpack: Respect "--without-tests". * gnu/packages/python-web.scm (python-hpack)[arguments]<#:phases>{check}: Respect #:tests?. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-web.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index cdc5c13b09..acabe00846 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -877,12 +877,13 @@ into HTTP/2 frames.") `(#:phases (modify-phases %standard-phases (replace 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-vv" "test" "-k" - ;; This test will be fixed in the next version. See: - ;; https://github.com/python-hyper/hpack/issues/168. - "not test_get_by_index_out_of_range")))))) + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv" "test" "-k" + ;; This test will be fixed in the next version. See: + ;; https://github.com/python-hyper/hpack/issues/168. + "not test_get_by_index_out_of_range"))))))) (native-inputs `(("python-pytest" ,python-pytest))) (home-page "https://hyper.rtfd.org") -- cgit v1.3 From c46c8531dd35db5af0e37a9230acafa9215080ef Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Thu, 8 Jul 2021 17:24:22 +0200 Subject: gnu: python-h11: Respect "--without-tests". * gnu/packages/python-web.scm (python-h11)[arguments]<#:phases>{check}: Respect #:tests?. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-web.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index acabe00846..d175fbb061 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -908,8 +908,9 @@ for use in Python programs that implement HTTP/2.") `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ - (invoke "pytest" "-vv")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) (native-inputs `(("python-pytest" ,python-pytest))) (home-page "https://github.com/python-hyper/h11") -- cgit v1.3 From f78975c8e098e38494a697aa88c9ca5395975041 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Thu, 8 Jul 2021 17:41:58 +0200 Subject: gnu: python-h2: Respect "--without-tests". * gnu/packages/python-web.scm (python-h2)[arguments]<#:phases>{check}: Respect #:tests?. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-web.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index d175fbb061..8ec6864b8b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -937,9 +937,10 @@ and that could be anything you want.") `(#:phases (modify-phases %standard-phases (replace 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-vv" "test")))))) + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv" "test"))))))) (native-inputs `(("python-pytest" ,python-pytest))) (propagated-inputs -- cgit v1.3 From 139ad8be2c97b2974f23022a1cd11d04e98af16c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 13 Jul 2021 10:19:59 -0400 Subject: gnu: Add python-wsgiprox. * gnu/packages/python-web.scm (python-wsgiprox): New variable. --- gnu/packages/python-web.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 8ec6864b8b..4645e2230b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -5303,6 +5303,46 @@ Plus all the standard features of requests: @end itemize") (license license:bsd-3))) +(define-public python-wsgiprox + (package + (name "python-wsgiprox") + (version "1.5.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "wsgiprox" version)) + (sha256 + (base32 + "11fsm199pvwbmqx2lccznvws65aam1rqqv0w79gal8hispwgd5rs")))) + (build-system python-build-system) + (arguments + ;; The test suite hangs (see: + ;; https://github.com/webrecorder/wsgiprox/issues/6). + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-pytest-argument + (lambda _ + ;; See: https://github.com/webrecorder/wsgiprox/issues/7. + (substitute* "setup.py" + (("--doctest-module") + "--doctest-modules"))))))) + (propagated-inputs + `(("python-certauth" ,python-certauth) + ("python-gevent" ,python-gevent) + ("python-websocket-client" ,python-websocket-client))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest-cov" ,python-pytest-cov) + ("python-waitress" ,python-waitress))) + (home-page "https://github.com/webrecorder/wsgiprox") + (synopsis "HTTP/S proxy with WebSockets over WSGI") + (description "@code{wsgiprox} is a Python WSGI (Web Server Gateway +Interface) middle-ware for adding HTTP and HTTPS proxy support to a WSGI +application. The library accepts HTTP and HTTPS proxy connections, and routes +them to a designated prefix.") + (license license:asl2.0))) + (define-public python-websockets (package (name "python-websockets") -- cgit v1.3 From 89bd7565e8929e67ef788b2342b811615fd41d74 Mon Sep 17 00:00:00 2001 From: swedebugia Date: Mon, 19 Nov 2018 21:37:46 +0100 Subject: gnu: Add python-warcio. * gnu/packages/python-web.scm (python-warcio): New variable. Co-authored-by: Maxim Cournoyer --- gnu/packages/python-web.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 4645e2230b..ecea80444e 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -5343,6 +5343,50 @@ application. The library accepts HTTP and HTTPS proxy connections, and routes them to a designated prefix.") (license license:asl2.0))) +(define-public python-warcio + ;; The PyPI release is missing some test support files (see: + ;; https://github.com/webrecorder/warcio/issues/132). + (let ((revision "0") + (commit "aa702cb321621b233c6e5d2a4780151282a778be")) + (package + (name "python-warcio") + (version (git-version "1.7.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/webrecorder/warcio") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11afr6zy3r6rda81010iq496dazg4xid0izg3smg6ighpmvsnzf2")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-problematic-tests + (lambda _ + ;; These tests fail due to networking requirements. + (substitute* "setup.py" + (("pytest.main\\(\\[" all) + (string-append all "'-k', '" + (string-append "not test_post_chunked and " + "not test_remote") "'")))))))) + (native-inputs + ;; These inputs are required for the test suite. + `(("python-httpbin" ,python-httpbin) + ("python-pytest-cov" ,python-pytest-cov) + ("python-requests" ,python-requests) + ("python-wsgiprox" ,python-wsgiprox))) + (home-page "https://github.com/webrecorder/warcio") + (synopsis "Streaming web archival archive (WARC) library") + (description "warcio is a Python library to read and write the WARC format +commonly used in Web archives. It is designed for fast, low-level access to +web archival content, oriented around a stream of WARC records rather than +files.") + (license license:asl2.0)))) + (define-public python-websockets (package (name "python-websockets") -- cgit v1.3 From 684259dfbc9b9d5ce4c82cef0c1f7ad29cec0fd6 Mon Sep 17 00:00:00 2001 From: jgart Date: Tue, 6 Jul 2021 01:32:00 -0400 Subject: gnu: Add python-flask-misaka. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-flask-misaka): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-web.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index ecea80444e..b75cb5ddfd 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1068,6 +1068,31 @@ Origin Resource Sharing}, making cross-origin AJAX possible.") into Jinja2 by default.") (license license:bsd-3))) +(define-public python-flask-misaka + (package + (name "python-flask-misaka") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Flask-Misaka" version)) + (sha256 + (base32 + "12gm6hq3lvlj0ddw8p6lk5pky8jk3pw758ihffjl49shnnzc68zl")))) + (build-system python-build-system) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-mock" ,python-mock))) + (propagated-inputs + `(("python-flask" ,python-flask) + ("python-misaka" ,python-misaka))) + (home-page "https://github.com/singingwolfboy/flask-misaka/") + (synopsis "Flask interface to Misaka, a Markdown parsing library") + (description + "This package provides an interface between the Flask web framework and +the Misaka Markdown parser.") + (license license:expat))) + (define-public python-flask-session (package (name "python-flask-session") -- cgit v1.3 From 730f11ba929eecfb4fd0322b82997c47fa4a7add Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 30 Jul 2021 16:18:34 +0200 Subject: gnu: python-elasticsearch: Update to 7.13.4. * gnu/packages/python-web.scm (python-elasticsearch): Update to 7.13.4. [native-inputs]: Remove. [propagated-inputs]: Add PYTHON-CERTIFI. --- gnu/packages/python-web.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b75cb5ddfd..b4798ca8c2 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3828,22 +3828,18 @@ CSS tidy. Also supports URL rewriting in CSS files.") (define-public python-elasticsearch (package (name "python-elasticsearch") - (version "7.1.0") + (version "7.13.4") (source (origin (method url-fetch) (uri (pypi-uri "elasticsearch" version)) (sha256 (base32 - "0rnjvlhw4v3vg14l519qliy1s1zpmx3827q0xfviwvk42rr7hh01")))) + "1q38w9nh2j2yi82d8rhzb57597l4lq5zx7xzfg45xf7ffrgsipaj")))) (build-system python-build-system) - (native-inputs - `(("python-mock" ,python-mock) - ("python-nosexcover" ,python-nosexcover) - ("python-pyaml" ,python-pyaml) - ("python-requests" ,python-requests))) (propagated-inputs - `(("urllib3" ,python-urllib3))) + `(("python-certifi" ,python-certifi) + ("python-urllib3" ,python-urllib3))) (arguments ;; tests require the test_elasticsearch module but it is not distributed. `(#:tests? #f)) -- cgit v1.3 From 1c3d7000a75014e80cd292a507035da860160005 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 4 Aug 2021 17:11:45 +0200 Subject: gnu: Add python-azure-nspkg. * gnu/packages/python-web.scm (python-azure-nspkg): New variable. --- gnu/packages/python-web.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b4798ca8c2..3dcacef6b4 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -6153,3 +6153,22 @@ your code non-blocking and speedy.") "Socks is a library providing core proxy (SOCKS4, SOCKS5, HTTP tunneling) functionality.") (license license:asl2.0))) + +(define-public python-azure-nspkg + (package + (name "python-azure-nspkg") + (version "3.0.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "azure-nspkg" version ".zip")) + (sha256 + (base32 + "1l4xwdh0fcnvrv0mzig4g2kgqkfbsy64zjm1ggc6grk3mykcxlz7")))) + (build-system python-build-system) + (native-inputs `(("unzip" ,unzip))) + (home-page "https://github.com/Azure/azure-sdk-for-python") + (synopsis "Azure namespace internals") + (description + "This package is an internal Azure namespace package.") + (license license:expat))) -- cgit v1.3 From 48542e03cfa6eb41de22f723f73bbfbde8329978 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 4 Aug 2021 17:11:52 +0200 Subject: gnu: Add python-azure-storage-nspkg. * gnu/packages/python-web.scm (python-azure-storage-nspkg): New variable. --- gnu/packages/python-web.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 3dcacef6b4..5df134ddff 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -6172,3 +6172,24 @@ your code non-blocking and speedy.") (description "This package is an internal Azure namespace package.") (license license:expat))) + +(define-public python-azure-storage-nspkg + (package + (name "python-azure-storage-nspkg") + (version "3.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "azure-storage-nspkg" version)) + (sha256 + (base32 + "049qcmgshz7dj9yaqma0fwcgbxwddgwyfcw4gmv45xfmaa3bwfvg")))) + (build-system python-build-system) + (propagated-inputs + `(("python-azure-nspkg" ,python-azure-nspkg))) + (home-page "https://github.com/Azure/azure-storage-python") + (synopsis "Microsoft Azure Storage Namespace package") + (description + "This project provides a client library in Python that makes it easy to +communicate with Microsoft Azure Storage services.") + (license license:expat))) -- cgit v1.3 From 1fa4485fb033874fd56b025e8ec998aebc245fe5 Mon Sep 17 00:00:00 2001 From: Mike Rosset Date: Mon, 9 Aug 2021 09:28:02 -0700 Subject: gnu: python-aiorpcx: Update to 0.18.7. * gnu/packages/python-web.scm (python-aiorpcx): Update to 0.18.7. Signed-off-by: Efraim Flashner --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 5df134ddff..f27b9121f9 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -284,14 +284,14 @@ using @url{https://github.com/saghul/pycares,pycares}.") (define-public python-aiorpcx (package (name "python-aiorpcx") - (version "0.18.3") + (version "0.18.7") (source (origin (method url-fetch) (uri (pypi-uri "aiorpcX" version)) (sha256 (base32 - "0k545hc7wl6sh1svydzbv6x7sx5pig2pqkl3yxs9riwmvzawx9xp")))) + "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0")))) (build-system python-build-system) (propagated-inputs `(("python-attrs" ,python-attrs))) -- cgit v1.3 From 59675fef2f327a4d2952bbc398b1299616910c41 Mon Sep 17 00:00:00 2001 From: Milkey Mouse Date: Tue, 10 Aug 2021 00:36:00 -0700 Subject: gnu: python-aiorpcx: Update to 0.22.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/finance.scm (electrum)[inputs]: Use python-aiorpcx-0.18. * gnu/packages/python-web.scm (python-aiorpcx): Update to 0.22.1. (python-aiorpcx-0.18): New variable. Signed-off-by: 宋文武 --- gnu/packages/finance.scm | 2 +- gnu/packages/python-web.scm | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index db02232d3c..430552c3a3 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -523,7 +523,7 @@ do so.") ("python-protobuf" ,python-protobuf) ("python-aiohttp" ,python-aiohttp) ("python-aiohttp-socks" ,python-aiohttp-socks) - ("python-aiorpcx" ,python-aiorpcx) + ("python-aiorpcx" ,python-aiorpcx-0.18) ("python-certifi" ,python-certifi) ("python-bitstring" ,python-bitstring) ("python-attrs" ,python-attrs) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f27b9121f9..441af70f26 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -284,14 +284,14 @@ using @url{https://github.com/saghul/pycares,pycares}.") (define-public python-aiorpcx (package (name "python-aiorpcx") - (version "0.18.7") + (version "0.22.1") (source (origin (method url-fetch) (uri (pypi-uri "aiorpcX" version)) (sha256 (base32 - "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0")))) + "0lx54bcinp44fmr8q4bbffsqbkg8kdcwykf9i5jj0bj3sfzgf9k0")))) (build-system python-build-system) (propagated-inputs `(("python-attrs" ,python-attrs))) @@ -306,6 +306,18 @@ The package includes a module with full coverage of JSON RPC versions 1.0 and comes with a SOCKS proxy client.") (license (list license:expat license:bsd-2)))) +(define-public python-aiorpcx-0.18 + (package + (inherit python-aiorpcx) + (version "0.18.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "aiorpcX" version)) + (sha256 + (base32 + "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0")))))) + (define-public python-asgiref (package (name "python-asgiref") -- cgit v1.3 From 94551439074f804f35970b08435aa02007edfb0b Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Sun, 15 Aug 2021 14:15:37 -0400 Subject: Update copyright/name notices for Christine Lemmer-Webber. * doc/guix-cookbook.texi: Update copyright/name for Christine Lemmer-Webber. * gnu/build/image.scm: Likewise. * gnu/build/vm.scm: Likewise. * gnu/packages/admin.scm: Likewise. * gnu/packages/assembly.scm: Likewise. * gnu/packages/audio.scm: Likewise. * gnu/packages/backup.scm: Likewise. * gnu/packages/check.scm: Likewise. * gnu/packages/databases.scm: Likewise. * gnu/packages/emacs-xyz.scm: Likewise. * gnu/packages/finance.scm: Likewise. * gnu/packages/gnupg.scm: Likewise. * gnu/packages/guile-xyz.scm: Likewise. * gnu/packages/guile.scm: Likewise. * gnu/packages/haskell-xyz.scm: Likewise. * gnu/packages/linux.scm: Likewise. * gnu/packages/mail.scm: Likewise. * gnu/packages/password-utils.scm: Likewise. * gnu/packages/perl.scm: Likewise. * gnu/packages/python-web.scm: Likewise. * gnu/packages/python-xyz.scm: Likewise. * gnu/packages/python.scm: Likewise. * gnu/packages/sphinx.scm: Likewise. * gnu/packages/ssh.scm: Likewise. * gnu/packages/xdisorg.scm: Likewise. * gnu/services/networking.scm: Likewise. * gnu/system/vm.scm: Likewise. --- doc/guix-cookbook.texi | 2 +- gnu/build/image.scm | 2 +- gnu/build/vm.scm | 2 +- gnu/packages/admin.scm | 2 +- gnu/packages/assembly.scm | 2 +- gnu/packages/audio.scm | 2 +- gnu/packages/backup.scm | 2 +- gnu/packages/check.scm | 2 +- gnu/packages/databases.scm | 2 +- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/finance.scm | 2 +- gnu/packages/gnupg.scm | 2 +- gnu/packages/guile-xyz.scm | 2 +- gnu/packages/guile.scm | 2 +- gnu/packages/haskell-xyz.scm | 2 +- gnu/packages/linux.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/password-utils.scm | 2 +- gnu/packages/perl.scm | 2 +- gnu/packages/python-web.scm | 2 +- gnu/packages/python-xyz.scm | 2 +- gnu/packages/python.scm | 2 +- gnu/packages/sphinx.scm | 2 +- gnu/packages/ssh.scm | 2 +- gnu/packages/xdisorg.scm | 2 +- gnu/services/networking.scm | 2 +- gnu/system/vm.scm | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/doc/guix-cookbook.texi b/doc/guix-cookbook.texi index 819dfd8dde..5b1b4b5ea9 100644 --- a/doc/guix-cookbook.texi +++ b/doc/guix-cookbook.texi @@ -16,7 +16,7 @@ Copyright @copyright{} 2020 Matthew Brooks@* Copyright @copyright{} 2020 Marcin Karpezo@* Copyright @copyright{} 2020 Brice Waegeneire@* Copyright @copyright{} 2020 André Batista@* -Copyright @copyright{} 2020 Christopher Lemmer Webber +Copyright @copyright{} 2020 Christine Lemmer-Webber@* Copyright @copyright{} 2021 Joshua Branson@* Permission is granted to copy, distribute and/or modify this document diff --git a/gnu/build/image.scm b/gnu/build/image.scm index 45eed0b298..6eb0290256 100644 --- a/gnu/build/image.scm +++ b/gnu/build/image.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès -;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2020 Tobias Geerinckx-Rice diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index bd59916bf3..7b55127599 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès -;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Marius Bakke diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index eda269f148..007f15f9f5 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2016 John Darrington ;;; Copyright © 2017 Ben Sturmfels ;;; Copyright © 2017 Ethan R. Jones -;;; Copyright © 2017 Christopher Allan Webber +;;; Copyright © 2017 Christine Lemmer-Webber ;;; Copyright © 2017, 2018, 2020 Marius Bakke ;;; Copyright © 2018, 2019 Arun Isaac ;;; Copyright © 2018 Pierre-Antoine Rouby diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 51c0572674..c8576930ff 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2019 Guy Fleury Iteriteka ;;; Copyright © 2019 Andy Tai ;;; Copyright © 2020 Jakub Kądziołka -;;; Copyright © 2020 Christopher Lemmer Webber +;;; Copyright © 2020 Christine Lemmer-Webber ;;; Copyright © 2020 B. Wilson ;;; ;;; This file is part of GNU Guix. diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 5e1c6df6c3..80cd521773 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2019, 2021 Arun Isaac ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2019, 2020 Alexandros Theodotou -;;; Copyright © 2019 Christopher Lemmer Webber +;;; Copyright © 2019 Christine Lemmer-Webber ;;; Copyright © 2019 Jan Wielkiewicz ;;; Copyright © 2019 Hartmt Goebel ;;; Copyright © 2019, 2021 Nicolas Goaziou diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 7d7868ea17..74e3f2ce01 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017, 2020 Efraim Flashner -;;; Copyright © 2017 Christopher Allan Webber +;;; Copyright © 2017 Christine Lemmer-Webber ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Mark H Weaver ;;; Copyright © 2018 Oleg Pykhalov diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 0d0229330e..894d8397e6 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2017 Leo Famulari -;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016 Sou Bunnbu diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index fbff9e8a7c..adb15c03ce 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2015 Leo Famulari ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016 Hartmut Goebel -;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016, 2017, 2018 Roel Janssen diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cbe830062b..0b76b4e64e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018, 2019 Chris Marusich -;;; Copyright © 2015, 2016, 2018, 2020 Christopher Lemmer Webber +;;; Copyright © 2015, 2016, 2018, 2020 Christine Lemmer-Webber ;;; Copyright © 2016 Adriano Peluso ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 David Thompson diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index bae56d9735..0d398a5367 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2019 Sebastian Schott ;;; Copyright © 2020 Kei Kebreau -;;; Copyright © 2020 Christopher Lemmer Webber +;;; Copyright © 2020 Christine Lemmer-Webber ;;; Copyright © 2020 Tom Zander ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020, 2021 Vinicius Monego diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 0eb6aff6e6..f0e87a36bb 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus -;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016 Christopher Baines ;;; Copyright © 2016 Mike Gerwitz diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index f8be5559cb..db31ada7b9 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2014, 2015, 2018 Mark H Weaver -;;; Copyright © 2015, 2017 Christopher Allan Webber +;;; Copyright © 2015, 2017 Christine Lemmer-Webber ;;; Copyright © 2016 Alex Sassmannshausen ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2016 Erik Edrosa diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index f90ea85999..99372c4668 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014 Cyril Roelandt ;;; Copyright © 2014, 2016, 2018 David Thompson ;;; Copyright © 2014, 2017, 2018 Mark H Weaver -;;; Copyright © 2015, 2017 Christopher Allan Webber +;;; Copyright © 2015, 2017 Christine Lemmer-Webber ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2019, 2020 Ricardo Wurmus diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index bb59476795..c12f97802e 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Carlo Holl -;;; Copyright © 2020 Christopher Lemmer Webber +;;; Copyright © 2020 Christine Lemmer-Webber ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0b7a7aa56a..b1f7ab3cb7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2016, 2017, 2018, 2020 Efraim Flashner -;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017 Alex Kost ;;; Copyright © 2016 Raymond Nicholson diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 8917a49c93..ccf44b7cf3 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2015, 2016, 2018 Eric Bavier ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner -;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari ;;; Copyright © 2016 Lukas Gradl diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index b969391ba9..a867fe1d94 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Steve Sprang ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2015 Aljosha Papsch -;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016 Jessica Tallon ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2016 Lukas Gradl diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index db10c44a20..a01d904896 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2017 Adriano Peluso ;;; Copyright © 2017, 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Leo Famulari -;;; Copyright © 2017 Christopher Allan Webber +;;; Copyright © 2017 Christine Lemmer-Webber ;;; Copyright © 2018, 2019 Oleg Pykhalov ;;; Copyright © 2018, 2019 Pierre Neidhardt ;;; Copyright © 2018 Kei Kebreau diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 441af70f26..32b4aa4bf0 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2016, 2019 Hartmut Goebel ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice ;;; Copyright © 2015, 2017 Ben Woodcroft -;;; Copyright © 2015, 2016 Christopher Allan Webber +;;; Copyright © 2015, 2016 Christine Lemmer-Webber ;;; Copyright © 2017 Adriano Peluso ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016 David Craven diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 295d158bd3..56920f68c3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Omar Radwan ;;; Copyright © 2015 Pierre-Antoine Rault ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus -;;; Copyright © 2015, 2016, 2020 Christopher Allan Webber +;;; Copyright © 2015, 2016, 2020 Christine Lemmer-Webber ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2015, 2016 David Thompson ;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4ff3200cc9..3bb57ee2bd 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Omar Radwan ;;; Copyright © 2015 Pierre-Antoine Rault ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus -;;; Copyright © 2015, 2016 Christopher Allan Webber +;;; Copyright © 2015, 2016 Christine Lemmer-Webber ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2015, 2016 David Thompson ;;; Copyright © 2015, 2016, 2017, 2021 Leo Famulari diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 6f1656eb82..a7a3443707 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017 Danny Milosavljevic ;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Frederick M. Muriithi -;;; Copyright © 2017 Christopher Allan Webber +;;; Copyright © 2017 Christine Lemmer-Webber ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019, 2021 Nicolas Goaziou diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 7429d4e956..4ceb437b26 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015, 2016, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2019 Leo Famulari ;;; Copyright © 2016, 2021 Nicolas Goaziou -;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2017 Ricardo Wurmus diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 8c630f3ac8..71c2ea4cbc 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2015 Andy Wingo ;;; Copyright © 2015 xd1le ;;; Copyright © 2015 Florian Paul Schmidt -;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Leo Famulari diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 4e1055609d..7e310b70ec 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2021 Oleg Pykhalov -;;; Copyright © 2021 Christopher Lemmer Webber +;;; Copyright © 2021 Christine Lemmer-Webber ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 Guillaume Le Vaillant ;;; diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 3390f5a88f..0241810897 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès -;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Marius Bakke -- cgit v1.3 From 73f68c1a45bbdbd64633d5cc05f5dcf4080d581a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 11 Sep 2021 19:24:53 -0400 Subject: gnu: python-wtforms: Update to 2.3.3 and adjust arguments+inputs. * gnu/packages/python-web.scm (python-wtforms)[version]: Update to 2.3.3. [phases](remove-django-test): Remove phase. (check): Replace with custom phase. [native-inputs]: Remove unzip. Add python-coverage, python-dateutil, python-pep8 and python-sqlalchemy. [propagated-inputs]: Add python-babel, python-email-validaor and python-markupsafe. Co-authored-by: jgart --- gnu/packages/python-web.scm | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 32b4aa4bf0..bd390d371d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4150,28 +4150,33 @@ addon modules.") (define-public python-wtforms (package (name "python-wtforms") - (version "2.1") + (version "2.3.3") (source (origin (method url-fetch) - (uri (pypi-uri "WTForms" version ".zip")) + (uri (pypi-uri "WTForms" version ".tar.gz")) (sha256 (base32 - "0vyl26y9cg409cfyj8rhqxazsdnd0jipgjw06civhrd53yyi1pzz")))) + "17427m7p9nn9byzva697dkykykwcp2br3bxvi8vciywlmkh5s6c1")))) (build-system python-build-system) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'remove-django-test - ;; Don't fail the tests when the inputs for the optional tests cannot be found. - (lambda _ - (substitute* - "tests/runtests.py" - (("'ext_django.tests', 'ext_sqlalchemy', 'ext_dateutil', 'locale_babel'") "") - (("sys.stderr.write(\"### Disabled test '%s', dependency not found\n\" % name)") "")) - #t))))) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "python" "setup.py" "compile_catalog") + (invoke "coverage" "run" "tests/runtests.py" "--with-pep8"))))))) (native-inputs - `(("unzip" ,unzip))) + `(("python-coverage" ,python-coverage) + ("python-dateutil" ,python-dateutil) + ("python-pep8" ,python-pep8) + ("python-sqlalchemy" ,python-sqlalchemy))) + (propagated-inputs + `(("python-babel" ,python-babel) + ("python-email-validator" ,python-email-validator) + ("python-markupsafe" ,python-markupsafe))) (home-page "http://wtforms.simplecodes.com/") (synopsis "Form validation and rendering library for Python web development") -- cgit v1.3 From 1289d4119e1865fff09d6ff7736655b6ca1e97fc Mon Sep 17 00:00:00 2001 From: Pradana AUMARS Date: Sun, 5 Sep 2021 10:25:14 +0200 Subject: gnu: Add python-w3lib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-w3lib): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-web.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index bd390d371d..9ff819f682 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -43,6 +43,7 @@ ;;; Copyright © 2021 Ekaitz Zarraga ;;; Copyright © 2021 Greg Hogan ;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2021 Pradana Aumars ;;; ;;; This file is part of GNU Guix. ;;; @@ -6210,3 +6211,25 @@ your code non-blocking and speedy.") "This project provides a client library in Python that makes it easy to communicate with Microsoft Azure Storage services.") (license license:expat))) + +(define-public python-w3lib + (package + (name "python-w3lib") + (version "1.22.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "w3lib" version)) + (sha256 + (base32 + "1pv02lvvmgz2qb61vz1jkjc04fgm4hpfvaj5zm4i3mjp64hd1mha")))) + (build-system python-build-system) + (native-inputs + `(("python-six" ,python-six))) + (home-page "https://github.com/scrapy/w3lib") + (synopsis "Python library of web-related functions") + (description + "This is a Python library of web-related functions, such as: remove comments, +or tags from HTML snippets, extract base url from HTML snippets, translate entites +on HTML strings, among other things.") + (license license:bsd-3))) -- cgit v1.3 From 3b13dae8617ddda6125b493957ef13272b58e68c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Sep 2021 19:26:21 +0200 Subject: gnu: python-aws-sam-translator: Update to 1.38.0. * gnu/packages/python-web.scm (python-aws-sam-translator): Update to 1.38.0. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 9ff819f682..2b25cbc1c9 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -376,13 +376,13 @@ WSGI. This package includes libraries for implementing ASGI servers.") (define-public python-aws-sam-translator (package (name "python-aws-sam-translator") - (version "1.36.0") + (version "1.38.0") (source (origin (method url-fetch) (uri (pypi-uri "aws-sam-translator" version)) (sha256 (base32 - "115mcbb4r205c1hln199llqrvvbijfqz075rwx991l99jc6rj6zs")))) + "1djwlsjpbh13m4biglimrm9lq7hmla0k29giay7k3cjsrylxvjhf")))) (build-system python-build-system) (arguments `(;; XXX: Tests are not distributed with the PyPI archive, and would -- cgit v1.3 From ca9f5de1e4a3ac1ac60c7faf3002ad50ed048752 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Sep 2021 19:26:55 +0200 Subject: gnu: python-cfn-lint: Update to 0.54.1. * gnu/packages/python-web.scm (python-cfn-lint): Update to 0.54.1. [arguments]: Run tests verbosely. --- gnu/packages/python-web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 2b25cbc1c9..06c538c5c4 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -479,7 +479,7 @@ emit information from within their applications to the AWS X-Ray service.") (define-public python-cfn-lint (package (name "python-cfn-lint") - (version "0.51.0") + (version "0.54.1") (home-page "https://github.com/aws-cloudformation/cfn-python-lint") (source (origin (method git-fetch) @@ -489,7 +489,7 @@ emit information from within their applications to the AWS X-Ray service.") (file-name (git-file-name name version)) (sha256 (base32 - "1027s243sik25c6sqw6gla7k7vl3jdicrik5zdsa8pafxh2baja4")))) + "161mzzlpbi85q43kwzrj39qb32l6wg6xhnbbd4z860yrfbymsn87")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -507,7 +507,7 @@ emit information from within their applications to the AWS X-Ray service.") (getenv "PYTHONPATH"))) (setenv "PATH" (string-append out "/bin:" (getenv "PATH"))) - (invoke "python" "-m" "unittest" "discover" + (invoke "python" "-m" "unittest" "discover" "-v" "-s" "test"))))))) (native-inputs `(("python-pydot" ,python-pydot) -- cgit v1.3 From d0e23782dff3c93a23be40150adca0419d10c924 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Sep 2021 19:27:45 +0200 Subject: gnu: python-flask-sqlalchemy: Update to 2.5.1. * gnu/packages/python-web.scm (python-flask-sqlalchemy): Update to 2.5.1. --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 06c538c5c4..785669410b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3551,13 +3551,13 @@ applications.") (define-public python-flask-sqlalchemy (package (name "python-flask-sqlalchemy") - (version "2.4.4") + (version "2.5.1") (source (origin (method url-fetch) (uri (pypi-uri "Flask-SQLAlchemy" version)) (sha256 (base32 - "1rgsj49gnx361hnb3vn6c1h17497qh22yc3r70l1r6w0mw71bixz")))) + "04jrx4sjrz1b20j38qk4qin975xwz30krzq59rfv3b3w7ss49nib")))) (build-system python-build-system) (propagated-inputs `(("python-flask" ,python-flask) -- cgit v1.3 From 16110ba476d90d0fb5b2921eb57f42f8faa3623c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Sep 2021 19:28:43 +0200 Subject: gnu: python-wtforms: Adjust for SQLAlchemy >= 1.4. * gnu/packages/python-web.scm (python-wtforms)[arguments]: Add phase to delete test. --- gnu/packages/python-web.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 785669410b..ac9245ac7b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4163,6 +4163,12 @@ addon modules.") (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'delete-bundled-test + (lambda _ + ;; Delete test copied from a third party package that fails + ;; with newer SQLAlchemy. This can be removed for 3.0. + ;; See . + (delete-file "tests/ext_sqlalchemy.py"))) (replace 'check (lambda* (#:key inputs outputs tests? #:allow-other-keys) (when tests? -- cgit v1.3 From 16236cda58565b122e81e1f87a80a3e942ba6a3e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Sep 2021 19:30:21 +0200 Subject: gnu: python-wtforms: Don't run style and coverage tests. Such tests are fragile and does not affect functionality of the package. * gnu/packages/python-web.scm (python-wtforms)[arguments]: In the check phase, disable code coverage and pep8. [native-inputs]: Remove PYTHON-COVERAGE and PYTHON-PEP8. [source](uri): While at it, remove redundant '.tar.gz' argument to PYPI-URI. --- gnu/packages/python-web.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index ac9245ac7b..e1742cf71b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4155,7 +4155,7 @@ addon modules.") (source (origin (method url-fetch) - (uri (pypi-uri "WTForms" version ".tar.gz")) + (uri (pypi-uri "WTForms" version)) (sha256 (base32 "17427m7p9nn9byzva697dkykykwcp2br3bxvi8vciywlmkh5s6c1")))) @@ -4174,11 +4174,9 @@ addon modules.") (when tests? (add-installed-pythonpath inputs outputs) (invoke "python" "setup.py" "compile_catalog") - (invoke "coverage" "run" "tests/runtests.py" "--with-pep8"))))))) + (invoke "python" "tests/runtests.py"))))))) (native-inputs - `(("python-coverage" ,python-coverage) - ("python-dateutil" ,python-dateutil) - ("python-pep8" ,python-pep8) + `(("python-dateutil" ,python-dateutil) ("python-sqlalchemy" ,python-sqlalchemy))) (propagated-inputs `(("python-babel" ,python-babel) -- cgit v1.3 From 7de73cabe8812a07cd88fa38d29c121a994f8490 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Sep 2021 14:38:08 +0200 Subject: gnu: Remove python2-wtforms. This trivial package currently fails to build and has no users in Guix. * gnu/packages/python-web.scm (python2-wtforms): Remove variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e1742cf71b..302e5d6459 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4191,9 +4191,6 @@ for Python web development. It is very similar to the web form API available in Django, but is a standalone package.") (license license:bsd-3))) -(define-public python2-wtforms - (package-with-python2 python-wtforms)) - (define-public python-paste (package (name "python-paste") -- cgit v1.3 From 02c97aaa1ab47da6414785d151035d2fa6d1029f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 25 Sep 2021 02:04:54 -0400 Subject: gnu: python-urllib3/fixed: Update to 1.26.7. * gnu/packages/python-web.scm (python-urllib3/fixed): Update to 1.26.7. --- gnu/packages/python-web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 302e5d6459..ce0e0a605c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2819,14 +2819,14 @@ supports url redirection and retries, and also gzip and deflate decoding.") (define python-urllib3/fixed (package (inherit python-urllib3) - (version "1.26.4") + (version "1.26.7") (source (origin (method url-fetch) (uri (pypi-uri "urllib3" version)) (sha256 (base32 - "0dw9w9bs3hmr5dp3r3h43jyzzb1g1046ag7lj8pqf58i4kvj3c77")))))) + "1kkf6gi8a1fs0dqkf6kpmdpsy97iirvliz8q1krxp8ppaiawd1s9")))))) ;; Some software requires an older version of urllib3, notably Docker. (define-public python-urllib3-1.24 @@ -2839,7 +2839,6 @@ supports url redirection and retries, and also gzip and deflate decoding.") (base32 "1x0slqrv6kixkbcdnxbglvjliwhc1payavxjvk8fvbqjrnasd4r3")))))) - (define-public python2-urllib3 (let ((base (package-with-python2 (strip-python2-variant python-urllib3)))) (package/inherit -- cgit v1.3 From 7a02f68bf33b0f213e6d47f34be82429d6cd2850 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 27 Sep 2021 17:13:23 +0200 Subject: gnu: python-w3lib: Fix typo in description. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-w3lib)[description]: Fix ‘entites’ typo and wrap to 80 characters. --- gnu/packages/python-web.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index ce0e0a605c..b99e358e26 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -6229,7 +6229,7 @@ communicate with Microsoft Azure Storage services.") (home-page "https://github.com/scrapy/w3lib") (synopsis "Python library of web-related functions") (description - "This is a Python library of web-related functions, such as: remove comments, -or tags from HTML snippets, extract base url from HTML snippets, translate entites -on HTML strings, among other things.") + "This is a Python library of web-related functions, such as: remove +comments, or tags from HTML snippets, extract base url from HTML snippets, +translate entities on HTML strings, among other things.") (license license:bsd-3))) -- cgit v1.3