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 d0a4ee9c169..5cddd37d5de 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 5cddd37d5de..656f310dc19 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 656f310dc19..cdc5c13b09f 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 cdc5c13b09f..acabe00846a 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 acabe00846a..d175fbb061e 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 d175fbb061e..8ec6864b8bf 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 8ec6864b8bf..4645e2230bd 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 4645e2230bd..ecea80444ec 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