From patchwork Sat Feb 24 07:59:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 60982 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 5335327BBEE; Sat, 24 Feb 2024 12:48:03 +0000 (GMT) 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,URIBL_BLOCKED autolearn=ham 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 BF85327BBEA for ; Sat, 24 Feb 2024 12:47:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdrRT-0001PC-3Y; Sat, 24 Feb 2024 07:47:47 -0500 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 1rdrRO-0001MN-QP for guix-patches@gnu.org; Sat, 24 Feb 2024 07:47:42 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rdrRO-0007Z9-Ia for guix-patches@gnu.org; Sat, 24 Feb 2024 07:47:42 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdrRm-0005EC-K1 for guix-patches@gnu.org; Sat, 24 Feb 2024 07:48:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69352] [PATCH 12/13] gnu: python-telingo: Update to 2.1.3. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Feb 2024 12:48:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69352 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69352@debbugs.gnu.org Received: via spool by 69352-submit@debbugs.gnu.org id=B69352.170877884519887 (code B ref 69352); Sat, 24 Feb 2024 12:48:06 +0000 Received: (at 69352) by debbugs.gnu.org; 24 Feb 2024 12:47:25 +0000 Received: from localhost ([127.0.0.1]:53719 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdrR6-0005AZ-DT for submit@debbugs.gnu.org; Sat, 24 Feb 2024 07:47:25 -0500 Received: from mail-lf1-f68.google.com ([209.85.167.68]:57514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdrQv-00058J-0x for 69352@debbugs.gnu.org; Sat, 24 Feb 2024 07:47:14 -0500 Received: by mail-lf1-f68.google.com with SMTP id 2adb3069b0e04-512ed314881so1122544e87.2 for <69352@debbugs.gnu.org>; Sat, 24 Feb 2024 04:46:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708778743; x=1709383543; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=ephCFlGGRXoZh8755MTR6YBu0noEltJ7nlZbKMRLXOU=; b=IvCspudDfpPlUbryyJAEIP7RN7zc1q0Y830xj2781ls1IGRq2PAAHpkPWd9oCvxD/E aCuKM6rZKZc+x1kxckutGlmLznm/DiqRe59cRpo45k6HBFWT1pFC4/V+hSxR+ZI/Dlg6 K1wSJsxSOH1EjsU+0wAvQeqh9fNj7lLeaq+ivOeC9WGENbaq9thR2M/q2dN9S0mHpHSL fQjB7Aa6xBIJRgc2VSJ/Ho3Kw1zXcXd1yRY7UFHOc6l379wVLdizzeF729Ao0tUvassF Q4g4kgT4pW+I8hyW+gsbxacBF6b5++HYAdbEzWKxw7zw4z5O+z0lmDw/gUBoj86xRd2I TZ4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708778743; x=1709383543; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ephCFlGGRXoZh8755MTR6YBu0noEltJ7nlZbKMRLXOU=; b=a45xIhyPFzS2BafsgHH0ZqNxLDxCUCL1smMrVVEkuF20IlVeF3mXvvmu4pWcTWgv/s 21+XjnopYeh+3WQhi4o3O2XC2tG6cYap40MLpkUHzjC0J+oVo5xjmteiuMJiiI0lKYwo 5mlrt1qNtLvJ8aNpEjpwKNXFi0kljHXMxxrjEFh0dsvTVW4FQDlWbu7s+c04D8Uw4PRE 5zyidN+XbobTj9Vu5AytRSIDjG72LXY572H5OV5t5POtS1YdSfZCkHchVZXDf2PoQ1MF +VEJtHEn8RiPZpKHOfUffvFH3oR2P7yjE7o+iIYk2+58x7SVvAFTlw1BmbzESP6oHM6t QGlg== X-Gm-Message-State: AOJu0YyxAfIylA9gqvuwVxbJFzjLzp7ecD1mS9NkQzzkZJHB+dBE5Cra QZuGH+TW56EFQrAMbA41DZ6hS7MENsESC0BE5mZ6GBvZdUBX9kRWlJ6rJ8Os3No= X-Google-Smtp-Source: AGHT+IFAZ3EGZzLp71JvDdqBNDXx2VAqpjMH/BgXcqMi6f58HUF9E6KEknAeBYMUjH2xUyy5Apa57A== X-Received: by 2002:ac2:5b1a:0:b0:512:eee2:d8d0 with SMTP id v26-20020ac25b1a000000b00512eee2d8d0mr1086317lfn.59.1708778743033; Sat, 24 Feb 2024 04:45:43 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id lf6-20020a170906ae4600b00a3d12d84cffsm551900ejb.167.2024.02.24.04.45.42 for <69352@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Feb 2024 04:45:42 -0800 (PST) Message-ID: <3fc6f4d5cbcdf2b2dbbf490e4a31caccdc23b330.1708771294.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 24 Feb 2024 08:59:28 +0100 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/potassco.scm (python-telingo): Update to 2.1.3. [source]: Drop obsolete patch. * gnu/packages/patches/python-telingo-fix-comparison.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - .../python-telingo-fix-comparison.patch | 19 ------------------- gnu/packages/potassco.scm | 5 ++--- 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 gnu/packages/patches/python-telingo-fix-comparison.patch diff --git a/gnu/local.mk b/gnu/local.mk index 25e2341a72..9eef46bf57 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1809,7 +1809,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-sip-include-dirs.patch \ %D%/packages/patches/python-sgmllib3k-assertions.patch \ %D%/packages/patches/python-sphinx-prompt-docutils-0.19.patch \ - %D%/packages/patches/python-telingo-fix-comparison.patch \ %D%/packages/patches/python-typeguard-python3.10.patch \ %D%/packages/patches/python-uqbar-python3.10.patch \ %D%/packages/patches/python-wxwidgets-type-errors.patch \ diff --git a/gnu/packages/patches/python-telingo-fix-comparison.patch b/gnu/packages/patches/python-telingo-fix-comparison.patch deleted file mode 100644 index 6d05048dcb..0000000000 --- a/gnu/packages/patches/python-telingo-fix-comparison.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: source/telingo/transformers/head.py -=================================================================== ---- source.orig/telingo/transformers/head.py -+++ source/telingo/transformers/head.py -@@ -564,10 +564,12 @@ class HeadTransformer: - cond = [] - diff = _ast.BinaryOperation(loc, _ast.BinaryOperator.Minus, param, shift) - if lhs.ast_type != _ast.ASTType.SymbolicTerm or lhs.symbol.type != _clingo.SymbolType.Number or lhs.symbol.number > 0: -- cond.append(_ast.Literal(loc, _ast.Sign.NoSign, _ast.Comparison(_ast.ComparisonOperator.LessEqual, lhs, diff))) -+ cond.append(_ast.Literal(loc, _ast.Sign.NoSign, -+ _ast.Comparison(lhs, [_ast.Guard(_ast.ComparisonOperator.LessEqual, diff)]))) - - if rhs.ast_type != _ast.ASTType.SymbolicTerm or rhs.symbol.type != _clingo.SymbolType.Supremum: -- cond.append(_ast.Literal(loc, _ast.Sign.NoSign, _ast.Comparison(_ast.ComparisonOperator.LessEqual, diff, rhs))) -+ cond.append(_ast.Literal(loc, _ast.Sign.NoSign, -+ _ast.Comparison(diff, [_ast.Guard(_ast.ComparisonOperator.LessEqual, rhs)]))) - - elems.extend([_ast.ConditionalLiteral(loc, _ast.Literal(loc, _ast.Sign.NoSign, head), cond) for head in heads]) - diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm index 4eb0f4a2c7..43d9ea6647 100644 --- a/gnu/packages/potassco.scm +++ b/gnu/packages/potassco.scm @@ -520,17 +520,16 @@ (define-public python-plingo (define-public python-telingo (package (name "python-telingo") - (version "2.1.1") + (version "2.1.3") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/potassco/telingo") (commit (string-append "v" version)))) (file-name (git-file-name name version)) - (patches (search-patches "python-telingo-fix-comparison.patch")) (sha256 (base32 - "0g3khxfdzc2hc7dkiyyqhb399h6h21m5wkp6wy8w71n0m32fiy53")))) + "1q6hlh4b5hsa4n5agvmfa9rhsxfd2g6kpl4b9kfccwbmf6dh51k6")))) (build-system pyproject-build-system) (propagated-inputs (list python-clingo)) (home-page "https://potassco.org/")