[bug#74601] [PATCH 0/3] Update clinguin to 2.1.1

[bug#74601] [PATCH 0/3] Update clinguin to 2.1.1

[Liliana Marie Prikler]

Time flies in Python.
When I initially packaged clinguin, it used to be a prerelease, now we
have 2.1.1.  I tested this on one of their examples, and it works™.

Liliana Marie Prikler (3):
  gnu: Add python-clingexplaid.
  gnu: python-clinguin: Fix homepage.
  gnu: python-clinguin: Update to 2.1.1.

 gnu/packages/potassco.scm | 44 +++++++++++++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 4 deletions(-)


base-commit: f8979b4bcc8772d02640f6f665b4195380d57df9
-- 
2.46.0

[bug#74601] [PATCH 1/3] gnu: Add python-clingexplaid.

[Liliana Marie Prikler]

* gnu/packages/potassco.scm (python-clingexplaid): New variable.
---
 gnu/packages/potassco.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm
index ec990f1382..57caf6aabc 100644
--- a/gnu/packages/potassco.scm
+++ b/gnu/packages/potassco.scm
@@ -756,3 +756,36 @@ (define-public python-clintest
 outcome while solving to abort the search for solutions once the outcome is
 certain.")
     (license license:expat)))
+
+(define-public python-clingexplaid
+  (package
+    (name "python-clingexplaid")
+    (version "1.1.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/potassco/clingo-explaid")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32 "1s80cs3clvz26r7cvjprlk6zip7yqswwhzzwmmrv5mf5p89ymrgm"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list #:test-flags #~(list "-k" "not test_main")
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'fix-pyproject-toml
+                          (lambda _
+                            (substitute* "pyproject.toml"
+                              (("dynamic = .*" all)
+                               (string-append "version = \""
+                                              #$version
+                                              "\"\n"))
+                              (("\"autoflake\",") "")))))))
+    (propagated-inputs (list python-clingo))
+    (native-inputs (list python-pytest))
+    (home-page "https://github.com/potassco/clingo-explaid")
+    (synopsis "Develop explanation systems with Clingo")
+    (description "This package provides tools to develop explanation systems
+with clingo.  It allows extracting minimal unsatisfiable subsets and
+unsatisfiable constraints.")
+    (license license:expat)))
-- 
2.46.0

[bug#74601] [PATCH 2/3] gnu: python-clinguin: Fix homepage.

[Liliana Marie Prikler]

* gnu/packages/potassco.scm (python-clinguin)[home-page]: Use
“https://github.com/potassco/clinguin”.
---
 gnu/packages/potassco.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm
index 57caf6aabc..a421810067 100644
--- a/gnu/packages/potassco.scm
+++ b/gnu/packages/potassco.scm
@@ -726,7 +726,7 @@ (define-public python-clinguin
           python-sphinx-rtd-theme
           python-traitlets
           python-uvicorn))
-   (home-page "https://github.com/potassco/clingraph")
+   (home-page "https://github.com/potassco/clinguin")
    (synopsis "Clingo-based interactive UI")
    (description "Clinguin is a graphical user interface toolkit for clingo,
 which allows user interfaces to be specified entirely as a logic program.")
-- 
2.46.0

[bug#74601] [PATCH 3/3] gnu: python-clinguin: Update to 2.1.1.

[Liliana Marie Prikler]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1699 bytes --]

* gnu/packages/potassco.scm (python-clinguin): Update to 2.1.1.
[source]: Adjust snippet accordingly.
[inputs]: Add python-clingo-dl and python-clingexplaid.
---
 gnu/packages/potassco.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm
index a421810067..c5d00c9b1c 100644
--- a/gnu/packages/potassco.scm
+++ b/gnu/packages/potassco.scm
@@ -690,7 +690,7 @@ (define-public python-clingraph
 (define-public python-clinguin
   (package
    (name "python-clinguin")
-   (version "1.0.0-beta")
+   (version "2.1.1")
    (source (origin
             (method git-fetch)
             (uri (git-reference
@@ -699,7 +699,7 @@ (define-public python-clinguin
             (file-name (git-file-name name version))
             (sha256
              (base32
-              "032fnzxv6wl01sdq7n2k0ikajpmkg8ihjh5mck1mwjvmis8z16d4"))
+              "0wfgrs8h5i5mmd5sbzca2xw57f3d3ni75775wjkaq6sg0zm9sqjs"))
             (modules '((guix build utils)))
             (snippet
              #~(begin
@@ -708,11 +708,14 @@ (define-public python-clinguin
                    ;; some typo squatter hosted
                    ;; a package named tk
                    (("tk") "")
-                   (("typing") "typing;python_version<\"3.5\""))))))
+                   ;; XXX: python-clingo-dl installs clingodl instead…
+                   (("clingo-dl") "clingodl"))))))
    (build-system pyproject-build-system)
    (propagated-inputs
     (list python-clingo
+          python-clingo-dl
           python-clorm
+          python-clingexplaid
           python-clingraph
           python-fastapi
           python-httpx
-- 
2.46.0

[bug#74601] [PATCH 0/3] Update clinguin to 2.1.1

[Sharlatan Hellseher]

[-- Attachment #1: Type: text/plain, Size: 532 bytes --]


Hi,

The series looks nice and LGFM for me

One pick on this:
--8<---------------cut here---------------start------------->8---
+     (list #:test-flags #~(list "-k" "not test_main")
--8<---------------cut here---------------end--------------->8---
May you provide a comment why it's deselected?

By the way PiPI https://pypi.org/project/clingexplaid/#files contains
tests and set version, so you may reduce package complexity if you pull
from there, no need to adjust version in pyproject.toml.

--
Thanks,
Oleg

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]