From patchwork Thu Mar 4 14:09:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 27436 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 E73E327BC4F; Thu, 4 Mar 2021 14:11:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2EE4127BC50 for ; Thu, 4 Mar 2021 14:11:24 +0000 (GMT) Received: from localhost ([::1]:45184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHohH-0006ji-83 for patchwork@mira.cbaines.net; Thu, 04 Mar 2021 09:11:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHogw-0006j4-VW for guix-patches@gnu.org; Thu, 04 Mar 2021 09:11:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46646) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lHogw-0007Pk-Om for guix-patches@gnu.org; Thu, 04 Mar 2021 09:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lHogw-0005fB-Ki for guix-patches@gnu.org; Thu, 04 Mar 2021 09:11:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46919] [PATCHES] Update python-asyncssh and dependencies Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 04 Mar 2021 14:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46919 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46919@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161486701221665 (code B ref -1); Thu, 04 Mar 2021 14:11:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Mar 2021 14:10:12 +0000 Received: from localhost ([127.0.0.1]:58190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lHog0-0005d3-OO for submit@debbugs.gnu.org; Thu, 04 Mar 2021 09:10:11 -0500 Received: from lists.gnu.org ([209.51.188.17]:45958) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lHofy-0005cg-IG for submit@debbugs.gnu.org; Thu, 04 Mar 2021 09:10:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHofy-0006Gx-8F for guix-patches@gnu.org; Thu, 04 Mar 2021 09:10:02 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:45652) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lHofr-0006om-W5 for guix-patches@gnu.org; Thu, 04 Mar 2021 09:10:02 -0500 Received: by mail-wr1-x433.google.com with SMTP id e10so27561645wro.12 for ; Thu, 04 Mar 2021 06:09:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leibniz-psychology-org.20150623.gappssmtp.com; s=20150623; h=date:from:to:subject:message-id:mime-version:content-disposition; bh=Psvdpm9vJw2gelh14bK3HReMyamguYJ65RDZ/pFYeKo=; b=q6ko0dlfJlyE8+NRnCrNIClC/l0TL4ZX/ODB09rw/B/c4Aa2I9LPJGduJ7vksxW1aa V2qEBz9IwEYy8Kp+4pK/KB+VSkPwN1qW48DncACYmXEFp2fCaN7Ta8i7v9kRXfvGYxDA DkynQ1GgCFh/nLGYJ9xDCarpTnNNeIAA9tPNXDziL5704wXxy1FtewSiTEsdWPbpg1yM 4QAmubMapxPPqQBAuG3B4sIjbFTA/AQr501wzd0EJOqyDQIxirYraKLO5Z9dhOmkoCBY blVY+4euZPYfdE0gYx4Lmt0zJdIbNxDgtwYrewsx5kMtvGuIIq710OiViS5v5lFudI8J gAHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition; bh=Psvdpm9vJw2gelh14bK3HReMyamguYJ65RDZ/pFYeKo=; b=iWSBsK9h2uIvnHV62OHkZOlmCWsBI1s9Xu1cZXZYBbfswwbF6YJA3myEbmEUXWGVh5 PWsoOjavJHlaXURV1iEGcSw7ebzue02gOD1UOPQKFiAPLyqttu6WI8i/2PN9YLgjHUId W0GLKfE57hrghjljXNI4LaDkNUOVeo/xSB/oe098nSGDAE3XLIU1yoR5ABdklN+0Z7jo Cn46n11z+PuBNUBj2GOAzXPvEvgXF+LJqersSD4SZxb4wUrT0t38jcAHq17FpNI/VV5P mnWS/NUKFFfbGscEIymGRTVef1OHVknGo7gqk1Ws7fW1NNkf7et5DXiWaWnZG2PlvUTd RFuA== X-Gm-Message-State: AOAM532ovWJJtNdDQ5Mye8eMvrL7XOdmif1sYm5Cf/lrE3fsV76SwXf+ jCXvlCP76IYQ4oDl6/NkM2FoWpeOx7PP+Sgk885oDlC8tao+X5vTQJfK0gEh+VwJmxOkulSKrzq M0NaA4FsVybcApGAkJr68RHVRfTJzfqoTl2AnTbNWDCMG8KpgiOIEIMQ5np+CBjk7lmw+frkXiO wRdlpmRfaN0A== X-Google-Smtp-Source: ABdhPJzAxocNuqZtShY65o8fUHkHyUyFYEYQ8N/A02ZVaHze6ThWCeb0oZECJY984lx3zkHGi7Fv9w== X-Received: by 2002:adf:e809:: with SMTP id o9mr4406751wrm.110.1614866993831; Thu, 04 Mar 2021 06:09:53 -0800 (PST) Received: from localhost (dynamic-2a01-0c22-d0c9-b700-c12b-5b04-75af-596d.c22.pool.telefonica.de. [2a01:c22:d0c9:b700:c12b:5b04:75af:596d]) by smtp.gmail.com with ESMTPSA id s83sm1031335wmf.26.2021.03.04.06.09.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Mar 2021 06:09:52 -0800 (PST) Date: Thu, 4 Mar 2021 15:09:51 +0100 From: Lars-Dominik Braun Message-ID: <20210304140951.GA2963@zpidnp36> MIME-Version: 1.0 Content-Disposition: inline Received-SPF: none client-ip=2a00:1450:4864:20::433; envelope-from=ldb@leibniz-psychology.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Hi, attached patches update python-asyncssh and its dependency python-gssapi. I’m also dropping python-shouldbe, since it has no dependents after applying these patches and is unmaintained upstream. Cheers, Lars From 8f6ba6b314222244cec40504c7b108de9a2b918e Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 4 Mar 2021 12:00:47 +0100 Subject: [PATCH 3/3] gnu: python-shouldbe: Remove. Unmaintained upstream and its only dependent (python-gssapi) dropped it. * gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch: Remove. * gnu/local.mk: Drop patch file. * gnu/packages/python-xyz.scm (python-shouldbe): Remove. --- gnu/local.mk | 1 - .../python-shouldbe-0.1.2-cpy3.8.patch | 82 ------------------- gnu/packages/python-xyz.scm | 23 ------ 3 files changed, 106 deletions(-) delete mode 100644 gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3557d9f429..815648d033 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1554,7 +1554,6 @@ dist_patch_DATA = \ %D%/packages/patches/python2-pygobject-2-deprecation.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ %D%/packages/patches/python-robotframework-source-date-epoch.patch \ - %D%/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \ %D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ diff --git a/gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch b/gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch deleted file mode 100644 index f3b56e42d6..0000000000 --- a/gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch +++ /dev/null @@ -1,82 +0,0 @@ -Fix compatibility with Python 3.8. - -Upstream issue: https://github.com/DirectXMan12/should_be/pull/5 - -diff -x '*.pyc' -Naur shouldbe-0.1.2/should_be/core.py shouldbe-0.1.2.patched/should_be/core.py ---- shouldbe-0.1.2/should_be/core.py 2019-03-06 07:38:22.000000000 +0100 -+++ shouldbe-0.1.2.patched/should_be/core.py 2020-05-18 08:44:24.214664704 +0200 -@@ -103,7 +103,7 @@ - return resf - - --def buildCode(baseCode, argcount=None, kwonlyargcount=None, -+def buildCode(baseCode, argcount=None, posonlyargcount=None, kwonlyargcount=None, - nlocals=None, stacksize=None, flags=None, - code=None, consts=None, names=None, - varnames=None, filename=None, name=None, -@@ -121,6 +121,24 @@ - nlocals or baseCode.co_nlocals, - stacksize or baseCode.co_stacksize, - flags or baseCode.co_flags, -+ code or baseCode.co_code, -+ consts or baseCode.co_consts, -+ names or baseCode.co_names, -+ varnames or baseCode.co_varnames, -+ filename or baseCode.co_filename, -+ name or baseCode.co_name, -+ firstlineno or baseCode.co_firstlineno, -+ lnotab or baseCode.co_lnotab, -+ freevars or baseCode.co_freevars, -+ cellvars or baseCode.co_cellvars) -+ elif hasattr(baseCode, 'co_posonlyargcount'): -+ # Python 3.8 -+ resc = CodeType(argcount or baseCode.co_argcount, -+ posonlyargcount or baseCode.co_posonlyargcount, -+ kwonlyargcount or baseCode.co_kwonlyargcount, -+ nlocals or baseCode.co_nlocals, -+ stacksize or baseCode.co_stacksize, -+ flags or baseCode.co_flags, - code or baseCode.co_code, - consts or baseCode.co_consts, - names or baseCode.co_names, -diff -x '*.pyc' -Naur shouldbe-0.1.2/should_be/tests/test_container_mixin.py shouldbe-0.1.2.patched/should_be/tests/test_container_mixin.py ---- shouldbe-0.1.2/should_be/tests/test_container_mixin.py 2019-03-01 06:38:16.000000000 +0100 -+++ shouldbe-0.1.2.patched/should_be/tests/test_container_mixin.py 2020-05-18 09:00:51.372531064 +0200 -@@ -7,31 +7,31 @@ - self.lst = [1, 2, 3] - - def test_should_include_iter(self): -- err_msg = (r'[a-zA-Z0-9.]+ should have included \[.+?\]' -+ err_msg = (r'[a-zA-Z0-9.()]+ should have included \[.+?\]' - r', but did not have items .+') -- self.assertRaisesRegexp(AssertionError, err_msg, -+ self.assertRaisesRegex(AssertionError, err_msg, - self.lst.should_include, [4]) - - self.lst.should_include([1, 2, 3]) - - def test_should_include_item(self): -- err_msg = (r'[a-zA-Z0-9.]+ should have included .+?' -+ err_msg = (r'[a-zA-Z0-9.()]+ should have included .+?' - r', but did not') -- self.assertRaisesRegexp(AssertionError, err_msg, -+ self.assertRaisesRegex(AssertionError, err_msg, - self.lst.should_include, 4) - - self.lst.should_include(3) - - def test_shouldnt_include_iter(self): - err_msg = 'should not have included' -- self.assertRaisesRegexp(AssertionError, err_msg, -+ self.assertRaisesRegex(AssertionError, err_msg, - self.lst.shouldnt_include, [2, 3]) - - self.lst.shouldnt_include([4, 5]) - - def test_shouldnt_include_item(self): - err_msg = 'should not have included' -- self.assertRaisesRegexp(AssertionError, err_msg, -+ self.assertRaisesRegex(AssertionError, err_msg, - self.lst.shouldnt_include, 3) - - self.lst.shouldnt_include(4) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 515d644e9e..0b981be7c1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21548,29 +21548,6 @@ and cuts down boilerplate code when testing libraries for asyncio.") (description "This project allows Python code to extend built-in types.") (license (list license:gpl3+ license:expat)))) -(define-public python-shouldbe - (package - (name "python-shouldbe") - (version "0.1.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "shouldbe" version)) - (sha256 - (base32 - "16zbvjxf71dl4yfbgcr6idyim3mdrfvix1dv8b95p0s9z07372pj")) - (patches (search-patches "python-shouldbe-0.1.2-cpy3.8.patch")))) - (build-system python-build-system) - (propagated-inputs - `(("python-forbiddenfruit" ,python-forbiddenfruit))) - (native-inputs - `(("python-nose" ,python-nose))) - (home-page "https://github.com/directxman12/should_be") - (synopsis "Python Assertion Helpers inspired by Shouldly") - (description - "Python Assertion Helpers inspired by Shouldly.") - (license license:isc))) - (define-public python-k5test (package (name "python-k5test") -- 2.25.1