diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-02-24 08:59:28 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-02 08:00:14 +0100 |
| commit | e046d6d4436a2dd13e6faedb44622db037b7e19c (patch) | |
| tree | cb7f8097af26af320555b98a96ac34ec42bcf7eb | |
| parent | d694062fb5c22c4133f5b46a04cd0b0d8b90e713 (diff) | |
| download | guix-e046d6d4436a2dd13e6faedb44622db037b7e19c.tar.gz guix-e046d6d4436a2dd13e6faedb44622db037b7e19c.zip | |
gnu: python-telingo: Update to 2.1.3.
* 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.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/python-telingo-fix-comparison.patch | 19 | ||||
| -rw-r--r-- | gnu/packages/potassco.scm | 5 |
3 files changed, 2 insertions, 23 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 1e3433d96d..f280b849df 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1812,7 +1812,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 @@ the most probable model as well as finding all models and their probabilities.") (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/") |