[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/06: gnu: Add python-telingo.
From: |
guix-commits |
Subject: |
05/06: gnu: Add python-telingo. |
Date: |
Thu, 15 Dec 2022 10:59:27 -0500 (EST) |
lilyp pushed a commit to branch master
in repository guix.
commit 4f94156452f8c9292c802686f099c2830a205312
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Thu Dec 8 09:49:07 2022 +0100
gnu: Add python-telingo.
* gnu/packages/patches/python-telingo-fix-comparison.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/maths.scm (python-telingo): New variable.
---
gnu/local.mk | 1 +
gnu/packages/maths.scm | 23 ++++++++++++++++++++++
.../patches/python-telingo-fix-comparison.patch | 19 ++++++++++++++++++
3 files changed, 43 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index aae6e23e12..5b8944f568 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1643,6 +1643,7 @@ dist_patch_DATA =
\
%D%/packages/patches/python-louvain-fix-test.patch \
%D%/packages/patches/python-random2-getrandbits-test.patch \
%D%/packages/patches/python-poppler-qt5-fix-build.patch \
+ %D%/packages/patches/python-telingo-fix-comparison.patch \
%D%/packages/patches/python-w3lib-fix-test-failure.patch \
%D%/packages/patches/sdcc-disable-non-free-code.patch \
%D%/packages/patches/sdl-pango-api_additions.patch \
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 64fa725184..050450e12c 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -93,6 +93,7 @@
#:use-module (guix build-system ocaml)
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
+ #:use-module (guix build-system pyproject)
#:use-module (guix build-system ruby)
#:use-module (gnu packages algebra)
#:use-module (gnu packages audio)
@@ -2718,6 +2719,28 @@ satisfiability checking (SAT).")
making it so that you can write @acronym{ASPs, Answer Set Programs} through
Python code.")))
+(define-public python-telingo
+ (package
+ (name "python-telingo")
+ (version "2.1.1")
+ (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"))))
+ (build-system pyproject-build-system)
+ (propagated-inputs (list python-clingo))
+ (home-page "https://potassco.org/")
+ (synopsis "Solve dynamic temporal logic programs")
+ (description "This package provides a system to solve dynamic temporal
+logic programs based on clingo.")
+ (license license:expat)))
+
(define-public ceres
(package
(name "ceres-solver")
diff --git a/gnu/packages/patches/python-telingo-fix-comparison.patch
b/gnu/packages/patches/python-telingo-fix-comparison.patch
new file mode 100644
index 0000000000..6d05048dcb
--- /dev/null
+++ b/gnu/packages/patches/python-telingo-fix-comparison.patch
@@ -0,0 +1,19 @@
+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])
+
- branch master updated (b19f5bbac7 -> f19d49e69c), guix-commits, 2022/12/15
- 02/06: gnu: clingo: Update to 5.6.2., guix-commits, 2022/12/15
- 01/06: gnu: Add catch2-3.1., guix-commits, 2022/12/15
- 03/06: gnu: clingo: Use G-Expressions., guix-commits, 2022/12/15
- 06/06: gnu: Add orf-dl., guix-commits, 2022/12/15
- 05/06: gnu: Add python-telingo.,
guix-commits <=
- 04/06: gnu: Add python-clingo., guix-commits, 2022/12/15