Package: guix-patches;
Reported by: Vinicius Monego <monego <at> posteo.net>
Date: Mon, 25 Oct 2021 19:46:02 UTC
Severity: normal
Tags: patch
Done: Ludovic Courtès <ludo <at> gnu.org>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 51396 in the body.
You can then email your comments to 51396 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#51396; Package guix-patches.
(Mon, 25 Oct 2021 19:46:02 GMT) Full text and rfc822 format available.Vinicius Monego <monego <at> posteo.net>:guix-patches <at> gnu.org.
(Mon, 25 Oct 2021 19:46:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: guix-patches <at> gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH 0/7] Update python-moto. Date: Mon, 25 Oct 2021 19:44:45 +0000
Vinicius Monego (7): gnu: python-aws-sam-translator: Update to 1.39.0. gnu: python-cfn-lint: Update to 0.54.3. gnu: python-cfn-lint: Respect #:tests?. gnu: python-s3transfer: Update to 0.5.0. gnu: Update awscli, python-boto3 and python-botocore. gnu: python-moto: Update to 2.2.11. gnu: python-moto: Respect #:tests?. gnu/packages/python-web.scm | 62 +++++++++++++++------------------- gnu/packages/python-xyz.scm | 66 +++++++++++++++++++++---------------- 2 files changed, 64 insertions(+), 64 deletions(-) base-commit: e1261ddd38cf02a0f046f3a5360502d659b4e7d4 -- 2.30.2
guix-patches <at> gnu.org:bug#51396; Package guix-patches.
(Mon, 25 Oct 2021 19:51:02 GMT) Full text and rfc822 format available.Message #8 received at 51396 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 51396 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH 1/7] gnu: python-aws-sam-translator: Update to 1.39.0. Date: Mon, 25 Oct 2021 19:49:59 +0000
* gnu/packages/python-web.scm (python-aws-sam-translator): Update to 1.39.0.
---
gnu/packages/python-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 2b5379950d..2a3ca36e1e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -375,13 +375,13 @@ WSGI. This package includes libraries for implementing ASGI servers.")
(define-public python-aws-sam-translator
(package
(name "python-aws-sam-translator")
- (version "1.38.0")
+ (version "1.39.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "aws-sam-translator" version))
(sha256
(base32
- "1djwlsjpbh13m4biglimrm9lq7hmla0k29giay7k3cjsrylxvjhf"))))
+ "021jpqa6ksd6f4753dxdaprgq6f2chdmh1510cdqcjgn9r1syww9"))))
(build-system python-build-system)
(arguments
`(;; XXX: Tests are not distributed with the PyPI archive, and would
--
2.30.2
guix-patches <at> gnu.org:bug#51396; Package guix-patches.
(Mon, 25 Oct 2021 19:51:02 GMT) Full text and rfc822 format available.Message #11 received at 51396 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 51396 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH 2/7] gnu: python-cfn-lint: Update to 0.54.3. Date: Mon, 25 Oct 2021 19:50:00 +0000
* gnu/packages/python-web.scm (python-cfn-lint): Update to 0.54.3.
---
gnu/packages/python-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 2a3ca36e1e..af6443795e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -478,7 +478,7 @@ emit information from within their applications to the AWS X-Ray service.")
(define-public python-cfn-lint
(package
(name "python-cfn-lint")
- (version "0.54.1")
+ (version "0.54.3")
(home-page "https://github.com/aws-cloudformation/cfn-python-lint")
(source (origin
(method git-fetch)
@@ -488,7 +488,7 @@ emit information from within their applications to the AWS X-Ray service.")
(file-name (git-file-name name version))
(sha256
(base32
- "161mzzlpbi85q43kwzrj39qb32l6wg6xhnbbd4z860yrfbymsn87"))))
+ "106qf19n2k6sdjkb4006aidibd24qqiw901c1613xgjpnyw4dyl6"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
--
2.30.2
guix-patches <at> gnu.org:bug#51396; Package guix-patches.
(Mon, 25 Oct 2021 19:51:03 GMT) Full text and rfc822 format available.Message #14 received at 51396 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 51396 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH 3/7] gnu: python-cfn-lint: Respect #:tests?. Date: Mon, 25 Oct 2021 19:50:01 +0000
* gnu/packages/python-web.scm (python-cfn-lint)[arguments]: Make some cosmetic
changes. Respect #:tests? in the custom 'check phase and simplify it.
---
gnu/packages/python-web.scm | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index af6443795e..451a6d3652 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -491,23 +491,23 @@ emit information from within their applications to the AWS X-Ray service.")
"106qf19n2k6sdjkb4006aidibd24qqiw901c1613xgjpnyw4dyl6"))))
(build-system python-build-system)
(arguments
- `(#:phases (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- ;; Remove test for the documentation update scripts
- ;; to avoid a dependency on 'git'.
- (delete-file
- "test/unit/module/maintenance/test_update_documentation.py")
- (delete-file
- "test/unit/module/maintenance/test_update_resource_specs.py")
- (setenv "PYTHONPATH"
- (string-append "./build/lib:"
- (getenv "PYTHONPATH")))
- (setenv "PATH" (string-append out "/bin:"
- (getenv "PATH")))
- (invoke "python" "-m" "unittest" "discover" "-v"
- "-s" "test")))))))
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+ (when tests?
+ (let ((out (assoc-ref outputs "out")))
+ ;; Remove test for the documentation update scripts
+ ;; to avoid a dependency on 'git'.
+ (delete-file
+ "test/unit/module/maintenance/test_update_documentation.py")
+ (delete-file
+ "test/unit/module/maintenance/test_update_resource_specs.py")
+ (add-installed-pythonpath inputs outputs)
+ (setenv "PATH" (string-append out "/bin:"
+ (getenv "PATH")))
+ (invoke "python" "-m" "unittest" "discover"
+ "-s" "test"))))))))
(native-inputs
`(("python-pydot" ,python-pydot)
("python-mock" ,python-mock)))
--
2.30.2
guix-patches <at> gnu.org:bug#51396; Package guix-patches.
(Mon, 25 Oct 2021 19:51:03 GMT) Full text and rfc822 format available.Message #17 received at 51396 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 51396 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH 4/7] gnu: python-s3transfer: Update to 0.5.0. Date: Mon, 25 Oct 2021 19:50:02 +0000
* gnu/packages/python-web.scm (python-s3transfer): Update to 0.5.0.
[arguments]<#:phases>: Remove 'patch phase because the issue was fixed
upstream. Don't return #t in custom 'check phase.
---
gnu/packages/python-web.scm | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 451a6d3652..d1665b1de3 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3386,32 +3386,22 @@ Betamax that may possibly end up in the main package.")
(define-public python-s3transfer
(package
(name "python-s3transfer")
- (version "0.3.3")
+ (version "0.5.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "s3transfer" version))
(sha256
(base32
- "1nzp5kwmy9669334shcz9ipg89jgpdqhrmbkgdg18r7wmvi3f6lj"))))
+ "0k6sc956yrrv9b4laa0r79jhxajpyxr21jcd1ka8m1n53lz85vah"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch
- (lambda _
- ;; There's a small issue with one test with Python 3.8, this
- ;; change has been suggested upstream:
- ;; https://github.com/boto/s3transfer/pull/164
- (substitute* "tests/unit/test_s3transfer.py"
- (("super\\(FailedDownloadParts, self\\)\\.submit\\(function\\)")
- "futures.Future()"))
- #t))
(replace 'check
(lambda _
;; Some of the 'integration' tests require network access or
;; login credentials.
- (invoke "nosetests" "--exclude=integration")
- #t)))))
+ (invoke "nosetests" "--exclude=integration"))))))
(native-inputs
`(("python-docutils" ,python-docutils)
("python-mock" ,python-mock)
--
2.30.2
guix-patches <at> gnu.org:bug#51396; Package guix-patches.
(Mon, 25 Oct 2021 19:51:04 GMT) Full text and rfc822 format available.Message #20 received at 51396 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 51396 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH 5/7] gnu: Update awscli, python-boto3 and python-botocore. Date: Mon, 25 Oct 2021 19:50:03 +0000
awscli, botocore and boto3 work together and typically require matching
versions.
* gnu/packages/python-xyz.scm (python-botocore): Update to 1.22.2.
(python-boto3): Update to 1.19.2.
[native-inputs]: Add python-pytest.
* gnu/packages/python-web.scm (awscli): Update to 1.21.2.
---
gnu/packages/python-web.scm | 4 ++--
gnu/packages/python-xyz.scm | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d1665b1de3..fed7a388df 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2848,14 +2848,14 @@ supports url redirection and retries, and also gzip and deflate decoding.")
(package
;; Note: updating awscli typically requires updating botocore as well.
(name "awscli")
- (version "1.18.203")
+ (version "1.21.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri name version))
(sha256
(base32
- "128zg24961j8nmnq2dxqg6a7zwh3qgv87cmvclsdqwwih9nigxv9"))))
+ "13mnz414li0l5ph3wf160frfx46cynq8ws5ddmmlppc6rld6im02"))))
(build-system python-build-system)
(arguments
;; FIXME: The 'pypi' release does not contain tests.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index eb9fcc310d..3ad05effaf 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13471,14 +13471,14 @@ This software is unmaintained, and new projects should use @code{boto3} instead.
;; are compatible.
(package
(name "python-botocore")
- (version "1.19.22")
+ (version "1.22.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "botocore" version))
(sha256
(base32
- "0iim86x7c6hqmvd61ygz6x6x9glnsfbnyzv2y67qjdcdx8jpkmw7"))))
+ "14qia74g5dx2p7yivaxdj6dwkpcf3skcywqmb6k3m12bkbkn04q1"))))
(build-system python-build-system)
(arguments
;; FIXME: Many tests are failing.
@@ -13499,7 +13499,7 @@ interface to the Amazon Web Services (AWS) API.")
(define-public python-boto3
(package
(name "python-boto3")
- (version "1.16.22")
+ (version "1.19.2")
(home-page "https://github.com/boto/boto3")
(source (origin
(method git-fetch)
@@ -13507,19 +13507,19 @@ interface to the Amazon Web Services (AWS) API.")
(file-name (git-file-name name version))
(sha256
(base32
- "0h20hgl4yfl58g75qhb6ibrdmzn47md3srgar7hask14cjmfhfy3"))))
+ "1mms4hazh0pcg104nqhclllh8lphd5igi1plz8x9v0y7jj4skjdp"))))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'delete-network-tests
;; Deleting integration tests because they are trying to connect to AWS.
(lambda _
- (delete-file-recursively "tests/integration")
- #t)))))
+ (delete-file-recursively "tests/integration"))))))
(build-system python-build-system)
(native-inputs
`(("python-nose" ,python-nose)
- ("python-mock" ,python-mock)))
+ ("python-mock" ,python-mock)
+ ("python-pytest" ,python-pytest)))
(propagated-inputs
`(("python-botocore" ,python-botocore)
("python-jmespath" ,python-jmespath)
--
2.30.2
guix-patches <at> gnu.org:bug#51396; Package guix-patches.
(Mon, 25 Oct 2021 19:52:01 GMT) Full text and rfc822 format available.Message #23 received at 51396 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 51396 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH 6/7] gnu: python-moto: Update to 2.2.11. Date: Mon, 25 Oct 2021 19:50:04 +0000
* gnu/packages/python-xyz.scm (python-moto): Update to 2.2.11.
[arguments]: Make some cosmetic changes.
<#:phases>: Don't return #t. Support cross-compilation in
'patch-hardcoded-executable-names. Skip more tests and simplify the custom
'check phase.
---
gnu/packages/python-xyz.scm | 51 ++++++++++++++++++++++---------------
1 file changed, 30 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3ad05effaf..6de6304362 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13093,34 +13093,41 @@ text.")
(define-public python-moto
(package
(name "python-moto")
- ;; XXX: Use a pre-release for compatibility with latest botocore & friends.
- (version "1.3.16.dev134")
+ (version "2.2.11")
(source (origin
(method url-fetch)
(uri (pypi-uri "moto" version))
(sha256
(base32
- "1pix0c7zszjwzfy88n1rpih9vkdm25nqcvz93z850xvgwb4v81bd"))))
+ "0z2kf3y901mfvavpv13ypyhlijnjqx6wqz7izdxl32kfcjhjp5ix"))))
(build-system python-build-system)
(arguments
- `(#:phases (modify-phases %standard-phases
- (add-after 'unpack 'patch-hardcoded-executable-names
- (lambda _
- (substitute* "moto/batch/models.py"
- (("/bin/sh")
- (which "sh")))
- (substitute* (find-files "tests" "\\.py$")
- (("#!/bin/bash")
- (string-append "#!" (which "bash"))))
- #t))
- (replace 'check
- (lambda _
- (setenv "PYTHONPATH" (string-append "./build/lib:"
- (getenv "PYTHONPATH")))
- (invoke "pytest" "-vv" "-m" "not network"
- ;; These tests require Docker.
- "-k" "not test_terminate_job \
-and not test_invoke_function_from_sqs_exception"))))))
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-hardcoded-executable-names
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((bash-exec (string-append
+ (assoc-ref inputs "bash")
+ "/bin/sh")))
+ (substitute* "moto/batch/models.py"
+ (("/bin/sh") bash-exec))
+ (substitute* (find-files "tests" "\\.py$")
+ (("#!/bin/bash") (string-append "#!" bash-exec))))))
+ (replace 'check
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (add-installed-pythonpath inputs outputs)
+ (invoke "pytest" "-vv" "-m" "not network" "-k"
+ (string-append
+ ;; These tests require Docker.
+ "not test_terminate_job"
+ " and not test_invoke_function_from_sqs_exception"
+ " and not test_rotate_secret_lambda_invocations"
+ ;; These tests also require the network.
+ " and not test_put_record_batch_http_destination"
+ " and not test_put_record_http_destination"
+ " and not test_dependencies"
+ " and not test_cancel_running_job"
+ " and not test_container_overrides")))))))
(native-inputs
`(("python-flask" ,python-flask)
("python-flask-cors" ,python-flask-cors)
@@ -13128,6 +13135,8 @@ and not test_invoke_function_from_sqs_exception"))))))
("python-parameterized" ,python-parameterized)
("python-pytest" ,python-pytest)
("python-sure" ,python-sure)))
+ (inputs
+ `(("bash" ,bash-minimal)))
(propagated-inputs
`(("python-aws-xray-sdk" ,python-aws-xray-sdk)
("python-boto" ,python-boto)
--
2.30.2
guix-patches <at> gnu.org:bug#51396; Package guix-patches.
(Mon, 25 Oct 2021 19:52:02 GMT) Full text and rfc822 format available.Message #26 received at 51396 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 51396 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH 7/7] gnu: python-moto: Respect #:tests?. Date: Mon, 25 Oct 2021 19:50:05 +0000
* gnu/packages/python-xyz.scm (python-moto)[arguments]: Respect #:tests? in
the custom 'check phase.
---
gnu/packages/python-xyz.scm | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 6de6304362..3fb639418c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13114,20 +13114,21 @@ text.")
(substitute* (find-files "tests" "\\.py$")
(("#!/bin/bash") (string-append "#!" bash-exec))))))
(replace 'check
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (add-installed-pythonpath inputs outputs)
- (invoke "pytest" "-vv" "-m" "not network" "-k"
- (string-append
- ;; These tests require Docker.
- "not test_terminate_job"
- " and not test_invoke_function_from_sqs_exception"
- " and not test_rotate_secret_lambda_invocations"
- ;; These tests also require the network.
- " and not test_put_record_batch_http_destination"
- " and not test_put_record_http_destination"
- " and not test_dependencies"
- " and not test_cancel_running_job"
- " and not test_container_overrides")))))))
+ (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+ (when tests?
+ (add-installed-pythonpath inputs outputs)
+ (invoke "pytest" "-vv" "-m" "not network" "-k"
+ (string-append
+ ;; These tests require Docker.
+ "not test_terminate_job"
+ " and not test_invoke_function_from_sqs_exception"
+ " and not test_rotate_secret_lambda_invocations"
+ ;; These tests also require the network.
+ " and not test_put_record_batch_http_destination"
+ " and not test_put_record_http_destination"
+ " and not test_dependencies"
+ " and not test_cancel_running_job"
+ " and not test_container_overrides"))))))))
(native-inputs
`(("python-flask" ,python-flask)
("python-flask-cors" ,python-flask-cors)
--
2.30.2
guix-patches <at> gnu.org:bug#51396; Package guix-patches.
(Fri, 05 Nov 2021 02:00:02 GMT) Full text and rfc822 format available.Message #29 received at 51396 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 51396 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v2 1/8] gnu: python-aws-sam-translator: Update to 1.40.0. Date: Fri, 5 Nov 2021 01:58:29 +0000
* gnu/packages/python-web.scm (python-aws-sam-translator): Update to 1.40.0.
[arguments]<#:phases>: Don't return #t.
[home-page]: Follow redirect.
---
gnu/packages/python-web.scm | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 62de043e70..29c0b7e15e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -394,13 +394,13 @@ WSGI. This package includes libraries for implementing ASGI servers.")
(define-public python-aws-sam-translator
(package
(name "python-aws-sam-translator")
- (version "1.38.0")
+ (version "1.40.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "aws-sam-translator" version))
(sha256
(base32
- "1djwlsjpbh13m4biglimrm9lq7hmla0k29giay7k3cjsrylxvjhf"))))
+ "1hq5ggbzcq4k3ks439hki493w4sasgaxns6j5x57xsj822acalmf"))))
(build-system python-build-system)
(arguments
`(;; XXX: Tests are not distributed with the PyPI archive, and would
@@ -413,13 +413,12 @@ WSGI. This package includes libraries for implementing ASGI servers.")
;; of dependencies, when it works fine with others.
(substitute* "requirements/base.txt"
(("(.*)(~=[0-9\\.]+)" all package version)
- package))
- #t)))))
+ package)))))))
(propagated-inputs
`(("python-boto3" ,python-boto3)
("python-jsonschema" ,python-jsonschema)
("python-six" ,python-six)))
- (home-page "https://github.com/awslabs/serverless-application-model")
+ (home-page "https://github.com/aws/serverless-application-model")
(synopsis "Transform AWS SAM templates into AWS CloudFormation templates")
(description
"AWS SAM Translator is a library that transform @dfn{Serverless Application
base-commit: 142344b6efa42e1a4d57a4bdf14dfb3ca1cba25a
--
2.30.2
guix-patches <at> gnu.org:bug#51396; Package guix-patches.
(Fri, 05 Nov 2021 02:00:02 GMT) Full text and rfc822 format available.Message #32 received at 51396 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 51396 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v2 2/8] gnu: python-cfn-lint: Update to 0.54.3. Date: Fri, 5 Nov 2021 01:58:30 +0000
* gnu/packages/python-web.scm (python-cfn-lint): Update to 0.54.3.
[home-page]: Follow redirect.
---
gnu/packages/python-web.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 29c0b7e15e..4ffdb0ad7f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -496,8 +496,8 @@ emit information from within their applications to the AWS X-Ray service.")
(define-public python-cfn-lint
(package
(name "python-cfn-lint")
- (version "0.54.1")
- (home-page "https://github.com/aws-cloudformation/cfn-python-lint")
+ (version "0.54.3")
+ (home-page "https://github.com/aws-cloudformation/cfn-lint")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -506,7 +506,7 @@ emit information from within their applications to the AWS X-Ray service.")
(file-name (git-file-name name version))
(sha256
(base32
- "161mzzlpbi85q43kwzrj39qb32l6wg6xhnbbd4z860yrfbymsn87"))))
+ "106qf19n2k6sdjkb4006aidibd24qqiw901c1613xgjpnyw4dyl6"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
--
2.30.2
guix-patches <at> gnu.org:bug#51396; Package guix-patches.
(Fri, 05 Nov 2021 02:00:03 GMT) Full text and rfc822 format available.Message #35 received at 51396 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 51396 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v2 3/8] gnu: python-cfn-lint: Honor #:tests? flag. Date: Fri, 5 Nov 2021 01:58:31 +0000
* gnu/packages/python-web.scm (python-cfn-lint)[arguments]: Make some cosmetic
changes. Adjust custom 'check phase to honor the #:tests? flag.
---
gnu/packages/python-web.scm | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 4ffdb0ad7f..66411173d0 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -509,23 +509,23 @@ emit information from within their applications to the AWS X-Ray service.")
"106qf19n2k6sdjkb4006aidibd24qqiw901c1613xgjpnyw4dyl6"))))
(build-system python-build-system)
(arguments
- `(#:phases (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- ;; Remove test for the documentation update scripts
- ;; to avoid a dependency on 'git'.
- (delete-file
- "test/unit/module/maintenance/test_update_documentation.py")
- (delete-file
- "test/unit/module/maintenance/test_update_resource_specs.py")
- (setenv "PYTHONPATH"
- (string-append "./build/lib:"
- (getenv "PYTHONPATH")))
- (setenv "PATH" (string-append out "/bin:"
- (getenv "PATH")))
- (invoke "python" "-m" "unittest" "discover" "-v"
- "-s" "test")))))))
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+ (when tests?
+ (let ((out (assoc-ref outputs "out")))
+ ;; Remove test for the documentation update scripts
+ ;; to avoid a dependency on 'git'.
+ (delete-file
+ "test/unit/module/maintenance/test_update_documentation.py")
+ (delete-file
+ "test/unit/module/maintenance/test_update_resource_specs.py")
+ (add-installed-pythonpath inputs outputs)
+ (setenv "PATH" (string-append out "/bin:"
+ (getenv "PATH")))
+ (invoke "python" "-m" "unittest" "discover"
+ "-s" "test"))))))))
(native-inputs
`(("python-pydot" ,python-pydot)
("python-mock" ,python-mock)))
--
2.30.2
guix-patches <at> gnu.org:bug#51396; Package guix-patches.
(Fri, 05 Nov 2021 02:00:03 GMT) Full text and rfc822 format available.Message #38 received at 51396 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 51396 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v2 4/8] gnu: python-s3transfer: Update to 0.5.0. Date: Fri, 5 Nov 2021 01:58:32 +0000
* gnu/packages/python-web.scm (python-s3transfer): Update to 0.5.0.
[arguments]<#:phases>: Remove 'patch phase because the issue was fixed
upstream. Don't return #t in custom 'check phase.
---
gnu/packages/python-web.scm | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 66411173d0..2953198a08 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3404,32 +3404,22 @@ Betamax that may possibly end up in the main package.")
(define-public python-s3transfer
(package
(name "python-s3transfer")
- (version "0.3.3")
+ (version "0.5.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "s3transfer" version))
(sha256
(base32
- "1nzp5kwmy9669334shcz9ipg89jgpdqhrmbkgdg18r7wmvi3f6lj"))))
+ "0k6sc956yrrv9b4laa0r79jhxajpyxr21jcd1ka8m1n53lz85vah"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'patch
- (lambda _
- ;; There's a small issue with one test with Python 3.8, this
- ;; change has been suggested upstream:
- ;; https://github.com/boto/s3transfer/pull/164
- (substitute* "tests/unit/test_s3transfer.py"
- (("super\\(FailedDownloadParts, self\\)\\.submit\\(function\\)")
- "futures.Future()"))
- #t))
(replace 'check
(lambda _
;; Some of the 'integration' tests require network access or
;; login credentials.
- (invoke "nosetests" "--exclude=integration")
- #t)))))
+ (invoke "nosetests" "--exclude=integration"))))))
(native-inputs
`(("python-docutils" ,python-docutils)
("python-mock" ,python-mock)
--
2.30.2
guix-patches <at> gnu.org:bug#51396; Package guix-patches.
(Fri, 05 Nov 2021 02:00:04 GMT) Full text and rfc822 format available.Message #41 received at 51396 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 51396 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v2 5/8] gnu: python-s3transfer: Honor #:tests? flag. Date: Fri, 5 Nov 2021 01:58:33 +0000
* gnu/packages/python-web.scm (python-s3transfer)[arguments]: Adjust custom
'check phase to honor the #:tests? flag.
---
gnu/packages/python-web.scm | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 2953198a08..9d1ae458d3 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3416,10 +3416,11 @@ Betamax that may possibly end up in the main package.")
`(#:phases
(modify-phases %standard-phases
(replace 'check
- (lambda _
- ;; Some of the 'integration' tests require network access or
- ;; login credentials.
- (invoke "nosetests" "--exclude=integration"))))))
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ ;; Some of the 'integration' tests require network access or
+ ;; login credentials.
+ (invoke "nosetests" "--exclude=integration")))))))
(native-inputs
`(("python-docutils" ,python-docutils)
("python-mock" ,python-mock)
--
2.30.2
guix-patches <at> gnu.org:bug#51396; Package guix-patches.
(Fri, 05 Nov 2021 02:00:04 GMT) Full text and rfc822 format available.Message #44 received at 51396 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 51396 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v2 6/8] gnu: Update awscli, python-boto3 and python-botocore. Date: Fri, 5 Nov 2021 01:58:34 +0000
awscli, botocore and boto3 work together and typically require matching
versions.
* gnu/packages/python-xyz.scm (python-botocore): Update to 1.22.11.
(python-boto3): Update to 1.19.11.
[native-inputs]: Add python-pytest.
* gnu/packages/python-web.scm (awscli): Update to 1.21.11.
---
gnu/packages/python-web.scm | 4 ++--
gnu/packages/python-xyz.scm | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 9d1ae458d3..a2d82f03cd 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2866,14 +2866,14 @@ supports url redirection and retries, and also gzip and deflate decoding.")
(package
;; Note: updating awscli typically requires updating botocore as well.
(name "awscli")
- (version "1.18.203")
+ (version "1.21.11")
(source
(origin
(method url-fetch)
(uri (pypi-uri name version))
(sha256
(base32
- "128zg24961j8nmnq2dxqg6a7zwh3qgv87cmvclsdqwwih9nigxv9"))))
+ "0fkivwbx4nind5b7l4jhqm5bb9drgqsclcslrg4aggf9rcs4g4s0"))))
(build-system python-build-system)
(arguments
;; FIXME: The 'pypi' release does not contain tests.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f12cca9757..24aa9d95a7 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13473,14 +13473,14 @@ This software is unmaintained, and new projects should use @code{boto3} instead.
;; are compatible.
(package
(name "python-botocore")
- (version "1.19.22")
+ (version "1.22.11")
(source
(origin
(method url-fetch)
(uri (pypi-uri "botocore" version))
(sha256
(base32
- "0iim86x7c6hqmvd61ygz6x6x9glnsfbnyzv2y67qjdcdx8jpkmw7"))))
+ "1z7g2scyzvfq4yj9b4w911k7802ry1v6lqfnwq12l0ak7ywmsvrh"))))
(build-system python-build-system)
(arguments
;; FIXME: Many tests are failing.
@@ -13501,7 +13501,7 @@ interface to the Amazon Web Services (AWS) API.")
(define-public python-boto3
(package
(name "python-boto3")
- (version "1.16.22")
+ (version "1.19.11")
(home-page "https://github.com/boto/boto3")
(source (origin
(method git-fetch)
@@ -13509,19 +13509,19 @@ interface to the Amazon Web Services (AWS) API.")
(file-name (git-file-name name version))
(sha256
(base32
- "0h20hgl4yfl58g75qhb6ibrdmzn47md3srgar7hask14cjmfhfy3"))))
+ "1wv0ci2z5ywvm63dh4mp64vqyyvkm4qxc8dxv8ncrqiiphpgr9aq"))))
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'delete-network-tests
;; Deleting integration tests because they are trying to connect to AWS.
- (lambda _
- (delete-file-recursively "tests/integration")
- #t)))))
+ (lambda _
+ (delete-file-recursively "tests/integration"))))))
(build-system python-build-system)
(native-inputs
`(("python-nose" ,python-nose)
- ("python-mock" ,python-mock)))
+ ("python-mock" ,python-mock)
+ ("python-pytest" ,python-pytest)))
(propagated-inputs
`(("python-botocore" ,python-botocore)
("python-jmespath" ,python-jmespath)
--
2.30.2
guix-patches <at> gnu.org:bug#51396; Package guix-patches.
(Fri, 05 Nov 2021 02:00:05 GMT) Full text and rfc822 format available.Message #47 received at 51396 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 51396 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v2 7/8] gnu: python-moto: Update to 2.2.12. Date: Fri, 5 Nov 2021 01:58:35 +0000
* gnu/packages/python-xyz.scm (python-moto): Update to 2.2.12.
[arguments]: Make some cosmetic changes.
<#:phases>: Don't return #t. Support cross-compilation in
'patch-hardcoded-executable-names. Skip more tests and simplify the custom
'check phase.
---
gnu/packages/python-xyz.scm | 51 ++++++++++++++++++++++---------------
1 file changed, 30 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 24aa9d95a7..528e3b025a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13095,34 +13095,41 @@ text.")
(define-public python-moto
(package
(name "python-moto")
- ;; XXX: Use a pre-release for compatibility with latest botocore & friends.
- (version "1.3.16.dev134")
+ (version "2.2.12")
(source (origin
(method url-fetch)
(uri (pypi-uri "moto" version))
(sha256
(base32
- "1pix0c7zszjwzfy88n1rpih9vkdm25nqcvz93z850xvgwb4v81bd"))))
+ "0pvay0jp119lzzwf5qj5h6311271yq0w2i6344ds20grpf6g6gz8"))))
(build-system python-build-system)
(arguments
- `(#:phases (modify-phases %standard-phases
- (add-after 'unpack 'patch-hardcoded-executable-names
- (lambda _
- (substitute* "moto/batch/models.py"
- (("/bin/sh")
- (which "sh")))
- (substitute* (find-files "tests" "\\.py$")
- (("#!/bin/bash")
- (string-append "#!" (which "bash"))))
- #t))
- (replace 'check
- (lambda _
- (setenv "PYTHONPATH" (string-append "./build/lib:"
- (getenv "PYTHONPATH")))
- (invoke "pytest" "-vv" "-m" "not network"
- ;; These tests require Docker.
- "-k" "not test_terminate_job \
-and not test_invoke_function_from_sqs_exception"))))))
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-hardcoded-executable-names
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((bash-exec (string-append
+ (assoc-ref inputs "bash")
+ "/bin/sh")))
+ (substitute* "moto/batch/models.py"
+ (("/bin/sh") bash-exec))
+ (substitute* (find-files "tests" "\\.py$")
+ (("#!/bin/bash") (string-append "#!" bash-exec))))))
+ (replace 'check
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (add-installed-pythonpath inputs outputs)
+ (invoke "pytest" "-vv" "-m" "not network" "-k"
+ (string-append
+ ;; These tests require Docker.
+ "not test_terminate_job"
+ " and not test_invoke_function_from_sqs_exception"
+ " and not test_rotate_secret_lambda_invocations"
+ ;; These tests also require the network.
+ " and not test_put_record_batch_http_destination"
+ " and not test_put_record_http_destination"
+ " and not test_dependencies"
+ " and not test_cancel_running_job"
+ " and not test_container_overrides")))))))
(native-inputs
`(("python-flask" ,python-flask)
("python-flask-cors" ,python-flask-cors)
@@ -13130,6 +13137,8 @@ and not test_invoke_function_from_sqs_exception"))))))
("python-parameterized" ,python-parameterized)
("python-pytest" ,python-pytest)
("python-sure" ,python-sure)))
+ (inputs
+ `(("bash" ,bash-minimal)))
(propagated-inputs
`(("python-aws-xray-sdk" ,python-aws-xray-sdk)
("python-boto" ,python-boto)
--
2.30.2
guix-patches <at> gnu.org:bug#51396; Package guix-patches.
(Fri, 05 Nov 2021 02:01:02 GMT) Full text and rfc822 format available.Message #50 received at 51396 <at> debbugs.gnu.org (full text, mbox):
From: Vinicius Monego <monego <at> posteo.net> To: 51396 <at> debbugs.gnu.org Cc: Vinicius Monego <monego <at> posteo.net> Subject: [PATCH v2 8/8] gnu: python-moto: Honor #:tests? flag. Date: Fri, 5 Nov 2021 01:58:36 +0000
* gnu/packages/python-xyz.scm (python-moto)[arguments]: Adjust custom 'check
phase to honor the #:tests? flag.
---
gnu/packages/python-xyz.scm | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 528e3b025a..0ef836e0bc 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13116,20 +13116,21 @@ text.")
(substitute* (find-files "tests" "\\.py$")
(("#!/bin/bash") (string-append "#!" bash-exec))))))
(replace 'check
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (add-installed-pythonpath inputs outputs)
- (invoke "pytest" "-vv" "-m" "not network" "-k"
- (string-append
- ;; These tests require Docker.
- "not test_terminate_job"
- " and not test_invoke_function_from_sqs_exception"
- " and not test_rotate_secret_lambda_invocations"
- ;; These tests also require the network.
- " and not test_put_record_batch_http_destination"
- " and not test_put_record_http_destination"
- " and not test_dependencies"
- " and not test_cancel_running_job"
- " and not test_container_overrides")))))))
+ (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+ (when tests?
+ (add-installed-pythonpath inputs outputs)
+ (invoke "pytest" "-vv" "-m" "not network" "-k"
+ (string-append
+ ;; These tests require Docker.
+ "not test_terminate_job"
+ " and not test_invoke_function_from_sqs_exception"
+ " and not test_rotate_secret_lambda_invocations"
+ ;; These tests also require the network.
+ " and not test_put_record_batch_http_destination"
+ " and not test_put_record_http_destination"
+ " and not test_dependencies"
+ " and not test_cancel_running_job"
+ " and not test_container_overrides"))))))))
(native-inputs
`(("python-flask" ,python-flask)
("python-flask-cors" ,python-flask-cors)
--
2.30.2
Ludovic Courtès <ludo <at> gnu.org>:Vinicius Monego <monego <at> posteo.net>:Message #55 received at 51396-done <at> debbugs.gnu.org (full text, mbox):
From: Ludovic Courtès <ludo <at> gnu.org> To: Vinicius Monego <monego <at> posteo.net> Cc: 51396-done <at> debbugs.gnu.org Subject: Re: bug#51396: [PATCH 0/7] Update python-moto. Date: Sun, 12 Dec 2021 00:27:36 +0100
Hi, Vinicius Monego <monego <at> posteo.net> skribis: > gnu: python-aws-sam-translator: Update to 1.39.0. > gnu: python-cfn-lint: Update to 0.54.3. > gnu: python-cfn-lint: Respect #:tests?. > gnu: python-s3transfer: Update to 0.5.0. > gnu: Update awscli, python-boto3 and python-botocore. > gnu: python-moto: Update to 2.2.11. > gnu: python-moto: Respect #:tests?. Finally applied v2 of the patch set. Sorry for the long delay, and thank you! Ludo’.
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Sun, 09 Jan 2022 12:24:10 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.