From patchwork Mon May 22 20:17:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 50239 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4B31727BBE9; Mon, 22 May 2023 21:18:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D3A0E27BBE2 for ; Mon, 22 May 2023 21:18:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1Bym-0002Qh-Bw; Mon, 22 May 2023 16:18:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1Byk-0002QU-VG for guix-patches@gnu.org; Mon, 22 May 2023 16:18:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q1Byk-0003D1-MG for guix-patches@gnu.org; Mon, 22 May 2023 16:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q1Byk-0007eU-G5 for guix-patches@gnu.org; Mon, 22 May 2023 16:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63453] [PATCH v2 1/3] gnu: python-docrepr: Fix tests. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 22 May 2023 20:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63453 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63453@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 63453-submit@debbugs.gnu.org id=B63453.168478667729376 (code B ref 63453); Mon, 22 May 2023 20:18:02 +0000 Received: (at 63453) by debbugs.gnu.org; 22 May 2023 20:17:57 +0000 Received: from localhost ([127.0.0.1]:36861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1Bye-0007dj-Hz for submit@debbugs.gnu.org; Mon, 22 May 2023 16:17:56 -0400 Received: from mail-yw1-f172.google.com ([209.85.128.172]:47405) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q1Bya-0007dG-Uy for 63453@debbugs.gnu.org; Mon, 22 May 2023 16:17:55 -0400 Received: by mail-yw1-f172.google.com with SMTP id 00721157ae682-56186035b61so85984497b3.3 for <63453@debbugs.gnu.org>; Mon, 22 May 2023 13:17:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20221208.gappssmtp.com; s=20221208; t=1684786667; x=1687378667; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ANPSWUK1KYyW8QsOwAygcstgaArfrwijfFIb/VKyBY8=; b=QUSMWlW7IBHXYv3Gj0I5Fn4RxSB6mu7bvKcaaChE7yNj52SqWT+BaFzeVXnf7Lok1Y A/LDtbIcxmdo3o3k/fAiGhGSjCR2ctRaYdGv6KxJaHH+OZJm+xtUYr9n0Shn8Jm6TI2Q hNTuEUkcEK27dlnDuQYzFiTfVV4YgLvrvYLlCdPAvos6oxVsKGmpourAr6O4GjCu/JJb SWeov+/KlEtvPOsOnFlSDsCOFq4X6lrhndoa0zMT0nQSkJsj+Krw4qqUToy/fUXLmFBY NvhlKMPydJwDhY/HGVgqxId+3///19X9I1le1E/booHATc6AZXsemEi0cb8Bts+bUoTr tnCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684786667; x=1687378667; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ANPSWUK1KYyW8QsOwAygcstgaArfrwijfFIb/VKyBY8=; b=WXxDGTPn8mV202Uctf9H0a33Xral4AQb/tSbr07Fs2YRTh0dZnYc4AmW0fGc4tls3b a3kGHzCjKhYxkhN0wyaopmmyabFdi0d9NFNWY0xSkoZo1mdB7G+nKZH0EV8GNmvaeN3V GRzAZw/qd6PsKKAY/osRcVftNLlMwOmoLa08ZDla3E4tbqZaRryQL6WU/CLk4JVtKXvC jp0J5Lr0WGAyrp7sJtGtlqBeJ+tiu7BD2FwIl7Upjsd3Aubdb5QiWGuv10utnjCMuV1F 59hT2wfZQrO1I1rl2aRm1bHh22grskwjmOnArSMk9oVoA1s+ENPTqz5cK5CFI0IsuvlJ k0EA== X-Gm-Message-State: AC+VfDz4qmmlsKTrBim1vp9ss8SUjY0g6iT3A87kmWBYflmwvKXhQAJw QKNGY5wYGUTNcI5VEY+m4BQDUDkI4RXieBgG1Wc= X-Google-Smtp-Source: ACHHUZ5otVkxi3iQQlXxvh0kM13S7iRNdkZ3WUlZ5/OqtyTzbuQ3MX+0NvSLOYRzdidB1K30uVFbfw== X-Received: by 2002:a0d:e343:0:b0:55a:60d1:814b with SMTP id m64-20020a0de343000000b0055a60d1814bmr11923835ywe.20.1684786667004; Mon, 22 May 2023 13:17:47 -0700 (PDT) Received: from ip-172-31-16-142.us-east-2.compute.internal (ec2-18-118-111-177.us-east-2.compute.amazonaws.com. [18.118.111.177]) by smtp.gmail.com with ESMTPSA id a11-20020a81bb4b000000b0054e82b6a95esm2311785ywl.42.2023.05.22.13.17.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 May 2023 13:17:46 -0700 (PDT) From: Greg Hogan Date: Mon, 22 May 2023 20:17:39 +0000 Message-Id: <2a767f5253f02d05d29a0c3107d5a8c4bd28724b.1684785831.git.code@greghogan.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/python-docrepr-fix-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/documentation.scm (python-docrepr)[source]: Use it here. --- gnu/local.mk | 1 + gnu/packages/documentation.scm | 3 ++- .../patches/python-docrepr-fix-tests.patch | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-docrepr-fix-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index c10fb01bb3..b5d43d7203 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1682,6 +1682,7 @@ dist_patch_DATA = \ %D%/packages/patches/prusa-slicer-with-cereal-1.3.1.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ %D%/packages/patches/python-chai-drop-python2.patch \ + %D%/packages/patches/python-docrepr-fix-tests.patch \ %D%/packages/patches/python-feedparser-missing-import.patch \ %D%/packages/patches/python-louvain-fix-test.patch \ %D%/packages/patches/python-random2-getrandbits-test.patch \ diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index bbaa01e392..be64bc4f95 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -296,7 +296,8 @@ (define-public python-docrepr (file-name (git-file-name name version)) (sha256 (base32 - "1ma5gwy93m1djd3zdlnqfrwhgr8ic1qbsz5kkrb9f987ax40lfkd")))) + "1ma5gwy93m1djd3zdlnqfrwhgr8ic1qbsz5kkrb9f987ax40lfkd")) + (patches (search-patches "python-docrepr-fix-tests.patch")))) (build-system python-build-system) (arguments (list diff --git a/gnu/packages/patches/python-docrepr-fix-tests.patch b/gnu/packages/patches/python-docrepr-fix-tests.patch new file mode 100644 index 0000000000..a209921025 --- /dev/null +++ b/gnu/packages/patches/python-docrepr-fix-tests.patch @@ -0,0 +1,16 @@ +Fixes the errors with use of asyncio in docrepr/tests/test_output.py: + +> await compare_screenshots(test_id, url) +E TypeError: 'coroutine' object is not callable + +--- a/conftest.py ++++ b/conftest.py +@@ -65,7 +65,7 @@ def _open_browser(url): + + + @pytest.fixture +-async def compare_screenshots(request): ++def compare_screenshots(request): + """Run visual regression test on the output.""" + async def _compare_screenshots(test_id, url): + if (request.config.getoption(COMPARE_SCREENSHOTS_OPTION) or