From 6448abe39aea8644ebd2be141ab60bcbc5de085e Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sat, 1 Oct 2022 06:27:23 +0200 Subject: gnu: python-socks: Update to 2.0.3. * gnu/packages/python-web.scm (python-socks): Update to 2.0.3. [arguments]<#:phases>: Remove trailing #t. Signed-off-by: Efraim Flashner --- gnu/packages/python-web.scm | 7 +++---- 1 file changed, 3 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 94544e1e74..f1eb4fb7b5 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -6555,14 +6555,14 @@ your code non-blocking and speedy.") (define-public python-socks (package (name "python-socks") - (version "1.2.4") + (version "2.0.3") (source (origin (method url-fetch) (uri (pypi-uri "python-socks" version)) (sha256 (base32 - "1n6xb18jy41ybgkmamakg6psp3qididd45qknxiggngaiibz43kx")))) + "12msk06c0glljcrx1byd78xgv05lxw81vknqwhn8ccs7an7cmag3")))) (build-system python-build-system) (arguments `(#:tests? #f ; tests not included @@ -6571,8 +6571,7 @@ your code non-blocking and speedy.") (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (invoke "pytest" "tests/" "-s")) - #t))))) + (invoke "pytest" "tests/" "-s"))))))) (propagated-inputs (list python-async-timeout python-curio python-trio)) (native-inputs -- cgit v1.3 From 357bd133d8a6ecb1003ff7edb746ba589b9fe9eb Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sat, 1 Oct 2022 06:27:24 +0200 Subject: gnu: python-aiohttp-socks: Update to 0.7.1. * gnu/packages/python-web.scm (python-aiohttp-socks): Update to 0.7.1. Signed-off-by: Efraim Flashner --- 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 f1eb4fb7b5..2983381cc2 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -56,6 +56,7 @@ ;;; Copyright © 2022 Nicolas Graves ;;; Copyright © 2022 Tomasz Jeneralczyk ;;; Copyright © 2022 msimonin +;;; Copyright © 2022 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -432,14 +433,14 @@ Callback Hell. (define-public python-aiohttp-socks (package (name "python-aiohttp-socks") - (version "0.6.0") + (version "0.7.1") (source (origin (method url-fetch) (uri (pypi-uri "aiohttp_socks" version)) (sha256 (base32 - "04w010bvi719ifpc3sshav95k10hf9nq8czn9yglkj206yxcypdr")))) + "06il43dv6qm858af841vq9qadw6h7qsfs06nnwagmwqyi72cl592")))) (build-system python-build-system) (propagated-inputs (list python-aiohttp python-attrs python-socks)) -- cgit v1.3 From 2070ce84ec3a3c683ff63b984af5cd7a0e813c1c Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 22 Sep 2022 19:44:05 +0000 Subject: gnu: python-aws-sam-translator: Update to 1.51.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-aws-sam-translator): Update to 1.51.0. 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 2983381cc2..09dbebf44c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -564,13 +564,13 @@ WSGI. This package includes libraries for implementing ASGI servers.") (define-public python-aws-sam-translator (package (name "python-aws-sam-translator") - (version "1.40.0") + (version "1.51.0") (source (origin (method url-fetch) (uri (pypi-uri "aws-sam-translator" version)) (sha256 (base32 - "1hq5ggbzcq4k3ks439hki493w4sasgaxns6j5x57xsj822acalmf")))) + "1ywzchc3nk13xh593j7b14qp3y0fdx7cfbdhnm34p39av66xffac")))) (build-system python-build-system) (arguments `(;; XXX: Tests are not distributed with the PyPI archive, and would -- cgit v1.3 From dec74d456365ae2d57213cbf0d0a9fd726600cbe Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 22 Sep 2022 19:44:06 +0000 Subject: gnu: Add python-jschema-to-python. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-jschema-to-python): New variable. Signed-off-by: Ludovic Courtès --- 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 09dbebf44c..2517201722 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -758,6 +758,25 @@ the CloudFormation spec and additional checks. Includes checking valid values for resource properties and best practices.") (license license:expat))) +(define-public python-jschema-to-python + (package + (name "python-jschema-to-python") + (version "1.2.3") + (source (origin + (method url-fetch) + (uri (pypi-uri "jschema_to_python" version)) + (sha256 + (base32 + "14cvaiwm56g0v6p7zviikaa5i9ln3yqy910jmp60hirhbpz19zvn")))) + (build-system python-build-system) + (propagated-inputs (list python-attrs python-jsonpickle python-pbr)) + (native-inputs (list python-pytest)) + (home-page "https://github.com/microsoft/jschema-to-python") + (synopsis "Generate Python classes from a JSON schema.") + (description "This package generates source code for Python classes from a +@url{http://jschema.org,JSchema} JSON schema.") + (license license:expat))) + (define-public python-falcon (package (name "python-falcon") -- cgit v1.3 From 56d8907c5ffbe9422f1b159759653715ded9d45a Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 22 Sep 2022 19:44:07 +0000 Subject: gnu: Add python-sarif-om. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-sarif-om): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-web.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 2517201722..c088f3a8dc 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -777,6 +777,26 @@ for resource properties and best practices.") @url{http://jschema.org,JSchema} JSON schema.") (license license:expat))) +(define-public python-sarif-om + (package + (name "python-sarif-om") + (version "1.0.4") + (source (origin + (method url-fetch) + (uri (pypi-uri "sarif_om" version)) + (sha256 + (base32 + "167gb8xjm0310km3w1s12bqldbv7zyklkr4j5900vq4361ml2pyd")))) + (build-system python-build-system) + (propagated-inputs (list python-attrs)) + (native-inputs (list python-pbr)) + (home-page "https://github.com/microsoft/sarif-python-om") + (synopsis "Python implementation of the SARIF 2.1.0 object model.") + (description "This module contains classes for the object model defined +by the @url{https://sarifweb.azurewebsites.net,Static Analysis Results +Interchange Format (SARIF)} file format.") + (license license:expat))) + (define-public python-falcon (package (name "python-falcon") -- cgit v1.3 From 35c92a63245ff214dbd7fe8910b6ef8a01280e18 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 22 Sep 2022 19:44:08 +0000 Subject: gnu: python-cfn-lint: Update to 0.65.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-cfn-lint): Update to 0.65.0. [arguments]<#:phases>: Add 'skip-network-test. [propagated-inputs]: Add python-importlib-resources, python-jschema-to-python, python-sarif-om. Signed-off-by: Ludovic Courtès --- gnu/packages/python-web.scm | 12 ++++++++++-- 1 file changed, 10 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 c088f3a8dc..1f0b43d1ad 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -711,7 +711,7 @@ decode and default on encode. (define-public python-cfn-lint (package (name "python-cfn-lint") - (version "0.54.3") + (version "0.65.0") (home-page "https://github.com/aws-cloudformation/cfn-lint") (source (origin (method git-fetch) @@ -721,11 +721,16 @@ decode and default on encode. (file-name (git-file-name name version)) (sha256 (base32 - "106qf19n2k6sdjkb4006aidibd24qqiw901c1613xgjpnyw4dyl6")))) + "1rfacp39jssrbchrzb49vwrqyzhx5v7jfcgngqnb9r7qfs4bwi3w")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'skip-network-test + (lambda _ + ;; This test requires networking. + (substitute* "test/unit/module/formatters/test_formatters.py" + (("def test_sarif_formatter") "def _test_sarif_formatter")))) (replace 'check (lambda* (#:key inputs outputs tests? #:allow-other-keys) (when tests? @@ -745,11 +750,14 @@ decode and default on encode. (list python-pydot python-mock)) (propagated-inputs (list python-aws-sam-translator + python-importlib-resources + python-jschema-to-python python-jsonpatch python-jsonschema python-junit-xml python-networkx python-pyyaml + python-sarif-om python-six)) (synopsis "Validate CloudFormation templates") (description -- cgit v1.3 From 58f6b246a6c3f3cf1cfdcce6bd2cdb3a26c23c9b Mon Sep 17 00:00:00 2001 From: Zzull Date: Sat, 24 Sep 2022 18:09:53 +0200 Subject: gnu: Add awscli-2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (awscli-2): New variable. Signed-off-by: Ludovic Courtès --- 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 1f0b43d1ad..6a9d6ee61d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -57,6 +57,7 @@ ;;; Copyright © 2022 Tomasz Jeneralczyk ;;; Copyright © 2022 msimonin ;;; Copyright © 2022 Michael Rohleder +;;; Copyright © 2022 Baptiste Strazzulla ;;; ;;; This file is part of GNU Guix. ;;; @@ -3262,6 +3263,26 @@ supports url redirection and retries, and also gzip and deflate decoding.") Amazon Web Services (AWS) API.") (license license:asl2.0))) +(define-public awscli-2 + (package + (inherit awscli) + (name "awscli") + (version "2.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri (string-append name "v2") version)) + (sha256 + (base32 + "0g1icsy2l4n540gnhliypy830dfp08hpfc3rk12dlxgc9v3ra4wl")))) + (arguments + ;; FIXME: The 'pypi' release does not contain tests. + '(#:tests? #f)) + (inputs + (list python-importlib-resources + python-executor)))) + + (define-public python-wsgiproxy2 (package (name "python-wsgiproxy2") -- cgit v1.3 From 3c685772deb56010803e0f5d4d2d10f1b7a24064 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Oct 2022 00:12:03 +0200 Subject: gnu: python-openapi-schema-validator: Use pyproject-build-system. * gnu/packages/python-web.scm (python-openapi-schema-validator)[build-system]: Set to PYPROJECT-BUILD-SYSTEM. [arguments]: Remove redundant phases. [native-inputs]: Remove PYTHON-PYPA-BUILD. --- gnu/packages/python-web.scm | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index f5625cc305..370245de3a 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -79,6 +79,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system copy) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix gexp) #:use-module (guix utils) @@ -1601,7 +1602,7 @@ is Python’s.") (sha256 (base32 "1swm8h74nhg63nxk347blwq9f1qn6iiq3zisndcvm7axkq3pc2df")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list #:phases @@ -1609,21 +1610,8 @@ is Python’s.") (add-after 'unpack 'remove-coverage-pytest-options (lambda _ (substitute* "pyproject.toml" - (("^--cov.*") "")))) - ;; XXX: PEP 517 manual build copied from python-isort. - (replace 'build - (lambda _ - (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest")))) - (replace 'install - (lambda _ - (let ((whl (car (find-files "dist" "\\.whl$")))) - (invoke "pip" "--no-cache-dir" "--no-input" - "install" "--no-deps" "--prefix" #$output whl))))))) - (native-inputs (list python-poetry-core python-pypa-build python-pytest)) + (("^--cov.*") ""))))))) + (native-inputs (list python-poetry-core python-pytest)) (propagated-inputs (list python-isodate python-jsonschema -- cgit v1.3 From 5e17453f189a7cb2958d50774e4e50686f0b6442 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Oct 2022 00:15:23 +0200 Subject: gnu: python-openapi-spec-validator: Use pyproject-build-system. * gnu/packages/python-web.scm (python-openapi-spec-validator)[build-system]: Set to PYPROJECT-BUILD-SYSTEM. [arguments]: Add #:test-flags. Remove obsolete phases. [native-inputs]: Remove PYTHON-PYPA-BUILD. --- gnu/packages/python-web.scm | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 370245de3a..cbc515fc64 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1643,33 +1643,19 @@ JSON Schema Specification Draft 2020-12. (sha256 (base32 "1q09sjh4hsc0c8yqbd97h5mp6rwh427y6zyn8kv8wljk6sa0fs4q")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list + ;; The example tests attempt to fetch resources from the Internet + ;; (see: https://github.com/p1c2u/openapi-spec-validator/issues/151). + #:test-flags #~'("-vv" "-k" "not Example and not Exampe") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'remove-coverage-pytest-options (lambda _ (substitute* "pyproject.toml" - (("^--cov.*") "")))) - ;; XXX: PEP 517 manual build copied from python-isort. - (replace 'build - (lambda _ - (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-vv" - ;; The example tests attempt to fetch resources from - ;; the Internet (see: - ;; https://github.com/p1c2u/openapi-spec-validator/issues/151). - "-k" "not Example and not Exampe")))) - (replace 'install - (lambda _ - (let ((whl (car (find-files "dist" "\\.whl$")))) - (invoke "pip" "--no-cache-dir" "--no-input" - "install" "--no-deps" "--prefix" #$output whl))))))) - (native-inputs (list python-poetry-core python-pypa-build python-pytest)) + (("^--cov.*") ""))))))) + (native-inputs (list python-poetry-core python-pytest)) (propagated-inputs (list python-jsonschema python-openapi-schema-validator -- cgit v1.3 From e944734ef9afa1ac9b46579934482b7d909ed24e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 27 Oct 2022 20:31:38 +0200 Subject: build-system/pyproject: Always run tests verbosely for supported backends. * guix/build-system/pyproject.scm (pyproject-build): Default to '() instead of #false for TEST-FLAGS. * guix/build/pyproject-build-system.scm (check): Unconditionally enable verbose test flags. * doc/guix.texi (Build Systems): Document this change. * gnu/packages/fontutils.scm (python-glyphslib)[arguments]: Remove verbosity from #:test-flags. * gnu/packages/pdf.scm (python-pydyf, weasyprint)[arguments]: Likewise. * gnu/packages/python-web.scm (python-openapi-spec-validator)[arguments]: Likewise. * gnu/packages/python-xyz.scm (python-path, python-tempora)[arguments]: Likewise. --- doc/guix.texi | 5 +++-- gnu/packages/fontutils.scm | 3 +-- gnu/packages/pdf.scm | 4 ++-- gnu/packages/python-web.scm | 2 +- gnu/packages/python-xyz.scm | 4 ++-- guix/build-system/pyproject.scm | 2 +- guix/build/pyproject-build-system.scm | 12 +++++++----- 7 files changed, 17 insertions(+), 15 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/doc/guix.texi b/doc/guix.texi index 3bfb89bc33..80fb3bc47f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9332,8 +9332,9 @@ to guess the appropriate backend based on @file{pyproject.toml}. @code{#:test-backend} is added. It defaults to @code{#false} and will guess an appropriate test backend based on what is available in package inputs. @item -@code{#:test-flags} is added. The default is @code{#false}, and varies based -on the detected @code{#:test-backend}. +@code{#:test-flags} is added. The default is @code{'()}. These flags are +passed as arguments to the test command. Note that flags for verbose output +is always enabled on supported backends. @end itemize It is considered ``experimental'' in that the implementation details are diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index df3774e977..368aad49d6 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -598,8 +598,7 @@ process. FontParts is the successor of RoboFab.") (build-system pyproject-build-system) (arguments (list - #:test-flags #~'("-vv" - ;; These fail because the test data has not yet been + #:test-flags #~'(;; These fail because the test data has not yet been ;; updated for newer FontTools: ;; https://github.com/googlefonts/glyphsLib/issues/787 ;; Re-enable for versions > 6.0.7. diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 95cc3b1e22..070dc59ac0 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -739,7 +739,7 @@ extracting content or merging files.") (build-system pyproject-build-system) (arguments (list - #:test-flags #~'("-vv" "-c" "/dev/null"))) + #:test-flags #~'("-c" "/dev/null"))) (propagated-inputs (list python-pillow)) (native-inputs (list ghostscript @@ -1500,7 +1500,7 @@ manipulating PDF documents from the command line. It supports (build-system pyproject-build-system) (arguments (list - #:test-flags #~(list "-vv" "-c" "/dev/null" + #:test-flags #~(list "-c" "/dev/null" "-n" (number->string (parallel-job-count))) #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index cbc515fc64..59d677ca35 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1648,7 +1648,7 @@ JSON Schema Specification Draft 2020-12. (list ;; The example tests attempt to fetch resources from the Internet ;; (see: https://github.com/p1c2u/openapi-spec-validator/issues/151). - #:test-flags #~'("-vv" "-k" "not Example and not Exampe") + #:test-flags #~'("-k" "not Example and not Exampe") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'remove-coverage-pytest-options diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 18089d090e..1c2f9d7b73 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12753,7 +12753,7 @@ invoked on those path objects directly.") ((#:tests? _ #f) (not (%current-target-system))) ((#:test-flags flags #~'()) - #~(append (list "-vv" "-k" + #~(append (list "-k" (string-append ;; Do not test the myproject.toml build as it tries ;; to pull dependencies from the Internet. @@ -21366,7 +21366,7 @@ particularly convenient for use in tests.") (arguments ;; Do not test the myproject.toml build as it tries to pull ;; dependencies from the Internet. - (list #:test-flags #~'("-vv" "-k" "not project"))) + (list #:test-flags #~'("-k" "not project"))) (native-inputs (list python-freezegun python-pytest diff --git a/guix/build-system/pyproject.scm b/guix/build-system/pyproject.scm index 1e365d4f21..8f3b562ca3 100644 --- a/guix/build-system/pyproject.scm +++ b/guix/build-system/pyproject.scm @@ -95,7 +95,7 @@ (configure-flags ''()) (build-backend #f) (test-backend #f) - (test-flags #f) + (test-flags ''()) (phases '%standard-phases) (outputs '("out" "wheel")) (search-paths '()) diff --git a/guix/build/pyproject-build-system.scm b/guix/build/pyproject-build-system.scm index b969dd0379..c69ccc9d64 100644 --- a/guix/build/pyproject-build-system.scm +++ b/guix/build/pyproject-build-system.scm @@ -158,14 +158,16 @@ builder.build_wheel(sys.argv[2], config_settings=config_settings)" (format #t "Using ~a~%" use-test-backend) (match use-test-backend ('pytest - (apply invoke (cons pytest (or test-flags '("-vv"))))) + (apply invoke pytest "-vv" test-flags)) ('nose - (apply invoke (cons nosetests (or test-flags '("-v"))))) + (apply invoke nosetests "-v" test-flags)) ('nose2 - (apply invoke (cons nose2 (or test-flags '("-v" "--pretty-assert"))))) + (apply invoke nose2 "-v" "--pretty-assert" test-flags)) ('setup.py - (apply invoke (append '("python" "setup.py") - (or test-flags '("test" "-v"))))) + (apply invoke "python" "setup.py" + (if (null? test-flags) + '("test" "-v") + test-flags))) ;; The developer should explicitly disable tests in this case. (else (raise (condition (&test-system-not-found)))))) (format #t "test suite not run~%"))) -- cgit v1.3 From 15ff5eebb6109159a9ea4afd8cc942d9e0113148 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 31 Oct 2022 17:08:32 -0700 Subject: gnu: Fix various lint issues in synopsis and descriptions. * gnu/packages/android.scm (etc1tool)[synopsis]: Drop trailing period. * gnu/packages/bioinformatics.scm (mudskipper)[synopsis]: Likewise. * gnu/packages/crates-io.scm (rust-async-log-attributes-1)[synopsis]: Likewise. (rust-atomic-polyfill-1)[synopsis]: Likewise. (rust-modifier-0.1)[synopsis]: Likewise. (rust-openssl-macros-0.1)[synopsis]: Likewise. (rust-syn-mid-0.5)[synopsis]: Likewise. (rust-toml-edit-0.14)[synopsis]: Likewise. (rust-valuable-derive-0.1)[synopsis]: Likewise. (rust-inflections-1)[synopsis]: Likewise. * gnu/packages/databases.scm (python-databases)[synopsis]: Likewise. * gnu/packages/games.scm (liquidwar6)[synopsis]: Likewise. * gnu/packages/golang.scm (go-golang.org-x-sync-errgroup)[synopsis]: Likewise. * gnu/packages/guile-xyz.scm (guile-config)[synopsis]: Likewise. * gnu/packages/haskell-web.scm (ghc-hxt-xpath)[synopsis]: Likewise. * gnu/packages/haskell-xyz.scm (ghc-string-qq)[synopsis]: Likewise. * gnu/packages/machine-learning.scm (python-lap)[synopsis]: Likewise. (python-pyro-api)[synopsis]: Likewise. * gnu/packages/messaging.scm (python-librecaptcha)[synopsis]: Likewise. * gnu/packages/python-check.scm (python-pytest-cram)[synopsis]: Likewise. * gnu/packages/python-web.scm (python-jschema-to-python)[synopsis]: Likewise. (python-sarif-om)[synopsis]: Likewise. (python-socksio)[synopsis]: Likewise. (python-msrest)[synopsis]: Likewise. * gnu/packages/tor.scm (torsocks)[synopsis]: Likewise. * gnu/packages/cran.scm (r-rlist)[synopsis]: Remove leading article. * gnu/packages/crates-io.scm (rust-clippy-lints-0.0.153)[synopsis]: Likewise. (rust-simplelog-0.11)[synopsis]: Likewise. * gnu/packages/samba.scm (wsdd)[synopsis]: Likewise. * gnu/packages/crates-io.scm (rust-spki-0.4)[synopsis]: Remove trailing whitespace. * gnu/packages/golang.scm (go-github-com-mattn-go-zglob)[description]: Remove leading whitespace. * gnu/packages/haskell-check.scm (ghc-crypto-cipher-tests)[description]: Likewise. * gnu/packages/lisp-xyz.scm (sbcl-ctype)[synopsis]: Remove trailing whitespace. * gnu/packages/mpi.scm (openmpi-thread-multiple)[description]: Remove leading whitespace. * gnu/packages/node-xyz.scm (node-string-decoder)[synopsis]: Remove trailing whitespace. --- gnu/packages/android.scm | 2 +- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/cran.scm | 2 +- gnu/packages/crates-io.scm | 22 +++++++++++----------- gnu/packages/databases.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/golang.scm | 4 ++-- gnu/packages/guile-xyz.scm | 2 +- gnu/packages/haskell-check.scm | 2 +- gnu/packages/haskell-web.scm | 2 +- gnu/packages/haskell-xyz.scm | 2 +- gnu/packages/lisp-xyz.scm | 2 +- gnu/packages/machine-learning.scm | 4 ++-- gnu/packages/messaging.scm | 2 +- gnu/packages/mpi.scm | 2 +- gnu/packages/node-xyz.scm | 2 +- gnu/packages/python-check.scm | 2 +- gnu/packages/python-web.scm | 8 ++++---- gnu/packages/samba.scm | 2 +- gnu/packages/tor.scm | 2 +- 20 files changed, 35 insertions(+), 35 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 91aaba089f..881b75d763 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -872,7 +872,7 @@ algorithm.") ("libpng" ,libpng))) (home-page "https://developer.android.com/studio/command-line/etc1tool.html") (synopsis "Encode and decode PNG images to resp. from the ETC1 compression -standard.") +standard") (description "@command{etc1} is a command line utility that lets you encode PNG images to the ETC1 compression standard and decode ETC1 compressed images back to diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1def92ca48..7eae8d9cb2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16525,7 +16525,7 @@ assembly (small or mammalian size) and single-cell assembly.") (inputs (list zlib xz)) (home-page "https://github.com/OceanGenomics/mudskipper") - (synopsis "Convert genomic alignments to transcriptomic BAM/RAD files.") + (synopsis "Convert genomic alignments to transcriptomic BAM/RAD files") (description "Mudskipper is a tool for projecting genomic alignments to transcriptomic coordinates.") (license license:bsd-3))) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9bdeba3c28..036674b0f0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -29860,7 +29860,7 @@ sliding windows are to be created.") (build-system r-build-system) (propagated-inputs (list r-data-table r-jsonlite r-xml r-yaml)) (home-page "https://renkun-ken.github.io/rlist/") - (synopsis "A Toolbox for Non-Tabular Data Manipulation") + (synopsis "Toolbox for Non-Tabular Data Manipulation") (description "This package provides a set of functions for data manipulation with list objects, including mapping, filtering, grouping, sorting, updating, diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b216ed0baf..0c15b23b93 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4427,7 +4427,7 @@ asynchronous logging.") ("rust-syn" ,rust-syn-0.15)))) (home-page "https://github.com/rustasync/runtime") (synopsis - "Proc Macro attributes for the async-log crate.") + "Proc Macro attributes for the async-log crate") (description "This package provides proc macro attributes for the @code{async-log} crate.") @@ -4901,7 +4901,7 @@ methods.") `(#:cargo-inputs (("rust-critical-section" ,rust-critical-section-1)))) (home-page "https://github.com/embassy-rs/atomic-polyfill") - (synopsis "Atomic polyfills, for targets where they're not available.") + (synopsis "Atomic polyfills, for targets where they're not available") (description "This package provides atomic polyfills, for targets where they're not available.") (license (list license:expat license:asl2.0)))) @@ -10734,7 +10734,7 @@ pitfalls in Rust.") ("rust-toml" ,rust-toml-0.4) ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)))) (home-page "https://github.com/rust-lang-nursery/rust-clippy") - (synopsis "A bunch of helpful lints to avoid common pitfalls in Rust") + (synopsis "helpful lints to avoid common pitfalls in Rust") (description "This package provides a bunch of helpful lints to avoid common pitfalls in Rust") @@ -33238,7 +33238,7 @@ checking.") (build-system cargo-build-system) (home-page "https://github.com/reem/rust-modifier") (synopsis - "Chaining APIs for both self -> Self and &mut self methods.") + "Chaining APIs for both self -> Self and &mut self methods") (description "Chaining APIs for both self -> Self and &mut self methods.") (license license:expat))) @@ -37176,7 +37176,7 @@ the default program configured on the system.") ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))) (home-page "https://github.com/sfackler/rust-openssl") - (synopsis "Internal macros used by the openssl crate.") + (synopsis "Internal macros used by the openssl crate") (description "This package provides internal macros used by the openssl crate.") (license (list license:expat license:asl2.0)))) @@ -52506,7 +52506,7 @@ diff output.") ("rust-paris" ,rust-paris-1) ("rust-termcolor" ,rust-termcolor-1)))) (home-page "https://github.com/drakulix/simplelog.rs") - (synopsis "A simple and easy-to-use logging facility for Rust's log crate") + (synopsis "simple and easy-to-use logging facility for Rust's log crate") (description "This package provides a simple and easy-to-use logging facility for Rust's @code{log} crate. It aims to be a maintainable, easy to integrate facility for @@ -53968,7 +53968,7 @@ SPIR-V.") (arguments `(#:skip-build? #t #:cargo-inputs (("rust-der" ,rust-der-0.4)))) (home-page "https://github.com/RustCrypto/formats/tree/master/spki") (synopsis - "X.509 Subject Public Key Info (RFC5280) describing public keys ") + "X.509 Subject Public Key Info (RFC5280) describing public keys") (description "This package provides X.509 Subject Public Key Info (RFC5280) describing public keys as well as their associated AlgorithmIdentifiers (i.e. @@ -55927,7 +55927,7 @@ a syntax tree of Rust source code.") ("rust-quote" ,rust-quote-1)))) (home-page "https://github.com/taiki-e/syn-mid") (synopsis - "Provide the features between \"full\" and \"derive\" of syn.") + "Provide the features between \"full\" and \"derive\" of syn") (description "This package provides the features between \"full\" and \"derive\" of syn.") (license (list license:asl2.0 license:expat)))) @@ -60718,7 +60718,7 @@ serializing Rust structures.") ("rust-pretty-assertions" ,rust-pretty-assertions-1) ("rust-snapbox" ,rust-snapbox-0.2)))) (home-page "https://github.com/ordian/toml_edit") - (synopsis "Yet another format-preserving TOML parser.") + (synopsis "Yet another format-preserving TOML parser") (description "This package provides yet another format-preserving TOML parser.") (license (list license:expat license:asl2.0)))) @@ -64080,7 +64080,7 @@ a part of rav1e.") ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))) (home-page "https://github.com/tokio-rs/valuable") - (synopsis "Macros for the valuable crate.") + (synopsis "Macros for the valuable crate") (description "This package provides macros for the @code{valuable} crate.") (license license:expat))) @@ -68211,7 +68211,7 @@ Rust.") (build-system cargo-build-system) (home-page #f) (synopsis - "High performance inflection transformation library for changing properties of words like the case.") + "High performance inflection transformation library for changing properties of words like the case") (description "High performance inflection transformation library for changing properties of words like the case.") (license license:expat))) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 2316287902..afb6b71ef0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3659,7 +3659,7 @@ managers for automatically closing connections.") python-asyncmy python-sqlalchemy)) (home-page "https://github.com/encode/databases") - (synopsis "Async database support for Python.") + (synopsis "Async database support for Python") (description "This package implements async database support for Python.") (license license:bsd-3))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 56d4ad2d87..8ed4067deb 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -11121,7 +11121,7 @@ meant to be quick and fun.") (string-append "CPPFLAGS=" "-I" #$(this-package-input "sdl-union") "/include/SDL")))) - (synopsis "Liquid War 6 is a unique multiplayer wargame.") + (synopsis "Liquid War 6 is a unique multiplayer wargame") (description "Liquid War 6 is a unique multiplayer war game. Your army is a blob of liquid and you have to try and eat your opponents. Rules are very simple yet diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 98e245478e..e52161228e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6637,7 +6637,7 @@ create or replace a file or symbolic link.") '(#:import-path "golang.org/x/sync/errgroup" #:unpack-path "golang.org/x/sync")) (synopsis "Synchronization, error propagation, and Context cancellation -for groups of goroutines working on subtasks of a common task.") +for groups of goroutines working on subtasks of a common task") (description "This package provides synchronization, error propagation, and Context cancellation for groups of goroutines working on subtasks of a common task.") @@ -6795,7 +6795,7 @@ data serialization format.") `(#:import-path "github.com/mattn/go-zglob")) (home-page "https://github.com/mattn/go-zglob") (synopsis "Glob library that descends into other directories") - (description " A glob library that implements descending into other + (description "A glob library that implements descending into other directories. It is optimized for filewalking.") (license license:expat))) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 209ba694d7..623289f32c 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1639,7 +1639,7 @@ for MySQL.") (list autoconf automake pkg-config texinfo)) (inputs (list guile-3.0)) (synopsis - "Guile application configuration parsing library.") + "Guile application configuration parsing library") (description "Guile Config is a library providing a declarative approach to application configuration specification. The library provides clean diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 62433cdb15..affe6a07b5 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -899,7 +899,7 @@ minimal dependencies.") ghc-crypto-cipher-types)) (home-page "https://github.com/vincenthz/hs-crypto-cipher") (synopsis "Generic cryptography cipher tests for Haskell") - (description " This Haskell package contains generic tests for + (description "This Haskell package contains generic tests for cryptographic ciphers, and is used by the test runners of various Haskell implementations of cryptographic ciphers.") (license license:bsd-3))) diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 0e82d65e27..d2f706f222 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1555,7 +1555,7 @@ introduces a more general approach for processing XML with Haskell.") (build-system haskell-build-system) (inputs (list ghc-hxt)) (home-page "https://github.com/UweSchmidt/hxt") - (synopsis "The XPath modules for HXT.") + (synopsis "The XPath modules for HXT") (description "This extension for the Haskell XML Toolbox defines data types to represent XPath, navigation trees and primitives to select and edit subtrees diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 849db40e6e..e00d8c5abe 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -12358,7 +12358,7 @@ literals.") (list ghc-hunit)) (home-page "https://hackage.haskell.org/package/string-qq") (synopsis - "QuasiQuoter for non-interpolated strings, texts and bytestrings.") + "QuasiQuoter for non-interpolated strings, texts and bytestrings") (description "This package provides a quasiquoter for non-interpolated strings, texts and bytestrings.") diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 8bb3b1a7d9..80a35f9dd1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -22878,7 +22878,7 @@ place outside with-notes. (arguments '(#:asd-systems '("ctype" "ctype-tfun"))) (home-page "https://github.com/s-expressionists/ctype") - (synopsis "Common Lisp type system implementation ") + (synopsis "Common Lisp type system implementation") (description "This system is an implementation of the Common Lisp type system; particularly @code{cl:typep} and @code{cl:subtypep}.") diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index c0d6ccfd19..9808da7c88 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -3357,7 +3357,7 @@ of Hidden Markov Models.") (native-inputs (list python-cython python-pytest)) (home-page "https://github.com/gatagat/lap") - (synopsis "Linear Assignment Problem solver (LAPJV/LAPMOD).") + (synopsis "Linear Assignment Problem solver (LAPJV/LAPMOD)") (description "Lap is a linear assignment problem solver using Jonker-Volgenant algorithm for dense (LAPJV) or sparse (LAPMOD) matrices.") (license license:bsd-2))) @@ -3410,7 +3410,7 @@ and Numpy.") python-sphinx python-sphinx-rtd-theme)) (home-page "https://github.com/pyro-ppl/pyro-api") - (synopsis "Generic API for dispatch to Pyro backends.") + (synopsis "Generic API for dispatch to Pyro backends") (description "This package provides a generic API for dispatch to Pyro backends.") (license license:asl2.0))) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 86d9914c90..7836fbcb48 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -3461,7 +3461,7 @@ for notification of events.") (build-system python-build-system) (propagated-inputs (list python-pillow python-requests python-esprima python-pygobject gobject-introspection gtk+)) - (synopsis "Show CAPTCHA without running proprietary code.") + (synopsis "Show CAPTCHA without running proprietary code") (description "This package shows CAPTCHA without running proprietary code.") (home-page "https://github.com/taylordotfish/librecaptcha") (license license:gpl3+))) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index ebf9238906..40f7d30d7e 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -359,7 +359,7 @@ software vendors, application developers and computer science researchers.") (substitute-keyword-arguments (package-arguments openmpi) ((#:configure-flags flags) `(cons "--enable-mpi-thread-multiple" ,flags)))) - (description " This version of Open@tie{}MPI has an implementation of + (description "This version of Open@tie{}MPI has an implementation of @code{MPI_Init_thread} that provides @code{MPI_THREAD_MULTIPLE}. This won't work correctly with all transports (such as @code{openib}), and the performance is generally worse than the vanilla @code{openmpi} package, which diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index b14b407e19..a1e89f1759 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -658,7 +658,7 @@ defaulting to Node's implementation otherwise.") #:tests? #f)) (inputs (list node-safe-buffer node-inherits)) (home-page "https://github.com/nodejs/string_decoder") - (synopsis "Decode buffers while preserving multi-byte sequences ") + (synopsis "Decode buffers while preserving multi-byte sequences") (description "This package provides a user-land implementation of Node-core's @code{string_decoder}, which serves to decode buffers to strings so that the decoded string does not contain incomplete multibyte diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index e7828990c1..8c46ac7357 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -141,7 +141,7 @@ interfaces with pytest.") (build-system python-build-system) (propagated-inputs (list python-cram python-pytest)) (home-page "https://github.com/tbekolay/pytest-cram") - (synopsis "Run cram tests with pytest.") + (synopsis "Run cram tests with pytest") (description "Cram tests command line applications; Pytest tests Python applications. @code{pytest-cram} tests Python command line applications by letting you write your Python API tests with pytest, and your command line diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 59d677ca35..00ce3c63ff 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -782,7 +782,7 @@ for resource properties and best practices.") (propagated-inputs (list python-attrs python-jsonpickle python-pbr)) (native-inputs (list python-pytest)) (home-page "https://github.com/microsoft/jschema-to-python") - (synopsis "Generate Python classes from a JSON schema.") + (synopsis "Generate Python classes from a JSON schema") (description "This package generates source code for Python classes from a @url{http://jschema.org,JSchema} JSON schema.") (license license:expat))) @@ -801,7 +801,7 @@ for resource properties and best practices.") (propagated-inputs (list python-attrs)) (native-inputs (list python-pbr)) (home-page "https://github.com/microsoft/sarif-python-om") - (synopsis "Python implementation of the SARIF 2.1.0 object model.") + (synopsis "Python implementation of the SARIF 2.1.0 object model") (description "This module contains classes for the object model defined by the @url{https://sarifweb.azurewebsites.net,Static Analysis Results Interchange Format (SARIF)} file format.") @@ -6645,7 +6645,7 @@ your code non-blocking and speedy.") (base32 "1b64j45w35jzhjhnq44bnyad9ydh1iyyd7a6j2c8phxmllyyp2zq")))) (build-system python-build-system) (home-page "https://github.com/sethmlarson/socksio") - (synopsis "Sans-I/O implementation of SOCKS4, SOCKS4A, and SOCKS5.") + (synopsis "Sans-I/O implementation of SOCKS4, SOCKS4A, and SOCKS5") (description "The @code{socksio} Python module is a client-side sans-I/O SOCKS proxy implementation. It supports SOCKS4, SOCKS4A, and SOCKS5. @code{socksio} is a sans-I/O library similar to @code{h11} or @code{h2}; this @@ -6696,7 +6696,7 @@ SOCKS protocols. It can be paired with any I/O library.") python-pytest-asyncio python-pytest-trio)) (home-page "https://github.com/Azure/msrest-for-python") - (synopsis "AutoRest swagger generator Python client runtime.") + (synopsis "AutoRest swagger generator Python client runtime") (description "This package provides the runtime library @code{msrest} for AutoRest-generated Python clients.") (license license:expat))) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index fd932db80d..2a01279161 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -543,7 +543,7 @@ and IPV6 and the protocols layered above them, such as TCP and UDP.") '(("src/wsdd.py" "bin/wsdd") ("man/wsdd.1" "share/man/man1/")))) (home-page "https://github.com/christgau/wsdd") - (synopsis "A Web Service Discovery host daemon") + (synopsis "Web Service Discovery host daemon") (description "This daemon allows (Samba) hosts to be found by Web Service Dicovery Clients. It also implements the client side of the discovery protocol which searches for devices implementing diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 36ad5e765a..c71909f787 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -185,7 +185,7 @@ This package only provides a client to the Tor Network."))) (("getcap=.*") (string-append "getcap=" (which "getcap") "\n")))))))) (home-page "https://www.torproject.org/") - (synopsis "Transparently route an application's traffic through Tor.") + (synopsis "Transparently route an application's traffic through Tor") (description "Torsocks allows you to use most applications in a safe way with Tor. It ensures that DNS requests are handled safely and explicitly rejects UDP -- cgit v1.3 From d0917d778284ee7d70bc80b0538e3b4ae67870f4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 1 Nov 2022 14:15:18 -0400 Subject: gnu: Add python-zope-sqlalchemy. * gnu/packages/python-web.scm (python-zope-sqlalchemy): New variable. --- gnu/packages/python-web.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 00ce3c63ff..905ed6a327 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2427,6 +2427,30 @@ internationalized messages within program source text.") defining data schemas.") (license license:zpl2.1))) +(define-public python-zope-sqlalchemy + (package + (name "python-zope-sqlalchemy") + (version "1.6") + (source (origin + (method url-fetch) + (uri (pypi-uri "zope.sqlalchemy" version)) + (sha256 + (base32 + "1azm2awl2ra10xl6wps3yvy14jk2rpzvsyfsb9cncm97aydbwlww")))) + (build-system python-build-system) + (propagated-inputs + (list python-sqlalchemy + python-transaction + python-zope-interface)) + (native-inputs (list python-zope-testing)) + (home-page "https://github.com/zopefoundation/zope.sqlalchemy") + (synopsis "Minimal SQLAlchemy transaction integration for Zope") + (description "The aim of this package is to unify the plethora of existing +packages integrating SQLAlchemy with Zope's transaction management. As such, +it only provides a data manager and makes no attempt to define a @i{zopeish} +way to configure engines.") + (license license:zpl2.1))) + (define-public python-zope-configuration (package (name "python-zope-configuration") -- cgit v1.3 From 5ed098095dbabbc93b5a8b6a1f24c61517f87d2d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 14 Oct 2022 20:59:11 +0100 Subject: gnu: Add siosocks. * gnu/packages/python-web.scm (python-siosocks): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-web.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 905ed6a327..7b0979065e 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -6678,6 +6678,43 @@ through the network, it only deals with the implementation details of the SOCKS protocols. It can be paired with any I/O library.") (license license:expat))) +(define-public python-siosocks + (package + (name "python-siosocks") + (version "0.3.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "siosocks" version)) + (sha256 + (base32 + "0qqxy8wl5mrmlkblzjq9nsg0cbm5jwgj409mhnhq6gd1ypvbndms")))) + (build-system python-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vvv"))))))) + (native-inputs (list python-pytest python-pytest-asyncio python-pytest-cov + python-pytest-trio)) + (propagated-inputs (list python-trio)) + (home-page "https://github.com/pohmelie/siosocks") + (synopsis "SOCKSv4 & SOCKSv5 TCP proxy protocol implementation in Python") + (description + "This package provides a Python module and framework for sans-io socks proxy +client/server with couple io backends. + +Features: +@itemize +@item Only TCP connect (no BIND, no UDP) +@item Both client and server +@item SOCKS versions: 4, 4a, 5 +@item SOCKSv5 auth: no auth, username/password +@item Couple io backends: @code{asyncio}, @code{trio}, @code{socketserver} +@item One-shot socks server (@code{python -m siosocks}) +@end itemize") + (license license:expat))) + (define-public python-msrest (package (name "python-msrest") -- cgit v1.3 From b0db0b2b2d3c6d5fecb6c7727b3173c21b896540 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 14 Oct 2022 21:04:56 +0100 Subject: gnu: Add aioftp. * gnu/packages/python-web.scm (python-aioftp): New variable. Signed-off-by: Christopher Baines --- 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 7b0979065e..c518c2ce6b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3035,6 +3035,42 @@ with python-requests.") adapter for use with the Requests library.") (license license:asl2.0))) +(define-public python-aioftp + (package + (name "python-aioftp") + (version "0.21.4") + (source (origin + (method url-fetch) + (uri (pypi-uri "aioftp" version)) + (sha256 + (base32 + "1f8vql2j2b3ykqyh5bxzsp8x5f2if2c1ya232ld3hz3cc7a2dfr8")))) + (build-system python-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vvv"))))))) + (native-inputs (list python-async-timeout python-pytest + python-pytest-asyncio python-pytest-cov + python-trustme)) + (propagated-inputs (list python-siosocks)) + (home-page "https://aioftp.readthedocs.io/") + (synopsis "FTP client/server for asyncio in Python") + (description + "FTP client and server for asyncio (Python 3) Library implementing FTP +protocol, both client and server for Python asyncio module. + + Supported commands as client: USER, PASS, ACCT, PWD, CWD, CDUP, MKD, RMD, + MLSD, MLST, RNFR, RNTO, DELE, STOR, APPE, RETR, TYPE, PASV, ABOR, QUIT, + REST, LIST (as fallback). + + Supported commands as server: USER, PASS, QUIT, PWD, CWD, CDUP, MKD, RMD, + MLSD, LIST (non-standard), MLST, RNFR, RNTO, DELE, STOR, RETR, + TYPE (\"I\" and \"A\"), PASV, ABOR, APPE, REST.") + (license license:asl2.0))) + (define-public python-msal (package (name "python-msal") -- cgit v1.3 From 472917ea6c479b3546ffaea02f755ed9c6e8d46b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 14 Oct 2022 21:45:52 +0100 Subject: gnu: Add parfive. * gnu/packages/python-web.scm (parfive): Newv variable. Signed-off-by: Christopher Baines --- 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 c518c2ce6b..628e96b87a 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -984,6 +984,48 @@ HTTP servers, RESTful APIs, and web services.") (properties `((lint-hidden-cve . ("CVE-2019-10751")))) (license license:bsd-3))) +(define-public parfive + (package + (name "parfive") + (version "2.0.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "parfive" version)) + (sha256 + (base32 + "19dcbb6g56l5s3ih0bhs3p4acgc0gf4zdzpj4w87m69li2nhmgpx")))) + (build-system python-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (add-before 'check 'disable-test-requiring-network + (lambda _ + (substitute* "parfive/tests/test_downloader.py" + (("def test_ftp") + "def __off_test_ftp")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "pytest" "-vvv" "parfive"))))))) + (propagated-inputs (list python-aiofiles python-aioftp python-aiohttp + python-tqdm)) + (native-inputs (list python-pytest + python-pytest-asyncio + python-pytest-cov + python-pytest-localserver + python-pytest-socket + python-setuptools-scm)) + (home-page "https://parfive.readthedocs.io/") + (synopsis "HTTP and FTP parallel file downloader") + (description + "This package provides CLI tool and Python library @code{parallel} file +downloader using asyncio. parfive can handle downloading multiple files in +parallel as well as downloading each file in a number of chunks. + +asciicast demo of parfive parfive works by creating a downloader object, +appending files to it and then running the download. parfive has a synchronous +API, but uses asyncio to paralellise downloading the files.") + (license license:expat))) + (define-public python-html2text (package (name "python-html2text") -- cgit v1.3 From e24f7762ac79084a289f544dd27b80d05ed298ff Mon Sep 17 00:00:00 2001 From: Matthieu Simonin Date: Mon, 7 Nov 2022 23:52:40 +0100 Subject: gnu: Add python-enoslib. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-enoslib): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/python-web.scm | 57 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 628e96b87a..72f5cc3405 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -84,6 +84,7 @@ #:use-module (guix gexp) #:use-module (guix utils) #:use-module (gnu packages) + #:use-module (gnu packages admin) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages check) @@ -8004,3 +8005,59 @@ list, create, update, or delete resources (e.g. Order, Product, Collection).") You can use it as a library in your python project or you can explore the Grid5000 resources interactively using the embedded shell.") (license license:gpl3+))) + +(define-public python-enoslib + (package + (name "python-enoslib") + (version "8.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.inria.fr/discovery/enoslib") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + "0vs6b0bnlv95mzv0rjbxqwrhzkgjkn91gqipgwdf7y4ffpz8nybg"))) + (build-system python-build-system) + (native-inputs (list python-wheel python-pytest python-ddt + python-freezegun)) + (propagated-inputs (list ansible + python-cryptography + python-grid5000 + python-jsonschema + python-netaddr + python-packaging + python-requests + python-rich + python-sshtunnel + python-pytz)) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Otherwise Ansible fails to create its config directory. + (setenv "HOME" "/tmp") + ;; Ignoring the tests requiring an extra dependency (iotlabcli) + (invoke "pytest" "enoslib/tests/unit" + "--ignore" + "enoslib/tests/unit/infra/test_utils.py" + "--ignore-glob" + "enoslib/tests/unit/infra/enos_iotlab/*")))) + ;; Disable the sanity check, which fails with the following error: + ;; + ;; ContextualVersionConflict(rich 12.4.1 + ;; (/gnu/store/...-python-rich-12.4.1/lib/python3.9/site-packages), + ;; Requirement.parse('rich[jupyter]~=12.0.0'), {'enoslib'}) + ;; + ;; The optional jupyter dependency of rich isn't critical for + ;; EnOSlib to work + (delete 'sanity-check)))) + + (home-page "https://discovery.gitlabpages.inria.fr/enoslib/index.html") + (synopsis "Deploy distributed testbeds on a variety of platforms") + (description + "EnOSlib is a library to build experimental frameworks on various +scientific testbeds. It lets you deploy networks of machines on actual +hardware on Grid'5000 or via OpenStack, to Vagrant, Chameleon, and more.") + (license license:gpl3+))) -- cgit v1.3 From 4d9b8ef3916964136e4b9fac3b0a775d6dade113 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 14 Nov 2022 15:20:44 +0200 Subject: gnu: python-flask-migrate: Add source file-name. * gnu/packages/python-web.scm (python-flask-migrate)[source]: Add file-name field. --- 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 72f5cc3405..d88b3a941d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4241,6 +4241,7 @@ server.") (method git-fetch) (uri (git-reference (url home-page) (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0zj7qpknvlhrh4fsp5sx4fwyx3sp41ynclka992zympm3xym9zyq")))) -- cgit v1.3 From d15373655bb35c43465472c8ac987276a72765d5 Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 4 Nov 2022 22:52:09 -0500 Subject: gnu: python-bottle: Update to 0.12.23. * gnu/packages/python-web.scm (python-bottle): Update to 0.12.23. [native-inputs]: Add python-pytest. [arguments]: Use pytest to call test suite. Signed-off-by: Efraim Flashner --- 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 d88b3a941d..f6b4faf692 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -45,7 +45,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 Pradana Aumars ;;; Copyright © 2021, 2022 Arun Isaac -;;; Copyright © 2021 jgart +;;; Copyright © 2021, 2022 jgart ;;; Copyright © 2021 Alice Brenon ;;; Copyright © 2022 John Kehayias ;;; Copyright © 2022 Denis 'GNUtoo' Carikli @@ -4451,14 +4451,23 @@ addon modules.") (define-public python-bottle (package (name "python-bottle") - (version "0.12.21") + (version "0.12.23") (source (origin (method url-fetch) (uri (pypi-uri "bottle" version)) (sha256 - (base32 "0zl8sy4dhafyxqpavy7pjz0qzpakmhgh2qr6pwlw5f82rjv62z3q")))) + (base32 "0rs1w293gp5bhxip2cci8mfkhld6n5qcznvlna3nxclz76mf6gb8")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "test" + (invoke "pytest" "-vvv")))))))) + (native-inputs (list python-pytest)) (home-page "https://bottlepy.org/") (synopsis "WSGI framework for small web-applications") (description "@code{python-bottle} is a WSGI framework for small web-applications.") -- cgit v1.3 From daa5da2bded086f4f905f158bc547979a3bc643f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 17 Nov 2022 12:51:08 +0200 Subject: gnu: python-praw: Update to 7.6.1. * gnu/packages/python-web.scm (python-praw): Update to 7.6.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 f6b4faf692..f7bbcc48a1 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -222,13 +222,13 @@ reusable library for parsing, manipulating, and generating URIs.") (define-public python-praw (package (name "python-praw") - (version "7.5.0") + (version "7.6.1") (source (origin (method url-fetch) (uri (pypi-uri "praw" version)) (sha256 - (base32 "1nqcwz8r8xp4rfpy2i11x2fjga8fmmf6zw94xjk1h1yxgn1gq6zr")))) + (base32 "17pvdlcasr08p5hb1x7shjh8yvn621lzm0bvnwd3b1r1qpzrbz07")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.3 From ce4896e85dfc667959b46c29191961f8280a364b Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Tue, 15 Nov 2022 21:00:17 -0500 Subject: gnu: httpie: Update to 3.2.1. * gnu/packages/python-web.scm (httpie): Update to 3.2.1. [propagated-inputs]: Add python-rich. Signed-off-by: Christopher Baines --- 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 f7bbcc48a1..871062f697 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -953,14 +953,14 @@ other HTTP libraries.") (define-public httpie (package (name "httpie") - (version "3.1.0") + (version "3.2.1") (source (origin (method url-fetch) (uri (pypi-uri "httpie" version)) (sha256 (base32 - "1npyfvrq0l56bil8rnpj78mav378mxx4zcqzq1jjx4aap1020jif")))) + "1v736y2h7lcyrnxs9y5sf4xwzgll7pc2s6r3ny929mm8lcn07h69")))) (build-system python-build-system) (arguments ;; The tests attempt to access external web servers, so we cannot run them. @@ -973,6 +973,7 @@ other HTTP libraries.") python-pysocks python-charset-normalizer python-defusedxml + python-rich python-multidict)) (home-page "https://httpie.io") (synopsis "cURL-like tool for humans") -- cgit v1.3 From 0985bba55786d74540e53eabb7364cf6765eb52f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 20 Nov 2022 12:03:33 +0100 Subject: gnu: python-flask-restful: Remove unused dependency. * gnu/packages/python-web.scm (python-flask-restful)[propagated-inputs]: Remove PYTHON-PYCRYPTO. --- gnu/packages/python-web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 871062f697..905d79886f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3881,7 +3881,7 @@ pretty printer and a tree visitor.") (substitute* "flask_restful/__init__.py" (("flask\\.helpers") "flask.scaffold"))))))) (propagated-inputs - (list python-aniso8601 python-flask python-pycrypto python-pytz)) + (list python-aniso8601 python-flask python-pytz)) (native-inputs (list ;; Optional dependency of Flask. Tests need it. python-blinker python-mock ; For tests -- cgit v1.3 From 68113dc2498e507879eeecc583a66a5bc046c91b Mon Sep 17 00:00:00 2001 From: conses Date: Thu, 24 Nov 2022 00:00:58 +0100 Subject: gnu: Add whoogle-search. * gnu/packages/python-web.scm (whoogle-search): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-web.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 905d79886f..4f3a587c6a 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4743,6 +4743,65 @@ Google search engine. Its module is called @code{googlesearch}.") (description "Python client library for Google's discovery based APIs") (license license:asl2.0))) +(define-public whoogle-search + (package + (name "whoogle-search") + (version "0.8.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "whoogle-search" version)) + (sha256 + (base32 + "0h8cl9bkd3vx17kbvcnmc8cy6pc29lxr0drxm84kj37ka788cj2g")))) + (build-system python-build-system) + (arguments + (list + ;; The tests need network access + #:tests? #f)) + (propagated-inputs + (list python-attrs + python-beautifulsoup4 + python-cachelib + python-certifi + python-cffi + python-brotli + python-chardet + python-click + python-cryptography + python-cssutils + python-defusedxml + python-flask + python-flask-session + python-idna + python-itsdangerous + python-jinja2 + python-markupsafe + python-more-itertools + python-packaging + python-pluggy + python-py + python-pycodestyle + python-pycparser + python-pyopenssl + python-pyparsing + python-pysocks + python-dateutil + python-requests + python-soupsieve + python-stem + python-urllib3 + python-waitress + python-wcwidth + python-werkzeug + python-dotenv)) + (home-page "https://github.com/benbusby/whoogle-search") + (synopsis "Self-hosted, ad-free, privacy-respecting metasearch engine") + (description + "Get Google results, but without any ads, javascript, AMP links, +cookies, or IP address tracking. Quick and simple to implement as a primary +search engine replacement on both desktop and mobile.") + (license license:expat))) + (define-public python-hawkauthlib (package (name "python-hawkauthlib") -- cgit v1.3 From ed18b697c4783f139e23731f5bd0b0ed197997bb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 6 Dec 2022 11:09:39 +0200 Subject: gnu: Add python-aiostream. * gnu/packages/python-web.scm (python-aiostream): New variable. --- 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 4f3a587c6a..72e20a130f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -513,6 +513,35 @@ comes with a SOCKS proxy client.") (base32 "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0")))))) +(define-public python-aiostream + (package + (name "python-aiostream") + (version "0.4.5") + (source (origin + ;; Tests not included in pypi release. + (method git-fetch) + (uri (git-reference + (url "https://github.com/vxgmichel/aiostream") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0l2ijb7yk0820wiyf6zrzx8fhzf8925an7r06mcaw3in1mr6rssq")))) + (build-system python-build-system) + (native-inputs + (list python-pytest + python-pytest-asyncio + python-pytest-cov + python-pytest-runner)) + (home-page "https://github.com/vxgmichel/aiostream") + (synopsis "Generator-based operators for asynchronous iteration") + (description "@code{aiostream} provides a collection of stream operators that can +be combined to create asynchronous pipelines of operations. It can be seen as an +asynchronous version of @code{itertools}, although some aspects are slightly +different. All the provided operators return a unified interface called a stream. A +stream is an enhanced asynchronous iterable.") + (license license:gpl3))) + (define-public python-asgiref (package (name "python-asgiref") -- cgit v1.3 From 49ec1fbc8f0872241bfff1827bd9b47455b0980c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Dec 2022 15:01:19 +0100 Subject: gnu: Add python-flask-jwt. * gnu/packages/python-web.scm (python-flask-jwt): New variable. --- 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 72e20a130f..7543e05f47 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3889,6 +3889,38 @@ SlimIt also provides a library that includes a JavaScript parser, lexer, pretty printer and a tree visitor.") (license license:expat))) +(define-public python-flask-jwt + (package + (name "python-flask-jwt") + (version "0.3.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "Flask-JWT" version)) + (sha256 + (base32 + "1bfh7cr0sf65rn4h1q67472y6ml9s8c4k0xxfhrwvwg0plpngh29")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'compatibility + (lambda _ + (substitute* "setup.cfg" + (("\\[pytest\\]") "[tool:pytest]")) + (substitute* "requirements.txt" + (("PyJWT>=1.4.0,<1.5.0") "PyJWT>=2.0.0")) + (substitute* '("tests/test_jwt.py" + "flask_jwt/__init__.py") + (("access_token.decode\\('utf-8'\\)") "access_token"))))))) + (propagated-inputs (list python-flask python-pyjwt)) + (native-inputs (list python-pytest)) + (home-page "https://github.com/mattupstate/flask-jwt") + (synopsis "JWT token authentication for Flask apps") + (description "This package implements JWT token authentication for Flask +apps.") + (license license:expat))) + (define-public python-flask-restful (package (name "python-flask-restful") -- cgit v1.3 From 71dc990f2271dadb8aaa22b87885491466835697 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Dec 2022 13:26:04 +0100 Subject: gnu: python-flask-restful: Update to 0.3.9. * gnu/packages/python-web.scm (python-flask-restful): Update to 0.3.9. [source]: Remove patch. [build-system]: Use pyproject-build-system. [arguments]: Disable "test_redirect" test; remove 'fix-imports phase. [native-inputs]: Replace python-nose with python-pytest. * gnu/local.mk (dist_patch_DATA): Remove patch. * gnu/packages/patches/python-flask-restful-werkzeug-compat.patch: Remove file. --- gnu/local.mk | 1 - .../python-flask-restful-werkzeug-compat.patch | 36 ---------------------- gnu/packages/python-web.scm | 31 ++++++++----------- 3 files changed, 12 insertions(+), 56 deletions(-) delete mode 100644 gnu/packages/patches/python-flask-restful-werkzeug-compat.patch (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 295be3c67c..60a422fd7e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1728,7 +1728,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-docopt-pytest6-compat.patch \ %D%/packages/patches/python-execnet-read-only-fix.patch \ %D%/packages/patches/python-fixtures-remove-monkeypatch-test.patch \ - %D%/packages/patches/python-flask-restful-werkzeug-compat.patch \ %D%/packages/patches/python-ipython-documentation-chars.patch \ %D%/packages/patches/python-ipython-documentation-repro.patch \ %D%/packages/patches/python-keras-integration-test.patch \ diff --git a/gnu/packages/patches/python-flask-restful-werkzeug-compat.patch b/gnu/packages/patches/python-flask-restful-werkzeug-compat.patch deleted file mode 100644 index 0e928ef455..0000000000 --- a/gnu/packages/patches/python-flask-restful-werkzeug-compat.patch +++ /dev/null @@ -1,36 +0,0 @@ -We need one patch on top of 0.3.8 for compatibility with Werkzeug 1.0. - -Taken from upstream: -https://github.com/flask-restful/flask-restful/commit/73376a488907af3042b52678ac4c23f8a8911e5b - -diff --git a/tests/test_api.py b/tests/test_api.py -index f7f8e661..6795d362 100644 ---- a/tests/test_api.py -+++ b/tests/test_api.py -@@ -445,7 +445,9 @@ def test_handle_non_api_error(self): - - resp = app.get("/foo") - self.assertEquals(resp.status_code, 404) -- self.assertEquals('text/html', resp.headers['Content-Type']) -+ # in newer versions of werkzeug this is `text/html; charset=utf8` -+ content_type, _, _ = resp.headers['Content-Type'].partition(';') -+ self.assertEquals('text/html', content_type) - - def test_non_api_error_404_catchall(self): - app = Flask(__name__) -diff --git a/tests/test_reqparse.py b/tests/test_reqparse.py -index 2f1fbedf..9776f17c 100644 ---- a/tests/test_reqparse.py -+++ b/tests/test_reqparse.py -@@ -2,9 +2,9 @@ - import unittest - from mock import Mock, patch - from flask import Flask --from werkzeug import exceptions, MultiDict -+from werkzeug import exceptions - from werkzeug.wrappers import Request --from werkzeug.datastructures import FileStorage -+from werkzeug.datastructures import FileStorage, MultiDict - from flask_restful.reqparse import Argument, RequestParser, Namespace - import six - import decimal diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 7543e05f47..18c0b47b67 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3924,35 +3924,28 @@ apps.") (define-public python-flask-restful (package (name "python-flask-restful") - (version "0.3.8") + (version "0.3.9") (source (origin (method url-fetch) (uri (pypi-uri "Flask-RESTful" version)) - (patches (search-patches "python-flask-restful-werkzeug-compat.patch")) (sha256 (base32 - "05b9lzx5yc3wgml2bcq50lq35h66m8zpj6dc9advcb5z3acsbaay")))) - (build-system python-build-system) + "0gm5dz088v3d2k1dkcp9b3nnqpkk0fp2jly870hijj2xhc5nbv6c")))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-imports - (lambda _ - (substitute* "flask_restful/__init__.py" - (("flask\\.helpers") "flask.scaffold"))))))) + ;; This test fails because '/' is not 'http://localhost/'. + (list #:test-flags '(list "-k" "not test_redirect"))) (propagated-inputs - (list python-aniso8601 python-flask python-pytz)) + (list python-aniso8601 python-flask python-pytz)) (native-inputs - (list ;; Optional dependency of Flask. Tests need it. - python-blinker python-mock ; For tests - python-nose)) ;for tests - (home-page - "https://www.github.com/flask-restful/flask-restful/") - (synopsis - "Flask module for creating REST APIs") + (list python-blinker + python-mock + python-pytest)) + (home-page "https://www.github.com/flask-restful/flask-restful/") + (synopsis "Flask module for creating REST APIs") (description - "This package contains a Flask module for creating REST APIs.") + "This package contains a Flask module for creating REST APIs.") (license license:bsd-3))) (define-public python-flask-basicauth -- cgit v1.3 From 7e6901618f7a4b9539d0e18ab24876126803b0e0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 27 Dec 2022 21:46:27 +0100 Subject: gnu: python-pycurl: Update to 7.45.2. * gnu/packages/python-web.scm (python-pycurl): Update to 7.45.2. --- 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 18c0b47b67..25136c8448 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1590,13 +1590,13 @@ Amazon S3 compatible object storage server.") (define-public python-pycurl (package (name "python-pycurl") - (version "7.43.0.5") + (version "7.45.2") (source (origin (method url-fetch) (uri (pypi-uri "pycurl" version)) (sha256 - (base32 "1cwlb76vddqp2mxqvjbhf367caddzy82rhangddjjhjqaj8x4zgc")))) + (base32 "1ji46b924caa4saxvjxs9h673yy0kif297nxpnjn84r7w05mjc2p")))) (build-system python-build-system) (arguments ;; The tests attempt to access external web servers, so we cannot run -- cgit v1.3 From 7bd99943843da0272ad62cf38cf1e5272e15546d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 4 Jan 2023 17:14:33 +0100 Subject: gnu: Add python-gwebsockets. * gnu/packages/python-web.scm (python-gwebsockets): 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 25136c8448..07a3582bd5 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2013, 2014, 2015, 2016, 2020 Andreas Enge ;;; Copyright © 2016, 2017, 2019-2022 Marius Bakke -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Ricardo Wurmus ;;; Copyright © 2017, 2021 Roel Janssen ;;; Copyright © 2016, 2017, 2020 Julien Lepiller ;;; Copyright © 2016, 2017 Nikita @@ -93,6 +93,7 @@ #:use-module (gnu packages databases) #:use-module (gnu packages django) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages graphviz) #:use-module (gnu packages groff) @@ -3612,6 +3613,26 @@ library.") @code{Requests} with @code{Gevent} to make asynchronous HTTP Requests easily") (license license:bsd-2))) +(define-public python-gwebsockets + (package + (name "python-gwebsockets") + (version "0.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "gwebsockets" version)) + (sha256 + (base32 + "0kgq7wssz0mrhxdafkfc9prj0qjv9z0lyivyqvjvjnnypg54di7m")))) + (build-system python-build-system) + (propagated-inputs + (list python-pygobject)) + (home-page "https://github.com/sugarlabs/gwebsockets") + (synopsis "GLib based websockets server") + (description "This package provides a websocket server written in Python. +It uses GIO for network communication and hence it easily integrates with the +GLib mainloop.") + (license license:asl2.0))) + (define-public python-dpkt (package (name "python-dpkt") -- cgit v1.3 From da0a5d483fbae61612be9e34dc38a72d02de73b5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 7 Jan 2023 14:23:59 +0100 Subject: gnu: python-openid-cla: Add missing inputs. * gnu/packages/python-web.scm (python-openid-cla)[propagated-inputs]: Add PYTHON-OPENID and PYTHON-SIX. --- 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 07a3582bd5..b813784bb9 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1967,6 +1967,7 @@ Databricks REST APIs.") "102hy2qisvjxp5s0v9lvwqi4f2dk0dhns40vjgn008yxc7k0h3cr")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; No tests. + (propagated-inputs (list python-openid python-six)) (home-page "https://github.com/puiterwijk/python-openid-cla/") (synopsis "Implementation of the OpenID CLA extension for python-openid") (description "@code{openid-cla} is an implementation of the OpenID -- cgit v1.3 From 3a835f7dd493b34ddf964d51923627a6d9db49a8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 7 Jan 2023 14:24:25 +0100 Subject: gnu: python-openid-teams: Add missing inputs. * gnu/packages/python-web.scm (python-openid-teams)[propagated-inputs]: Add PYTHON-OPENID and PYTHON-SIX. --- 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 b813784bb9..7daa1b636c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1987,6 +1987,7 @@ contributor license agreement extension for python-openid.") "05zrh78alav24rxkbqlpbad6d3x2nljk6z6j7kflxf3vdqa7w969")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; No tests. + (propagated-inputs (list python-openid python-six)) (home-page "https://github.com/puiterwijk/python-openid-teams/") (synopsis "Implementation of the OpenID teams extension for python-openid") (description -- cgit v1.3 From 59a714057f8d44ecf93e960d3b1400b00531c889 Mon Sep 17 00:00:00 2001 From: Felix Lechner Date: Wed, 21 Dec 2022 06:48:21 -0800 Subject: gnu: Add python-pysimplesoap. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-pysimplesoap): New variable. Signed-off-by: Ludovic Courtès --- 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 7daa1b636c..ac0fb6f8a7 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -7987,6 +7987,27 @@ resources using Web Application Description Language (WADL) files as guides.") @end itemize") (license license:expat))) +(define-public python-pysimplesoap + (package + (name "python-pysimplesoap") + (version "1.16.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "PySimpleSOAP" version)) + (sha256 + (base32 + "1qb7dn8m1cjwzql7vqj9i1hsscb7nyhimmlp45jrpzxds38g9fxi")))) + (build-system python-build-system) + (arguments + (list #:tests? #f)) ;tests fail due to attempted web access + (home-page "https://github.com/pysimplesoap/pysimplesoap") + (synopsis "Simple and lightweight SOAP library for Python") + (description + "This package provides a simple and lightweight Python SOAP library for +client and server webservices interfaces, aimed to be as small and easy as +possible, supporting most common functionality.") + (license license:lgpl3+))) + (define-public python-http-client (package (name "python-http-client") -- cgit v1.3 From 962ba701090f0dd3da67c353bb917eb0742602a7 Mon Sep 17 00:00:00 2001 From: jgart Date: Thu, 13 Oct 2022 01:12:32 -0500 Subject: gnu: python-responses: Update to 0.22.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-responses): Update to 0.22.0. [arguments]: Enable tests. [native-inputs]: Add python-pytest, python-pytest-asyncio, and python-pytest-httpserver. [inputs]: Add python-types-toml. Signed-off-by: 宋文武 --- gnu/packages/python-web.scm | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index ac0fb6f8a7..20e57db980 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3571,22 +3571,31 @@ Python.") (define-public python-responses (package (name "python-responses") - (version "0.10.6") + (version "0.22.0") (source (origin (method url-fetch) (uri (pypi-uri "responses" version)) (sha256 (base32 - "147pacwkkqy3qf3hr33fnl1xbzgw0zsm3qppvvy9qhq8h069qbah")))) + "0bhhffwl0zqin4xc89nc97ynzr7l3j4b8rjqk9w9flnj2cmcnsir")))) (build-system python-build-system) (arguments - `(;; Test suite is not distributed: - ;; https://github.com/getsentry/responses/issues/38 - #:tests? #f)) + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-v"))))))) (native-inputs - (list python-mock)) + (list python-mock + python-pytest + python-pytest-asyncio + python-pytest-httpserver)) (propagated-inputs - (list python-requests python-cookies python-six)) + (list python-requests + python-cookies + python-six + python-types-toml)) (home-page "https://github.com/getsentry/responses") (synopsis "Utility for mocking out the `requests` Python library") (description "A utility library for mocking out the `requests` Python -- cgit v1.3 From b9e6e31877cdb96cceba4d1ec6268f86b824dec4 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sat, 21 Jan 2023 15:39:03 +0000 Subject: gnu: python-scrapy: Update to 2.7.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-scrapy): Update to 2.7.1. Signed-off-by: 宋文武 --- 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 20e57db980..e7134677a9 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -7740,13 +7740,13 @@ regular expressions.") (define-public python-scrapy (package (name "python-scrapy") - (version "2.6.1") + (version "2.7.1") (source (origin (method url-fetch) (uri (pypi-uri "Scrapy" version)) (sha256 - (base32 "09rqalbwcz9ix8h0992mzjs50sssxsmmh8w9abkrqchgknjmbzan")))) + (base32 "0kpi3hg2ycs6s8cg41r2zc1axd0rpnps8bnzg7wisjyjaf1l1yih")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.3