From ea8a7e824489112b96a0247d2c3728eca918a202 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Jun 2022 23:32:56 +0200 Subject: gnu: python-databricks-cli: Update to 0.17.0. * gnu/packages/python-web.scm (python-databricks-cli): Update to 0.17.0. [arguments]: Enable previously failing test. [propagated-inputs]: Remove PYTHON-CONFIGPARSER. Add PYTHON-PYJWT. --- gnu/packages/python-web.scm | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b4500c6d2f7..cbc2d843ea5 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1808,7 +1808,7 @@ another XPath engine to find the matching elements in an XML or HTML document.") (define-public python-databricks-cli (package (name "python-databricks-cli") - (version "0.14.1") + (version "0.17.0") (home-page "https://github.com/databricks/databricks-cli") (source (origin (method git-fetch) @@ -1816,21 +1816,25 @@ another XPath engine to find the matching elements in an XML or HTML document.") (file-name (git-file-name name version)) (sha256 (base32 - "03w19rzh72jll9phai23wp0c2mlv39qsrv50mhckziy39z60yxh8")))) + "1qwbxnx64kw7lrzlyx3hfbnjxpc19cqvvj0gcrkqpyjsgd08vja0")))) (build-system python-build-system) (arguments - `(#:phases (modify-phases %standard-phases + '(#:phases (modify-phases %standard-phases (replace 'check (lambda _ - (invoke "pytest" "tests" "-vv" - ;; XXX: This fails with newer Pytest - ;; (upstream uses Pytest 3..). - "-k" "not test_get_request_with_list")))))) + (invoke "pytest" "tests" "-vv")))))) (native-inputs - (list ;; For tests. - python-decorator python-mock python-pytest python-requests-mock)) + ;; For tests. + (list python-decorator + python-mock + python-pytest + python-requests-mock)) (propagated-inputs - (list python-click python-configparser python-requests python-six + (list python-click + python-oauthlib + python-pyjwt + python-requests + python-six python-tabulate)) (synopsis "Command line interface for Databricks") (description -- cgit v1.3 From d9b497513f3c2beaa2ba828bc25374e1ffecbe43 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Jun 2022 17:53:07 +0200 Subject: gnu: python-sanic-testing: Fix build. * gnu/packages/python-web.scm (python-sanic-testing)[arguments]: Add #:phases. --- gnu/packages/python-web.scm | 11 ++++++++++- 1 file changed, 10 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 cbc2d843ea5..e4f2c2fa2d6 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -6332,7 +6332,16 @@ the @code{BasicRouter}.") (arguments ;; PyPi sources does not contain tests, recursive dependency on ;; python-sanic. - (list #:tests? #f)) + (list #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'loosen-requirements + (lambda _ + ;; Don't place an upper boundary on httpx version. + ;; https://github.com/sanic-org/sanic-testing/pull/39 + (substitute* "setup.py" + (("httpx>=0\\.18,<0\\.23") + "httpx>=0.18"))))))) (propagated-inputs (list python-httpx python-sanic-bootstrap python-websockets)) (home-page "https://github.com/sanic-org/sanic-testing/") -- cgit v1.3 From 49f5c551fbc8cca189ff7f838cf9236e23e50436 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Jun 2022 00:29:58 +0200 Subject: gnu: python-minio: Update to 7.1.9. * gnu/packages/python-web.scm (python-minio): Update to 7.1.9. [arguments]: Remove trailing #t. [propagated-inputs]: Remove PYTHON-CONFIGPARSER. --- gnu/packages/python-web.scm | 10 ++++------ 1 file changed, 4 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 e4f2c2fa2d6..b0a4384eeb4 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1423,26 +1423,24 @@ C, yielding parse times that can be a thirtieth of the html5lib parse times.") (define-public python-minio (package (name "python-minio") - (version "6.0.0") + (version "7.1.9") (source (origin (method url-fetch) (uri (pypi-uri "minio" version)) (sha256 (base32 - "1cxpa0m7mdvpdbc1g6wlihq6ja4g4paxkl6f3q84bbnx07zpbllp")))) + "02nh865xbf2glxvcy70ir6gkcwqxl119zryfc70q7w0yjvkg64d7")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases (add-before 'check 'disable-failing-tests (lambda _ ;; This test requires network access. - (delete-file "tests/unit/credentials_test.py") - #t))))) + (delete-file "tests/unit/credentials_test.py")))))) (native-inputs (list python-faker python-mock python-nose)) (propagated-inputs - (list python-certifi python-configparser python-dateutil python-pytz - python-urllib3)) + (list python-certifi python-dateutil python-pytz python-urllib3)) (home-page "https://github.com/minio/minio-py") (synopsis "Programmatically access Amazon S3 from Python") (description -- cgit v1.3 From 69bf6319f6326aa79059c0ebca31e7f5bc684bd2 Mon Sep 17 00:00:00 2001 From: jgart Date: Thu, 16 Jun 2022 01:34:41 -0500 Subject: gnu: python-bottle: Update to 0.12.21. * gnu/packages/python-web.scm (python-bottle): Update to 0.12.21. Signed-off-by: Christopher Baines --- 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 b0a4384eeb4..6c121907e67 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4198,13 +4198,13 @@ addon modules.") (define-public python-bottle (package (name "python-bottle") - (version "0.12.19") + (version "0.12.21") (source (origin (method url-fetch) (uri (pypi-uri "bottle" version)) (sha256 - (base32 "0b6s50vc4iad97b6bb3xnyrgajb3nj6n6jbr5p54a4vapky3zmx9")))) + (base32 "0zl8sy4dhafyxqpavy7pjz0qzpakmhgh2qr6pwlw5f82rjv62z3q")))) (build-system python-build-system) (home-page "https://bottlepy.org/") (synopsis "WSGI framework for small web-applications") -- cgit v1.3 From 647ec2ae78c188e90cea968f99deed01bd024ea5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jun 2022 18:56:40 +0200 Subject: gnu: python-requests: Update to 2.28.0. * gnu/packages/python-web.scm (python-requests): Update to 2.28.0. [arguments]: Loosen charset-normalizer requirement. --- gnu/packages/python-web.scm | 15 ++++++++++++--- 1 file changed, 12 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 6c121907e67..04378cd8f30 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2775,13 +2775,13 @@ APIs.") (define-public python-requests (package (name "python-requests") - (version "2.27.1") + (version "2.28.0") (source (origin (method url-fetch) (uri (pypi-uri "requests" version)) (sha256 (base32 - "0qcsbi919d689xqlgyhw9zkppp1fs6k09wwffa3ri6d8smpwbmv8")))) + "0szcvcc1kj7pn7bq7r5jjj0zrllc0vx5vbqyimfqf9dxgqx74s6m")))) (build-system python-build-system) (propagated-inputs (list python-certifi @@ -2790,7 +2790,16 @@ APIs.") python-urllib3)) (arguments ;; FIXME: Some tests require network access. - '(#:tests? #f)) + (list #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'loosen-requirement + (lambda _ + ;; Don't depend on exactly 2.0.0. + ;; https://github.com/psf/requests/pull/6169 + (substitute* '("setup.py" "setup.cfg") + (("charset_normalizer~=2\\.0\\.0") + "charset_normalizer~=2.0"))))))) (home-page "http://python-requests.org/") (synopsis "Python HTTP library") (description -- cgit v1.3 From a4283bf55f790c97bc0d5f935e223185fc14d475 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jun 2022 18:57:38 +0200 Subject: gnu: python-urllib3: Update to 1.26.9. * gnu/packages/python-web.scm (python-urllib3): Update to 1.26.9. --- 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 04378cd8f30..4f67131a2bf 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3045,14 +3045,14 @@ addon for removing tracking fields from URLs.") (define-public python-urllib3 (package (name "python-urllib3") - (version "1.26.8") + (version "1.26.9") (source (origin (method url-fetch) (uri (pypi-uri "urllib3" version)) (sha256 (base32 - "0g18xk7gfm88gr4bp3f58vgvsbzwps3sq2kqhv5xyz9ylvck6z0f")))) + "13j4mkk6vgix4bixfqk3fhydsl3r5f61z94ss4fmwsl0fxjg3fma")))) (build-system python-build-system) (arguments `(#:tests? #f)) (propagated-inputs -- cgit v1.3 From 9a2a77b6ada212e5c47d0e9fe8446130ba632afe Mon Sep 17 00:00:00 2001 From: Luis Henrique Gomes Higino Date: Sat, 18 Jun 2022 17:11:27 -0300 Subject: gnu: grip: Update to 4.6.1. * gnu/packages/python-web.scm (grip): Update to 4.6.1. (arguments): Use a gexp. Signed-off-by: Christopher Baines --- gnu/packages/python-web.scm | 77 ++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 40 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e48e4773df2..6f951595c8c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -52,6 +52,7 @@ ;;; Copyright © 2022 Felix Gruber ;;; Copyright © 2022 Peter Polidoro ;;; Copyright © 2022 Antero Mejr +;;; Copyright © 2022 Luis Henrique Gomes Higino ;;; ;;; This file is part of GNU Guix. ;;; @@ -5179,50 +5180,46 @@ interfaces, inferring which argument is the path, and which is the address.") (license license:expat))) (define-public grip - ;; No release by upstream for quite some time, some bugs fixed since. See: - ;; https://github.com/joeyespo/grip/issues/304 - (let ((commit "27a4d6d87ea1d0ea7f7f120de55baabee3de73e3")) - (package - (name "grip") - (version (git-version "4.5.2" "1" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/joeyespo/grip") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0kx5hgb3q19i4l18a4vqdq9af390xgpk88lp2ay75qi96k0dc68w")))) - (build-system python-build-system) - (propagated-inputs - (list python-docopt - python-flask - python-markdown - python-path-and-address - python-pygments - python-requests)) - (native-inputs - (list python-pytest python-responses)) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (setenv "PATH" (string-append - (getenv "PATH") ":" - (assoc-ref %outputs "out") "/bin")) - (invoke "py.test" "-m" "not assumption")))))) - (home-page "https://github.com/joeyespo/grip") - (synopsis "Preview Markdown files using the GitHub API") - (description "Grip is a command-line server application written in Python + (package + (name "grip") + (version "4.6.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/joeyespo/grip") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vhimd99zw7s1fihwr6yfij6ywahv9gdrfcf5qljvzh75mvzcwh8")))) + (build-system python-build-system) + (propagated-inputs (list python-docopt + python-flask + python-markdown + python-path-and-address + python-pygments + python-requests)) + (native-inputs (list python-pytest python-responses)) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (setenv "PATH" + (string-append (getenv "PATH") ":" + #$output "/bin")) + (invoke "py.test" "-m" "not assumption"))))))) + (home-page "https://github.com/joeyespo/grip") + (synopsis "Preview Markdown files using the GitHub API") + (description + "Grip is a command-line server application written in Python that uses the GitHub Markdown API to render a local Markdown file. The styles and rendering come directly from GitHub, so you'll know exactly how it will appear. Changes you make to the file will be instantly reflected in the browser without requiring a page refresh.") - (license license:expat)))) + (license license:expat))) (define-public python-port-for (package -- cgit v1.3 From aba4cdc87f1146ccb018d73816d4ec950865a9ae Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 12 Jul 2022 13:27:14 +0300 Subject: gnu: python-tornado-6: Honor tests flag. * gnu/packages/python-web.scm (python-tornado-6)[arguments]: Adjust custom 'check phase to honor the #:tests? flag. --- 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 6f951595c8c..87e65f4d369 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2073,9 +2073,9 @@ connection to each user.") '(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ - (invoke "python" "-m" "tornado.test.runtests") - #t))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "tornado.test.runtests"))))))) (native-inputs (list python-certifi)) (home-page "https://www.tornadoweb.org/") -- cgit v1.3 From 79a7c6e81144e34cc6f32b9c022e79f212f7bbb8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 12 Jul 2022 13:40:01 +0300 Subject: gnu: python-tornado-6: Adjust test timeout. * gnu/packages/python-web.scm (python-tornado-6)[arguments]: Adjust custom 'check phase to allow a longer test timeout. --- gnu/packages/python-web.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 87e65f4d369..6bb73fa6d23 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2075,6 +2075,7 @@ connection to each user.") (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? + (setenv "ASYNC_TEST_TIMEOUT" "25") ; Like in tox.ini. (invoke "python" "-m" "tornado.test.runtests"))))))) (native-inputs (list python-certifi)) -- cgit v1.3 From 572ed223abe57b36e9b5de3f456a925a09bd72af Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 16 Jul 2022 17:14:12 +0200 Subject: gnu: python-requests: Update to 2.28.1. * gnu/packages/python-web.scm (python-requests): Update to 2.28.1. [arguments]: Remove #:phases. --- gnu/packages/python-web.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index aa30e42c586..dab6bda0ed0 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2778,13 +2778,13 @@ APIs.") (define-public python-requests (package (name "python-requests") - (version "2.28.0") + (version "2.28.1") (source (origin (method url-fetch) (uri (pypi-uri "requests" version)) (sha256 (base32 - "0szcvcc1kj7pn7bq7r5jjj0zrllc0vx5vbqyimfqf9dxgqx74s6m")))) + "10vrr7bijzrypvms3g2sgz8vya7f9ymmcv423ikampgy0aqrjmbw")))) (build-system python-build-system) (propagated-inputs (list python-certifi @@ -2793,16 +2793,7 @@ APIs.") python-urllib3)) (arguments ;; FIXME: Some tests require network access. - (list #:tests? #f - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'loosen-requirement - (lambda _ - ;; Don't depend on exactly 2.0.0. - ;; https://github.com/psf/requests/pull/6169 - (substitute* '("setup.py" "setup.cfg") - (("charset_normalizer~=2\\.0\\.0") - "charset_normalizer~=2.0"))))))) + '(#:tests? #f)) (home-page "http://python-requests.org/") (synopsis "Python HTTP library") (description -- cgit v1.3 From 543f27caef548d1b0ee1e3c9859bcfa4f0976e78 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Tue, 5 Jul 2022 13:12:43 -0400 Subject: gnu: Add python-msal. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-msal): New variable. Signed-off-by: Ludovic Courtès --- 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 6bb73fa6d23..525c3cc0b05 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2955,6 +2955,38 @@ with python-requests.") adapter for use with the Requests library.") (license license:asl2.0))) +(define-public python-msal + (package + (name "python-msal") + (version "1.18.0") + (home-page + "https://github.com/AzureAD/microsoft-authentication-library-for-python") + (source (origin + (method git-fetch) + ;; Pypi does not have tests. + (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02d9vlvp08q1yffgn7a0y19451py1jly67q5ld6m2d9xidbrvac1")))) + (build-system python-build-system) + (arguments + ;; Tests (all?) rely on network access and only some can be disabled by + ;; setting the environment variable TRAVIS_TAG. + (list #:tests? #f)) + (native-inputs (list python-mock)) + (propagated-inputs (list python-cryptography python-pyjwt python-requests)) + (synopsis "Microsoft Authentication Library (MSAL) for Python") + (description + "The Microsoft Authentication Library for Python enables applications to +integrate with the Microsoft identity platform. It allows you to sign in +users or apps with Microsoft identities (Azure AD, Microsoft Accounts and +Azure AD B2C accounts) and obtain tokens to call Microsoft APIs such as +Microsoft Graph or your own APIs registered with the Microsoft identity +platform. It is built using industry standard OAuth2 and OpenID Connect +protocols.") + (license license:expat))) + (define-public python-oauthlib (package (name "python-oauthlib") -- cgit v1.3 From 44857d4baaa806f5c6e11fff2e0ba3ba1caaeafc Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Tue, 5 Jul 2022 13:13:07 -0400 Subject: gnu: Add oauth2ms. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (oauth2ms): New variable. Signed-off-by: Ludovic Courtès --- 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 525c3cc0b05..7c5e5651c86 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -73,16 +73,20 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system copy) #:use-module (guix build-system python) #:use-module (guix gexp) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages django) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gnupg) #:use-module (gnu packages graphviz) #:use-module (gnu packages groff) #:use-module (gnu packages libevent) @@ -2987,6 +2991,44 @@ platform. It is built using industry standard OAuth2 and OpenID Connect protocols.") (license license:expat))) +(define-public oauth2ms + (let ((commit "a1ef0cabfdea57e9309095954b90134604e21c08") + (revision "0")) + (package + (name "oauth2ms") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/harishkrupo/oauth2ms") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dqi6n4npdrvb42r672n4sl1jl8z5lsk554fwiiihpj0faa9dx64")))) + (build-system copy-build-system) + (arguments + (list #:install-plan #~`(("oauth2ms" "bin/oauth2ms") + ("." #$(string-append "share/doc/" name "-" + version "/") + #:include-regexp ("\\.org$"))) + #:phases #~(modify-phases %standard-phases + (add-after 'install 'wrap-pythonpath + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((path (getenv "GUIX_PYTHONPATH"))) + (wrap-program (string-append #$output + "/bin/oauth2ms") + `("GUIX_PYTHONPATH" ":" prefix + (,path))))))))) + (inputs (list bash-minimal python python-gnupg python-msal python-pyxdg)) + (home-page "https://github.com/harishkrupo/oauth2ms") + (synopsis "XOAUTH2 compatible Microsoft Office 365 token fetcher") + (description + "Oauth2ms can be used to fetch OAuth 2.0 tokens from the Microsoft Identity +endpoint. Additionally, it can encode the token in the XOAUTH2 format to be +used as authentication in IMAP mail servers.") + (license license:asl2.0)))) + (define-public python-oauthlib (package (name "python-oauthlib") -- cgit v1.3