From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id aFrWLxa5kWP9YQEAbAwnHQ (envelope-from ) for ; Thu, 08 Dec 2022 11:14:46 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id ABfrLxa5kWNAUQAA9RJhRA (envelope-from ) for ; Thu, 08 Dec 2022 11:14:46 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 808DE3975B for ; Thu, 8 Dec 2022 11:14:46 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3Duo-0004wl-HF; Thu, 08 Dec 2022 05:14:06 -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 1p3Dum-0004vp-CK for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p3Dul-0000o7-RA for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p3Dul-0008Ff-IV for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59896] [PATCH 5/5] gnu: Add python-telingo. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Dec 2022 10:14:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59896 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59896@debbugs.gnu.org Received: via spool by 59896-submit@debbugs.gnu.org id=B59896.167049442231675 (code B ref 59896); Thu, 08 Dec 2022 10:14:03 +0000 Received: (at 59896) by debbugs.gnu.org; 8 Dec 2022 10:13:42 +0000 Received: from localhost ([127.0.0.1]:55805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3DuQ-0008Ej-Ay for submit@debbugs.gnu.org; Thu, 08 Dec 2022 05:13:42 -0500 Received: from mail-ej1-f67.google.com ([209.85.218.67]:41862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3DuM-0008E0-Q7 for 59896@debbugs.gnu.org; Thu, 08 Dec 2022 05:13:40 -0500 Received: by mail-ej1-f67.google.com with SMTP id vp12so2694727ejc.8 for <59896@debbugs.gnu.org>; Thu, 08 Dec 2022 02:13:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=CVxKfHdgb5tFLX16f/BsGJZAUWIeRVxZyK/VcgoqDhw=; b=VDdbZc/A97aU1OzOlPvNP5tieYuYAy9TKxsepoJdStmdVnyP6Vik3p2R+SIqxaX3QR noV9MoU64CafLNAZ6bk1y0fj8drR6RREJgQF3zmhclsiuvaDXDqJ+ilX2Br6kwQZiRjS hMMgOainLF0oGqOS9cfPJCWJs7+u/pP4oEDjIb4YGX6ys0mycYtl81JTXLNfEpmXJAi+ DP7qUTv2jcy5GtYT49NS3zuUnYe34FDRZhRi+J92tPpvsllBR6tVSrj2ehxGNCGcBZdl ld79hK6SUr5XKdlc41ZiJpD5O+s59MDA7ZziPvZC4t8EfseswkqfNstlOmOe3WurewcI 0eVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CVxKfHdgb5tFLX16f/BsGJZAUWIeRVxZyK/VcgoqDhw=; b=jU7816yiCnL3ix1gV+5qhzvUDSGTGNh89hOo392V/DB8GBF6EtB+uTTWxGByoeZtwC 8XGLkRNwS72+OnWX3xPlhLOeAYjudDNyUGbgiiKANmxjNQqAixNtJ43azilspd0yTESI SP0nYFUvG+9LiV5Ki/mCiStJ7EadJEnQg1BacSfoiIYK1AFWw4ccAXByXdd6adLvPRUW Ztpr9+N5X09CcZ3O7ZKXw2N8X3iPR4tDXL9nB/zPdALWDa5TWYrUJIVNkPOE2GavF62G J++jnTPmVEu1d1D/9k2UZV2/IHw3uoem82L21dyITbJxCi6PclKO3hoPJ3ThgSOm0344 Dqmw== X-Gm-Message-State: ANoB5plW60EiuDPEXH0DTz8g2CYdhojg5ae22BAS+D3C6j5OORi0I7b0 fbzaV4te06d40/CO06ACA1hfRzrWHAg= X-Google-Smtp-Source: AA0mqf44q/Uym8WlNdoIJj1DrSLpOu0EcRJKnc8AyYtouWTa0+PHSPEzAxeWrTksEZB1e+/PNm7LIg== X-Received: by 2002:a17:906:a157:b0:7a5:7e25:5b11 with SMTP id bu23-20020a170906a15700b007a57e255b11mr12948004ejb.254.1670494413241; Thu, 08 Dec 2022 02:13:33 -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 q3-20020aa7da83000000b0046c91fa5a4asm3207309eds.70.2022.12.08.02.13.32 for <59896@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 02:13:32 -0800 (PST) From: Liliana Marie Prikler Date: Thu, 8 Dec 2022 09:49:07 +0100 Content-Transfer-Encoding: 7bit Message-ID: <1da46d86f9d5850afe7f8f14070a3c025dbae3f7.camel@gmail.com> 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1670494486; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=CVxKfHdgb5tFLX16f/BsGJZAUWIeRVxZyK/VcgoqDhw=; b=MBPx6ihP2m+YQq8Qid1cxzm5Vnn16DqtgRU5esht0XZDt9xUxHakDFcFTtYYqnSlLIQnvM O1t9+BwssnM2mWdiVji776Lt36JGzoCO2ek6HBOqyxZIEhwtkWrbVjhwlMqxYLREfbxaEO 25cbb7Ao/FPWkoZrrTrnkOTc+E4NBARhllfre25jP6CIpxPRnkPFWUQHj0ox6tOwz2+xlt 6CtdIdFGuAOKthG8AGNtRmFfjLqnhV0X3HmPXFw9TnFSJMK9gE6l7/19urFjHtQAeknWCX uCqY3UWRDguvZf1/27IHRLXYh3UG0rSNWMyEaNftZWsJU9yVAbV6OhynEKxQyg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1670494486; a=rsa-sha256; cv=none; b=ebiLKA+KMVnTljKUouqyFpRZa4pdESg6AHk+Rc68Dsa6flgmhmVbJoTzh5Kgi2oPCjIxQR teDo5UWS7VprVPUq8jDqFBq11sUjRvB/3qtphoKA1tGOh/hdSX6HrBHjpu0RmfNOt813JL X/EBFqK7ipq2x068XwBAFTc5IsOuqFku7uCZ0i3Thx3hK7pairDebo2OTJ0T31d5tp9EyA 7VjDXw8KxJSe2IuPnpA3UVGS5nzsMwmKCs1k2OumP90gWyz1SIonhGvjl+gYtnEt/9znV2 elEqOZYV+X3Uv2N0CiO0Pggi9qjvsLcI4xoIbIt3sz18RS782NY6cwXHWDQkbQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="VDdbZc/A"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 6.04 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="VDdbZc/A"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 808DE3975B X-Spam-Score: 6.04 X-Migadu-Scanner: scn1.migadu.com X-TUID: 3J7kMNxkPLvr * 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 +++++++++++++++++++ .../python-telingo-fix-comparison.patch | 19 +++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 gnu/packages/patches/python-telingo-fix-comparison.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3329801fa6..0ada842407 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1644,6 +1644,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 4f057820f0..23c886dfdb 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -92,6 +92,7 @@ (define-module (gnu packages maths) #: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) @@ -2717,6 +2718,28 @@ (define-public python-clingo 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]) + -- 2.38.1