From 310f83497daf05b7500be5efedecbed336fc4f1a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 26 Jul 2020 16:30:38 +0200 Subject: gnu: python-flask-sqlalchemy: Update to 2.4.4. * gnu/packages/python-web.scm (python-flask-sqlalchemy): Update to 2.4.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 a202873fd0..161c9967e2 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2545,13 +2545,13 @@ applications.") (define-public python-flask-sqlalchemy (package (name "python-flask-sqlalchemy") - (version "2.4.3") + (version "2.4.4") (source (origin (method url-fetch) (uri (pypi-uri "Flask-SQLAlchemy" version)) (sha256 (base32 - "19apnn2m9bl1d1h2nc52pnmiyx993mwzmfjrv04l3wn5hyznyr8b")))) + "1rgsj49gnx361hnb3vn6c1h17497qh22yc3r70l1r6w0mw71bixz")))) (build-system python-build-system) (propagated-inputs `(("python-flask" ,python-flask) -- cgit v1.2.3 From ab8c707dd37ec06f6c80526a2d358a6c632b0888 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 27 Jul 2020 10:34:26 +0300 Subject: gnu: Add python-http-ece. * gnu/packages/python-web.scm (python-http-ece): New variable. --- gnu/packages/python-web.scm | 34 ++++++++++++++++++++++++++++++++++ gnu/packages/web.scm | 1 + 2 files changed, 35 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 161c9967e2..44fe95479f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4393,3 +4393,37 @@ Agent is a web crawler. It uses the list of registered robots from "This module provides an interface that queries the Apache Solr server using a pure Python implementation.") (license license:bsd-3))) + +(define-public python-http-ece + (package + (name "python-http-ece") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/web-push-libs/encrypted-content-encoding") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0bp4cc0xc123i72h80ax3qz3ixfwx3j7pw343kc7i6kdvfi8klx7")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'change-directory + (lambda _ (chdir "python") #t))))) + (propagated-inputs + `(("python-cryptography" ,python-cryptography))) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-flake8" ,python-flake8) + ("python-mock" ,python-mock) + ("python-nose" ,python-nose))) + (home-page "https://github.com/web-push-libs/encrypted-content-encoding") + (synopsis "Encrypted Content Encoding for HTTP") + (description + "This package provices a simple implementation of Encrypted Content +Encoding for HTTP.") + (license license:expat))) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7107c9e0bc..f40ff911e2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -136,6 +136,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages pcre) -- cgit v1.2.3 From 4da627a3ff87c475f27de5b89bb02cfe3b858de7 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Mon, 27 Jul 2020 22:08:16 +0200 Subject: gnu: python-slugify: Update to 4.0.1. * gnu/packages/patches/python-slugify-depend-on-unidecode.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python-web.scm (python-slugify): Update to 4.0.1. [source] Drop patch. Signed-off-by: Marius Bakke --- gnu/local.mk | 1 - .../python-slugify-depend-on-unidecode.patch | 22 ---------------------- gnu/packages/python-web.scm | 6 ++---- 3 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 gnu/packages/patches/python-slugify-depend-on-unidecode.patch (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 73eabef66e..a2a1caa709 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1468,7 +1468,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ %D%/packages/patches/python-robotframework-honor-source-date-epoch.patch \ %D%/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch \ - %D%/packages/patches/python-slugify-depend-on-unidecode.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \ %D%/packages/patches/python-tinycss2-flake8-compat.patch \ %D%/packages/patches/python-unittest2-python3-compat.patch \ diff --git a/gnu/packages/patches/python-slugify-depend-on-unidecode.patch b/gnu/packages/patches/python-slugify-depend-on-unidecode.patch deleted file mode 100644 index 5ac749c19d..0000000000 --- a/gnu/packages/patches/python-slugify-depend-on-unidecode.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/setup.py b/setup.py -index 4800173..6bdd77f 100755 ---- a/setup.py -+++ b/setup.py -@@ -14,8 +14,7 @@ url = 'https://github.com/un33k/python-slugify' - author = 'Val Neekman' - author_email = 'info@neekware.com' - license = 'MIT' --install_requires = ['text-unidecode>=1.3'] --extras_require = {'unidecode': ['Unidecode>=1.1.1']} -+install_requires = ['Unidecode'] - - classifiers = [ - 'Development Status :: 5 - Production/Stable', -@@ -67,7 +66,6 @@ setup( - author_email=author_email, - packages=find_packages(exclude=EXCLUDE_FROM_PACKAGES), - install_requires=install_requires, -- extras_require=extras_require, - classifiers=classifiers, - entry_points={'console_scripts': ['slugify=slugify.slugify:main']}, - ) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 44fe95479f..d1dc907e35 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3522,15 +3522,13 @@ Python.") (define-public python-slugify (package (name "python-slugify") - (version "3.0.4") + (version "4.0.1") (source (origin (method url-fetch) (uri (pypi-uri "python-slugify" version)) (sha256 - (base32 "0dv97yi5fq074q5qyqbin09pmi8ixg36caf5nkpw2bqkd8jh6pap")) - (patches - (search-patches "python-slugify-depend-on-unidecode.patch")))) + (base32 "0w22fapghmzk3xdasc4dn7h8sl58l08d1h5zbf72dh80drv1g9b9")))) (native-inputs `(("python-wheel" ,python-wheel))) (propagated-inputs -- cgit v1.2.3 From 6ce5411aa602ce96ef03381c7403825a43ab673c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 30 Jul 2020 00:29:04 +0200 Subject: gnu: python-slugify: Remove unused input. * gnu/packages/python-web.scm (python-slugify)[native-inputs]: Remove. --- gnu/packages/python-web.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index d1dc907e35..0bdea1b86d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3529,8 +3529,6 @@ Python.") (uri (pypi-uri "python-slugify" version)) (sha256 (base32 "0w22fapghmzk3xdasc4dn7h8sl58l08d1h5zbf72dh80drv1g9b9")))) - (native-inputs - `(("python-wheel" ,python-wheel))) (propagated-inputs `(("python-unidecode" ,python-unidecode))) (arguments -- cgit v1.2.3 From 03239548b8b69c866a7a22b06cc15b8e14684614 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Wed, 5 Aug 2020 12:12:54 -0300 Subject: gnu: Add python-hyperframe. * gnu/packages/python-web.scm (python-hyperframe): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-web.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 0bdea1b86d..a9f63bcf28 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2020 Holger Peters ;;; Copyright © 2020 Noisytoot ;;; Copyright © 2020 Edouard Klein +;;; Copyright © 2020 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -464,6 +465,34 @@ follow links and submit forms. It doesn’t do JavaScript.") (define-public python2-mechanicalsoup (package-with-python2 python-mechanicalsoup)) +(define-public python-hyperframe + (package + (name "python-hyperframe") + (version "5.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "hyperframe" version)) + (sha256 + (base32 "07xlf44l1cw0ghxx46sbmkgzil8vqv8kxwy42ywikiy35izw3xd9")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv" "test")))))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/python-hyper/hyperframe") + (synopsis "HTTP/2 framing layer for Python") + (description + "This library contains the HTTP/2 framing code used in the hyper project. +It provides a pure-Python codebase that is capable of decoding a binary stream +into HTTP/2 frames.") + (license license:expat))) + (define-public python-sockjs-tornado (package (name "python-sockjs-tornado") -- cgit v1.2.3 From 22d112400f4ac3440ebdc663a2559b8d242ac02e Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Wed, 5 Aug 2020 12:12:55 -0300 Subject: gnu: Add python-hpack. * gnu/packages/python-web.scm (python-hpack): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-web.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index a9f63bcf28..857a0e755c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -493,6 +493,40 @@ It provides a pure-Python codebase that is capable of decoding a binary stream into HTTP/2 frames.") (license license:expat))) +(define-public python-hpack + (package + (name "python-hpack") + (version "3.0.0") + (source + (origin + ;; PyPI tarball is missing some files necessary for the tests. + (method git-fetch) + (uri (git-reference + (url "https://github.com/python-hyper/hpack") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0w8hkz50a6lzkmgi41ryicm0mh9ca9cx29pm3s0xlpn0vs29xrmd")))) + (build-system python-build-system) + (arguments + `(#: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")))))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://hyper.rtfd.org") + (synopsis "Pure-Python HPACK header compression") + (description + "This module contains a pure-Python HTTP/2 header encoding (HPACK) logic +for use in Python programs that implement HTTP/2.") + (license license:expat))) + (define-public python-sockjs-tornado (package (name "python-sockjs-tornado") -- cgit v1.2.3 From f8380178d55afceb7a4b7232fee1281111f6c5ce Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Wed, 5 Aug 2020 12:12:56 -0300 Subject: gnu: Add python-h2. * gnu/packages/python-web.scm (python-h2): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-web.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 857a0e755c..f9c8157f0d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -527,6 +527,39 @@ into HTTP/2 frames.") for use in Python programs that implement HTTP/2.") (license license:expat))) +(define-public python-h2 + (package + (name "python-h2") + (version "3.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "h2" version)) + (sha256 + (base32 "051gg30aca26rdxsmr9svwqm06pdz9bv21ch4n0lgi7jsvml2pw7")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv" "test")))))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-hpack" ,python-hpack) + ("python-hyperframe" ,python-hyperframe))) + (home-page "https://github.com/python-hyper/hyper-h2") + (synopsis "HTTP/2 State-Machine based protocol implementation") + (description + "This module contains a pure-Python implementation of a HTTP/2 protocol +stack. It does not provide a parsing layer, a network layer, or any rules +about concurrency. Instead, it's a purely in-memory solution, defined in +terms of data actions and HTTP/2 frames. This is one building block of a full +Python HTTP implementation.") + (license license:expat))) + (define-public python-sockjs-tornado (package (name "python-sockjs-tornado") -- cgit v1.2.3 From fc9be8db2dacc73f46cf380e2b9a9c492386036f Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 16 Aug 2020 17:04:54 -0300 Subject: gnu: Add python-h11. * gnu/packages/python-web.scm (python-h11): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-web.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f9c8157f0d..957c5ceeff 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -527,6 +527,34 @@ into HTTP/2 frames.") for use in Python programs that implement HTTP/2.") (license license:expat))) +(define-public python-h11 + (package + (name "python-h11") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "h11" version)) + (sha256 + (base32 "1qfad70h59hya21vrzz8dqyyaiqhac0anl2dx3s3k80gpskvrm1k")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "pytest" "-vv")))))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/python-hyper/h11") + (synopsis "Pure-Python, bring-your-own-I/O implementation of HTTP/1.1") + (description + "This is a little HTTP/1.1 library written from scratch in Python, heavily +inspired by hyper-h2. It's a bring-your-own-I/O library; h11 contains no IO +code whatsoever. This means you can hook h11 up to your favorite network API, +and that could be anything you want.") + (license license:expat))) + (define-public python-h2 (package (name "python-h2") -- cgit v1.2.3 From 3ede1e4d69121c29fcd2bb16281f013ad17bf109 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 16 Aug 2020 17:07:24 -0300 Subject: gnu: Add python-wsproto. * gnu/packages/python-web.scm (python-wsproto): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-web.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 957c5ceeff..f05658555a 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -996,6 +996,37 @@ teams extension for python-openid.") (define-public python2-openid-teams (package-with-python2 python-openid-teams)) +(define-public python-wsproto + (package + (name "python-wsproto") + (version "0.15.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "wsproto" version)) + (sha256 + (base32 "17gsxlli4w8am1wwwl3k90hpdfa213ax40ycbbvb7hjx1v1rhiv1")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv" "test")))))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-h11" ,python-h11))) + (home-page "https://github.com/python-hyper/wsproto/") + (synopsis "WebSockets state-machine based protocol implementation") + (description + "@code{wsproto} is a pure-Python implementation of a WebSocket protocol +stack. It's written from the ground up to be embeddable in whatever program you +choose to use, ensuring that you can communicate via WebSockets, as defined in +RFC6455, regardless of your programming paradigm.") + (license license:expat))) + (define-public python-tornado (package (name "python-tornado") -- cgit v1.2.3 From e87b063f4c36ee07c70aa8e9cda60f609675804e Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 16 Aug 2020 17:07:25 -0300 Subject: gnu: Add python-priority. * gnu/packages/python-web.scm (python-priority): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-web.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f05658555a..c68609fa5d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -996,6 +996,38 @@ teams extension for python-openid.") (define-public python2-openid-teams (package-with-python2 python-openid-teams)) +(define-public python-priority + (package + (name "python-priority") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "priority" version)) + (sha256 + (base32 "1gpzn9k9zgks0iw5wdmad9b4dry8haiz2sbp6gycpjkzdld9dhbb")))) + (build-system python-build-system) + (arguments + `(#: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 exceeded the Hypothesis deadline. + "not test_period_of_repetition")))))) + (native-inputs + `(("python-hypothesis" ,python-hypothesis) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-xdist" ,python-pytest-xdist))) + (home-page "https://python-hyper.org/projects/priority/en/latest/") + (synopsis "Pure-Python implementation of the HTTP/2 priority tree") + (description + "Priority is a pure-Python implementation of the priority logic for HTTP/2, +set out in RFC 7540 Section 5.3 (Stream Priority).") + (license license:expat))) + (define-public python-wsproto (package (name "python-wsproto") -- cgit v1.2.3 From 6a1f35937a450c22b28bee7432139617437720f9 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 16 Aug 2020 17:07:26 -0300 Subject: gnu: Add python-hypercorn. * gnu/packages/python-web.scm (python-hypercorn): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-web.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index c68609fa5d..1b97d1401d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1059,6 +1059,48 @@ choose to use, ensuring that you can communicate via WebSockets, as defined in RFC6455, regardless of your programming paradigm.") (license license:expat))) +(define-public python-hypercorn + (package + (name "python-hypercorn") + (version "0.10.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Hypercorn" version)) + (sha256 + (base32 "15dgy47a18w2ls3hwykra1cyf7yzxmfjqnsqml482p12cxr2xwqr")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv")))))) + (propagated-inputs + `(("python-h11" ,python-h11) + ("python-h2" ,python-h2) + ("python-priority" ,python-priority) + ("python-toml" ,python-toml) + ("python-typing-extensions" ,python-typing-extensions) + ("python-wsproto" ,python-wsproto))) + (native-inputs + `(("python-hypothesis" ,python-hypothesis) + ("python-mock" ,python-mock) + ("python-pytest" ,python-pytest) + ("python-pytest-asyncio" ,python-pytest-asyncio) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-trio" ,python-pytest-trio) + ("python-trio" ,python-trio))) + (home-page "https://gitlab.com/pgjones/hypercorn/") + (synopsis "ASGI Server based on Hyper libraries") + (description + "Hypercorn is an ASGI web server based on the sans-io hyper, h11, h2, and +wsproto libraries and inspired by Gunicorn. It supports HTTP/1, HTTP/2, +WebSockets (over HTTP/1 and HTTP/2), ASGI/2, and ASGI/3 specifications. It can +utilise asyncio, uvloop, or trio worker types.") + (license license:expat))) + (define-public python-tornado (package (name "python-tornado") -- cgit v1.2.3 From c005550769f0703f0c844f2007ec09f96f000646 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Tue, 25 Aug 2020 19:37:33 +0200 Subject: gnu: Add python-requests-toolbelt-0.9.1. * gnu/packages/python-web.scm (python-requests-toolbelt-0.9.1): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-web.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 1b97d1401d..f7a623ceba 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2003,6 +2003,20 @@ with python-requests.") (define-public python2-requests-toolbelt (package-with-python2 python-requests-toolbelt)) +(define-public python-requests-toolbelt-0.9.1 + (package + (inherit python-requests-toolbelt) + (version "0.9.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "requests-toolbelt" version)) + (sha256 + (base32 + "1h3gm88dcjbd7gm229a7x5qkkhnsqsjz0m0l2xyavm2ab3a8k04n")))) + (arguments + `(;; FIXME: Some tests require network access. + #:tests? #f)))) + (define-public python-oauthlib (package (name "python-oauthlib") -- cgit v1.2.3 From 23c68bd915aa8ef98da39e97e352a97368150b47 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Tue, 25 Aug 2020 19:37:34 +0200 Subject: gnu: Add python-cloudscraper. * gnu/packages/python-web.scm (python-cloudscraper): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-web.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f7a623ceba..52ea88c5c0 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4666,3 +4666,39 @@ using a pure Python implementation.") "This package provices a simple implementation of Encrypted Content Encoding for HTTP.") (license license:expat))) + +(define-public python-cloudscraper + (package + (name "python-cloudscraper") + (version "1.2.46") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cloudscraper" version)) + (sha256 + (base32 + "1br4p648yassywsd7whz1c7s10rwdysnd7wdqfjq9bksqfxrac3r")) + (modules '((guix build utils))) + (snippet + '(with-directory-excursion "cloudscraper" + (for-each delete-file + '("captcha/2captcha.py" + "captcha/9kw.py" + "captcha/anticaptcha.py" + "captcha/deathbycaptcha.py" + "interpreters/js2py.py" + "interpreters/v8.py")) + #t)))) + (build-system python-build-system) + (propagated-inputs + `(("python-requests" ,python-requests) + ("python-requests-toolbelt" ,python-requests-toolbelt-0.9.1) + ("python-pyparsing" ,python-pyparsing-2.4.7))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/venomous/cloudscraper") + (synopsis "Cloudflare anti-bot bypass") + (description + "This module acts as a webbrowser solving Cloudflare's Javascript +challenges.") + (license license:expat))) -- cgit v1.2.3 From 3b3cc55335ab6e3fd92e66b08a218019213bd89b Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 28 Aug 2020 15:37:50 +0200 Subject: gnu: Remove python-requests@2.7. This variable has no dependents anymore. * gnu/packages/python-web.scm (python-requests-2.7): Remove variable. --- gnu/packages/python-web.scm | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 52ea88c5c0..e43c6f7aba 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1898,18 +1898,6 @@ than Python’s urllib2 library.") ("python-idna" ,python-idna-2.7) ,@(package-propagated-inputs python-requests))))) -;; Some software requires an older version of Requests, notably Docker -;; Compose. -(define-public python-requests-2.7 - (package (inherit python-requests) - (version "2.7.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "requests" version)) - (sha256 - (base32 - "0gdr9dxm24amxpbyqpbh3lbwxc2i42hnqv50sigx568qssv3v2ir")))))) - (define-public python2-requests (package-with-python2 python-requests)) -- cgit v1.2.3 From b9f3046eaa21387d7ff4a14574a7ebd0c46e10d9 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 28 Aug 2020 15:54:06 +0200 Subject: gnu: Add python-purl. * gnu/packages/python-web.scm (python-purl): New variable. --- gnu/packages/python-web.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 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 e43c6f7aba..b419c03f7f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2016, 2017 Danny Milosavljevic -;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge +;;; Copyright © 2013, 2014, 2015, 2016, 2020 Andreas Enge ;;; Copyright © 2016, 2017, 2020 Marius Bakke ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2017 Roel Janssen @@ -1856,6 +1856,27 @@ WebSocket usage in Python programs.") ,python2-backport-ssl-match-hostname) ,@(package-native-inputs base)))))) +(define-public python-purl + (package + (name "python-purl") + (version "1.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "purl" version)) + (sha256 + (base32 + "15ibnz1xrh5msmn04j0nr00sz4n7jwx6cwd6zlx99kkz3vpin53m")))) + (build-system python-build-system) + (propagated-inputs `(("python-six" ,python-six))) + (home-page + "https://github.com/codeinthehole/purl") + (synopsis + "Python package for URL manipulation") + (description + "Purl is a Python package for handling URLs.") + (license license:expat))) + (define-public python-requests (package (name "python-requests") -- cgit v1.2.3 From 47ed9ec3b713ab88091b4cc0374091a6fc800288 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 28 Aug 2020 16:27:02 +0200 Subject: gnu: python-requests-mock: Update to 1.8.0. * gnu/packages/python-web.scm (python-requests-mock): Update to 1.8.0. [native-inputs]: Add python-purl and python-pytest and remove python-testtools. --- gnu/packages/python-web.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b419c03f7f..42b2bbc1a1 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1949,14 +1949,14 @@ library.") (define-public python-requests-mock (package (name "python-requests-mock") - (version "1.3.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (pypi-uri "requests-mock" version)) (sha256 (base32 - "0jr997dvk6zbmhvbpcv3rajrgag69mcsm1ai3w3rgk2jdh6rg1mx")))) + "09nj8fmyj7xz2mgwyvbw0fl9zybmx2d3qd2hf529vvjc9s24d3z6")))) (build-system python-build-system) (propagated-inputs `(("python-requests" ,python-requests) @@ -1967,9 +1967,10 @@ library.") ("python-docutils" ,python-docutils) ("python-fixtures" ,python-fixtures) ("python-mock" ,python-mock) + ("python-purl" ,python-purl) + ("python-pytest" ,python-pytest) ("python-sphinx" ,python-sphinx) - ("python-testrepository" ,python-testrepository) - ("python-testtools" ,python-testtools))) + ("python-testrepository" ,python-testrepository))) (home-page "https://requests-mock.readthedocs.org/") (synopsis "Mock out responses from the requests package") (description -- cgit v1.2.3