From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 69352@debbugs.gnu.org
Subject: [bug#69352] [PATCH 12/13] gnu: python-telingo: Update to 2.1.3.
Date: Sat, 24 Feb 2024 08:59:28 +0100 [thread overview]
Message-ID: <3fc6f4d5cbcdf2b2dbbf490e4a31caccdc23b330.1708771294.git.liliana.prikler@gmail.com> (raw)
In-Reply-To: <cover.1708771294.git.liliana.prikler@gmail.com>
* 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/")
--
2.41.0
next prev parent reply other threads:[~2024-02-24 12:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-24 10:41 [bug#69352] [PATCH 00/13] Update Clingo to 5.7.1, etc pp Liliana Marie Prikler
2024-02-24 6:56 ` [bug#69352] [PATCH 01/13] gnu: Add wide-integer Liliana Marie Prikler
2024-02-24 6:57 ` [bug#69352] [PATCH 02/13] gnu: python-scikit-build: Install cmake modules Liliana Marie Prikler
2024-02-24 7:51 ` [bug#69352] [PATCH 03/13] gnu: libpotassco: Update to 0.0-2.69b677f Liliana Marie Prikler
2024-02-24 7:52 ` [bug#69352] [PATCH 04/13] gnu: clasp: Update to 3.3.10 Liliana Marie Prikler
2024-02-24 7:54 ` [bug#69352] [PATCH 05/13] gnu: clingo: Update to 5.7.1 Liliana Marie Prikler
2024-02-24 7:54 ` [bug#69352] [PATCH 06/13] gnu: clingo: Build from actual sources Liliana Marie Prikler
2024-02-24 7:55 ` [bug#69352] [PATCH 07/13] gnu: clingo-dl: Update to 1.5.0 Liliana Marie Prikler
2024-02-24 7:56 ` [bug#69352] [PATCH 08/13] gnu: python-clingo: Fix build Liliana Marie Prikler
2024-02-24 7:57 ` [bug#69352] [PATCH 09/13] gnu: python-clingo-dl: " Liliana Marie Prikler
2024-02-24 7:58 ` [bug#69352] [PATCH 10/13] gnu: python-clorm: Update to 1.5.0 Liliana Marie Prikler
2024-02-24 7:59 ` Liliana Marie Prikler [this message]
2024-02-24 8:01 ` [bug#69352] [PATCH 11/13] gnu: python-plingo: Update to 1.1.0 Liliana Marie Prikler
2024-02-24 9:17 ` [bug#69352] [PATCH OPTIONAL 13/13] gnu: python: python-scikit-build: Add more non-deterministic test failures Liliana Marie Prikler
2024-03-05 8:21 ` bug#69352: [PATCH 00/13] Update Clingo to 5.7.1, etc pp Efraim Flashner
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=3fc6f4d5cbcdf2b2dbbf490e4a31caccdc23b330.1708771294.git.liliana.prikler@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=69352@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).