unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Vinicius Monego <monego@posteo.net>
To: 51396@debbugs.gnu.org
Cc: Vinicius Monego <monego@posteo.net>
Subject: [bug#51396] [PATCH 6/7] gnu: python-moto: Update to 2.2.11.
Date: Mon, 25 Oct 2021 19:50:04 +0000	[thread overview]
Message-ID: <20211025195005.61439-6-monego@posteo.net> (raw)
In-Reply-To: <20211025195005.61439-1-monego@posteo.net>

* 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





  parent reply	other threads:[~2021-10-25 19:54 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-25 19:44 [bug#51396] [PATCH 0/7] Update python-moto Vinicius Monego
2021-10-25 19:49 ` [bug#51396] [PATCH 1/7] gnu: python-aws-sam-translator: Update to 1.39.0 Vinicius Monego
2021-10-25 19:50   ` [bug#51396] [PATCH 2/7] gnu: python-cfn-lint: Update to 0.54.3 Vinicius Monego
2021-10-25 19:50   ` [bug#51396] [PATCH 3/7] gnu: python-cfn-lint: Respect #:tests? Vinicius Monego
2021-10-25 19:50   ` [bug#51396] [PATCH 4/7] gnu: python-s3transfer: Update to 0.5.0 Vinicius Monego
2021-10-25 19:50   ` [bug#51396] [PATCH 5/7] gnu: Update awscli, python-boto3 and python-botocore Vinicius Monego
2021-10-25 19:50   ` Vinicius Monego [this message]
2021-10-25 19:50   ` [bug#51396] [PATCH 7/7] gnu: python-moto: Respect #:tests? Vinicius Monego
2021-11-05  1:58 ` [bug#51396] [PATCH v2 1/8] gnu: python-aws-sam-translator: Update to 1.40.0 Vinicius Monego
2021-11-05  1:58   ` [bug#51396] [PATCH v2 2/8] gnu: python-cfn-lint: Update to 0.54.3 Vinicius Monego
2021-11-05  1:58   ` [bug#51396] [PATCH v2 3/8] gnu: python-cfn-lint: Honor #:tests? flag Vinicius Monego
2021-11-05  1:58   ` [bug#51396] [PATCH v2 4/8] gnu: python-s3transfer: Update to 0.5.0 Vinicius Monego
2021-11-05  1:58   ` [bug#51396] [PATCH v2 5/8] gnu: python-s3transfer: Honor #:tests? flag Vinicius Monego
2021-11-05  1:58   ` [bug#51396] [PATCH v2 6/8] gnu: Update awscli, python-boto3 and python-botocore Vinicius Monego
2021-11-05  1:58   ` [bug#51396] [PATCH v2 7/8] gnu: python-moto: Update to 2.2.12 Vinicius Monego
2021-11-05  1:58   ` [bug#51396] [PATCH v2 8/8] gnu: python-moto: Honor #:tests? flag Vinicius Monego
2021-12-11 23:27 ` bug#51396: [PATCH 0/7] Update python-moto Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211025195005.61439-6-monego@posteo.net \
    --to=monego@posteo.net \
    --cc=51396@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).