From patchwork Sun May 15 04:37:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 39324 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 A6E8727BBEA; Sun, 15 May 2022 06:00:05 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,TVD_SPACE_RATIO,WEIRD_QUOTING 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 3526427BBE9 for ; Sun, 15 May 2022 06:00:05 +0100 (BST) Received: from localhost ([::1]:59674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nq6MN-0003Kq-FJ for patchwork@mira.cbaines.net; Sun, 15 May 2022 01:00:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nq6HY-0007Rs-Gz for guix-patches@gnu.org; Sun, 15 May 2022 00:55:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54241) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nq6HX-00063f-3B for guix-patches@gnu.org; Sun, 15 May 2022 00:55:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nq6HX-0003Pl-22 for guix-patches@gnu.org; Sun, 15 May 2022 00:55:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55424] [PATCH 067/602] gnu: Remove python2-parameterized. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 May 2022 04:55:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55424 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55424@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 55424-submit@debbugs.gnu.org id=B55424.165259048112996 (code B ref 55424); Sun, 15 May 2022 04:55:03 +0000 Received: (at 55424) by debbugs.gnu.org; 15 May 2022 04:54:41 +0000 Received: from localhost ([127.0.0.1]:48117 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq6HB-0003NS-8T for submit@debbugs.gnu.org; Sun, 15 May 2022 00:54:41 -0400 Received: from mail-qt1-f178.google.com ([209.85.160.178]:46858) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nq6Gz-0003MK-QV for 55424@debbugs.gnu.org; Sun, 15 May 2022 00:54:30 -0400 Received: by mail-qt1-f178.google.com with SMTP id u35so10054456qtc.13 for <55424@debbugs.gnu.org>; Sat, 14 May 2022 21:54:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+nqijKXHE9TAXeovpSYqUHa28E+/8dnroN7kIAmWUPM=; b=Av/748MxtghZtF8+cYVHsm90lfJv2fGSobXYkQWjurdj2dguWZB6Gqg8T878WIPcj4 oWyduWXzDKHuN607Pe7bAE6439u4tVfDfacQSAsmlZQyXFu16kmBTXdiZ5YZY9veqJVk gL/WKHQjCSJu1KIbOPrmVofKdvaCC8rwXb2jLuqQAexRZEIPh0tqS0ftw81pt85PzAKL Dvr2bPrh/OPj5UweQLX0Q8DdlQ3Fbn0yMz1sdRk8AgqIkSPfIORN6YSjLcr+ugwFPYZp tctGybfFg8OUYeMqGQLbtZeQEem4Wmqsa4l9gOoBhi/mxc93Vl1BzMhppLnfYgalDgnT lu7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+nqijKXHE9TAXeovpSYqUHa28E+/8dnroN7kIAmWUPM=; b=CbOqlXexGTCy8j5e4Yfd2AFZ68zUMp6Qd2f2tITk+h/Ttiyj3MhjpXHKbYWAYRPDKR oyByTYTXDYbirMApp/O7N2d+/xGZ9eEvKpbM7TOHHK2R+wFQiXUrQRvX0GJbHLjlUG8B pzjAumxFL/UvUD7KCllJBrzRAi8okJ091gDQDXNKxQswzZ8YjLz+QYYK10j1N2gdKSPy Ik8RnZ2fJZp1Ut3bsLl3f7zCHgQg+MEULPc8eqqwPC0SVt0wmkgIbfRD0MQ8iggePipg TTCaxvzL7BzrN3HGLgEuc3FsCIAZCCVQoracPipB2VH5sACCoNXVbGFTO40FEPgsTYdp Gd2w== X-Gm-Message-State: AOAM5325vsyBBKiIWx9O8cIEgYGLMyI0vpE4+Ex23B1IzOXxAN62EZXd rgLHl0cY0dGTy1zLnkpdu83Ud8WHwUIhsg== X-Google-Smtp-Source: ABdhPJxwqQ8jZMbnbve4ymAG/hYCzN1/FYPLdh6Ojxjns/NsTXACl74q67hdapCQ0E88hvxMHI0JlQ== X-Received: by 2002:a05:620a:1087:b0:6a0:151:658 with SMTP id g7-20020a05620a108700b006a001510658mr8616278qkk.108.1652590060815; Sat, 14 May 2022 21:47:40 -0700 (PDT) Received: from localhost.localdomain (dsl-149-239.b2b2c.ca. [66.158.149.239]) by smtp.gmail.com with ESMTPSA id 2-20020ac82082000000b002f39b99f672sm4287690qtd.12.2022.05.14.21.47.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 May 2022 21:47:40 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 15 May 2022 00:37:34 -0400 Message-Id: <20220515044629.6843-67-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220515044629.6843-1-maxim.cournoyer@gmail.com> References: <20220515044629.6843-1-maxim.cournoyer@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/check.scm (python2-parameterized): Delete variable. * gnu/packages/patches/python2-parameterized-docstring-test.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. --- gnu/local.mk | 1 - gnu/packages/check.scm | 11 ----------- .../python2-parameterized-docstring-test.patch | 18 ------------------ 3 files changed, 30 deletions(-) delete mode 100644 gnu/packages/patches/python2-parameterized-docstring-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4ef12fd68e..77f5ee9c33 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1701,7 +1701,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-typing-inspect-fix.patch \ %D%/packages/patches/python-packaging-test-arch.patch \ - %D%/packages/patches/python2-parameterized-docstring-test.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python-pycrypto-time-clock.patch \ diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index cffcd54623..f8b4fc7e2f 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -818,19 +818,8 @@ (define-public python-parameterized (description "Parameterized is a Python library that aims to fix parameterized testing for every Python test framework. It supports nose, py.test, and unittest.") - (properties `((python2-variant . ,(delay python2-parameterized)))) (license license:bsd-2))) -(define-public python2-parameterized - (let ((base (package-with-python2 (strip-python2-variant - python-parameterized)))) - (package/inherit - base - (source - (origin - (inherit (package-source base)) - (patches (search-patches "python2-parameterized-docstring-test.patch"))))))) - (define-public python-minimock (package (name "python-minimock") diff --git a/gnu/packages/patches/python2-parameterized-docstring-test.patch b/gnu/packages/patches/python2-parameterized-docstring-test.patch deleted file mode 100644 index 14691e1904..0000000000 --- a/gnu/packages/patches/python2-parameterized-docstring-test.patch +++ /dev/null @@ -1,18 +0,0 @@ -Skip unicode docstring test, required when running on Python 2. - -See . - ---- a/parameterized/test.py -+++ b/parameterized/test.py -@@ -284,11 +284,6 @@ - " More" %(foo, ) - ) - -- @parameterized.expand([param("foo")]) -- def test_unicode_docstring(self, foo): -- u"""Döcumentation.""" -- self._assert_docstring(u"Döcumentation [with foo=%r]." %(foo, )) -- - @parameterized.expand([param("foo", )]) - def test_default_values_get_correct_value(self, foo, bar=12): - """Documentation"""