[bug#67999] [PATCH] gnu: Add python-kalamine.

[bug#67999] [PATCH] gnu: Add python-kalamine.

[Adriel Dumas--Jondeau via Guix-patches via]

* gnu/packages/python-xyz.scm (python-kalamine): New variable.

Change-Id: If13f258440bb35973b3d79a87fea68e4708845bf
---
 gnu/packages/python-xyz.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index cab44be011..b12a28e0e9 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5881,6 +5881,24 @@ (define-public autokey
 flexibility and power of the Python language.")
     (license license:gpl3+)))
 
+(define-public python-kalamine
+  (package
+    (name "python-kalamine")
+    (version "0.18")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "kalamine" version))
+       (sha256
+        (base32 "1qcpn3kknxlh1jcragzgsihn5pysvs82lcrkvk1047im94rgp0i2"))))
+    (build-system pyproject-build-system)
+    (propagated-inputs (list python-click python-lxml python-pyyaml python-tomli))
+    (home-page "http://github.com/fabi1cazenave/kalamine")
+    (synopsis "A cross-platform Keyboard Layout Maker")
+    (description "Creates keyboard descriptions for various operating systems
+from a ASCII-art template within a TOML document.")
+    (license license:expat)))
+
 (define-public python-dm-tree
   (package
     (name "python-dm-tree")

base-commit: a8196632647b343f8e03c8f12fbdc0cc84ff90f6
prerequisite-patch-id: cefc174692b72660bf5ed4c03442f33dbaf6e784
prerequisite-patch-id: 6b1015959d122056b883e766306b0ff8ba30bde9
prerequisite-patch-id: a3116f7908bc9fdb237e4cde52260856b083596d
prerequisite-patch-id: db1d3d945579284d401944b18fcbc506a000714f
prerequisite-patch-id: 84bff5e4689979f565315edf96250ccc367f8fb8
prerequisite-patch-id: bd69d4115bc86b7d2739e9890625788f1fa5a006
prerequisite-patch-id: 0834ca6f4e7f1ed91b5dcb679096a953a6e36273
-- 
2.41.0

[bug#67999] [PATCH] gnu: python-kalamine: Update to 0.30.

[Adriel Dumas--Jondeau via Guix-patches via]

* gnu/packages/python-xyz.scm (python-kalamine): Update to 0.30.

Change-Id: I95bac1364a22b75bb6f42509da73e1b58bc81d42
---
 gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 62daa6f889..64060d44e3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -6330,19 +6330,38 @@ (define-public autokey
 (define-public python-kalamine
   (package
     (name "python-kalamine")
-    (version "0.18")
+    (version "0.30")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "kalamine" version))
        (sha256
-        (base32 "1qcpn3kknxlh1jcragzgsihn5pysvs82lcrkvk1047im94rgp0i2"))))
+        (base32 "1aqwfp0m2fr9miwh0d8ljmb58k4mw7bp9bzn5fk3kyj2d6zr0cxg"))))
     (build-system pyproject-build-system)
-    (propagated-inputs (list python-click python-lxml python-pyyaml python-tomli))
-    (home-page "http://github.com/fabi1cazenave/kalamine")
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (apply invoke
+                            (cons* "python" "-m" "kalamine.cli" "make"
+                                   (find-files "layouts" "\\.toml")))
+                     (invoke "pytest" "-vv" "tests")))))))
+    (propagated-inputs (list python-click python-livereload python-lxml
+                             python-pyyaml python-tomli python-hatchling))
+    (native-inputs (list python-black
+                         python-isort
+                         python-mypy
+                         python-pytest))
+    (home-page "https://github.com/OneDeadKey/kalamine")
     (synopsis "A cross-platform Keyboard Layout Maker")
-    (description "Creates keyboard descriptions for various operating systems
-from a ASCII-art template within a TOML document.")
+    (description "Kalamine provides a CLI to create advanced keyboard layout
+for Windows (@file{.ahk} or @file{.klc} files), MacOS (@file{.keylayout} files)
+and GNU/Linux (@file{.xkb_custom} or @file{.xkb} files) from a textual,
+portable description.  It also provides @command{xkalamine} to install XKB
+files on GNU/Linux in either @file{/usr/share/X11/xbk} or the rootless
+user-only equivalent @file{.config/xkb}.")
     (license license:expat)))
 
 (define-public python-dm-tree

base-commit: 203344cc37c8a7df1ec1454381b5069d53ce7f9e
prerequisite-patch-id: cefc174692b72660bf5ed4c03442f33dbaf6e784
prerequisite-patch-id: 6b1015959d122056b883e766306b0ff8ba30bde9
prerequisite-patch-id: a3116f7908bc9fdb237e4cde52260856b083596d
prerequisite-patch-id: db1d3d945579284d401944b18fcbc506a000714f
prerequisite-patch-id: 84bff5e4689979f565315edf96250ccc367f8fb8
prerequisite-patch-id: bd69d4115bc86b7d2739e9890625788f1fa5a006
prerequisite-patch-id: 0834ca6f4e7f1ed91b5dcb679096a953a6e36273
prerequisite-patch-id: 9812bf7906d21768559f10f97d8363d2a18fc7e9
prerequisite-patch-id: 68e70365da7db55420105f7cb12c9fffb80d2415
-- 
2.41.0

[bug#67999] [PATCH] gnu: Add python-kalamine.

[Sharlatan Hellseher]

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

Hi,

Thank you for the patch.

It does not just update the version but also adjusts description,
 introduces custom check phase and reindent fields.

If it's possible may you isolate package update and place rest of
modifications in dedicated patch with change log annotation covering it.

Looking forward for v2!


Regards,
Oleg

[-- Attachment #2: Type: text/html, Size: 676 bytes --]

[bug#67999] One patch

[Andreas Enge]

Hello Adriel,

QA cannot apply your patch: The v2 supersedes the v1; so instead of first
creating the package in version 0.18 and then updating it to 0.30, QA tries
to update a non-existing package, which of course fails.

Could you simply send a v3 which introduces version 0.30 from scratch,
or otherwise said, a squashed version of the two commits?

Thanks,

Andreas

[bug#67999] [PATCH] gnu: Add python-kalamine.

[Adriel Dumas--Jondeau via Guix-patches via]

* gnu/packages/python-xyz.scm (python-kalamine): New variable.

Change-Id: If13f258440bb35973b3d79a87fea68e4708845bf
---
 gnu/packages/python-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)


Hi o/

Thank you for your answers!
Here's a squashed version of previous patches, as if V1 never existed in
the first place. Does that looks good to you?


diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 29e2bfd222..64060d44e3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -6327,6 +6327,43 @@ (define-public autokey
 flexibility and power of the Python language.")
     (license license:gpl3+)))
 
+(define-public python-kalamine
+  (package
+    (name "python-kalamine")
+    (version "0.30")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "kalamine" version))
+       (sha256
+        (base32 "1aqwfp0m2fr9miwh0d8ljmb58k4mw7bp9bzn5fk3kyj2d6zr0cxg"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (replace 'check
+                 (lambda* (#:key tests? #:allow-other-keys)
+                   (when tests?
+                     (apply invoke
+                            (cons* "python" "-m" "kalamine.cli" "make"
+                                   (find-files "layouts" "\\.toml")))
+                     (invoke "pytest" "-vv" "tests")))))))
+    (propagated-inputs (list python-click python-livereload python-lxml
+                             python-pyyaml python-tomli python-hatchling))
+    (native-inputs (list python-black
+                         python-isort
+                         python-mypy
+                         python-pytest))
+    (home-page "https://github.com/OneDeadKey/kalamine")
+    (synopsis "A cross-platform Keyboard Layout Maker")
+    (description "Kalamine provides a CLI to create advanced keyboard layout
+for Windows (@file{.ahk} or @file{.klc} files), MacOS (@file{.keylayout} files)
+and GNU/Linux (@file{.xkb_custom} or @file{.xkb} files) from a textual,
+portable description.  It also provides @command{xkalamine} to install XKB
+files on GNU/Linux in either @file{/usr/share/X11/xbk} or the rootless
+user-only equivalent @file{.config/xkb}.")
+    (license license:expat)))
+
 (define-public python-dm-tree
   (package
     (name "python-dm-tree")

base-commit: 203344cc37c8a7df1ec1454381b5069d53ce7f9e
prerequisite-patch-id: cefc174692b72660bf5ed4c03442f33dbaf6e784
prerequisite-patch-id: 6b1015959d122056b883e766306b0ff8ba30bde9
prerequisite-patch-id: a3116f7908bc9fdb237e4cde52260856b083596d
prerequisite-patch-id: db1d3d945579284d401944b18fcbc506a000714f
prerequisite-patch-id: 84bff5e4689979f565315edf96250ccc367f8fb8
prerequisite-patch-id: bd69d4115bc86b7d2739e9890625788f1fa5a006
prerequisite-patch-id: 0834ca6f4e7f1ed91b5dcb679096a953a6e36273
-- 
2.41.0

[bug#67999] [PATCH] gnu: Add python-kalamine.

[Sharlatan Hellseher]

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


Hi,

I've reviewed and amended the patch.

Applied changes for v2 [7/7]
- [X] Add copyright header
- [X] Update to the latest version - v0.33
- [X] Simplify arguments, preserve default 'check phase
- [X] Shift some inputs from propagated to native
- [X] Fix warnings from linter about synopsis
- [X] Simplify description, remove any OS related references.
- [X] Build, Lint passed locally

--
Oleg

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

[bug#67999] [PATCH v2] gnu: Add kalamine.

[Sharlatan Hellseher]

From: Adriel Dumas--Jondeau <leirda@disroot.org>

* gnu/packages/python-xyz.scm (kalamine): New variable.

Change-Id: If13f258440bb35973b3d79a87fea68e4708845bf
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
---
 gnu/packages/python-xyz.scm | 41 +++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index fc6e997b6c..7410f40465 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -147,6 +147,7 @@
 ;;; Copyright © 2023 Attila Lendvai <attila@lendvai.name>
 ;;; Copyright © 2023, 2024 Troy Figiel <troy@troyfigiel.com>
 ;;; Copyright © 2024 Timothee Mathieu <timothee.mathieu@inria.fr>
+;;; Copyright © 2024 Adriel Dumas--Jondeau <leirda@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -6375,6 +6376,46 @@ (define-public autokey
 flexibility and power of the Python language.")
     (license license:gpl3+)))
 
+(define-public kalamine
+  (package
+    (name "kalamine")
+    (version "0.33")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "kalamine" version))
+       (sha256
+        (base32 "11hci02lvjc8657lylfcdw24bff0g1q0qxi8wcrjgqcqka9vm63c"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'make-test-layouts
+            (lambda _
+              (apply invoke
+                     (cons* "python" "-m" "kalamine.cli" "build"
+                            (find-files "layouts" "\\.toml")))
+              (invoke "python" "-m" "kalamine.cli" "new" "test.toml"))))))
+    (propagated-inputs
+     (list python-click
+           python-livereload
+           python-lxml
+           python-progress
+           python-pyyaml
+           python-tomli))
+    ;; TODO: Add python-pytest-ruff to native-inputs once it has been
+    ;; packaged.
+    (native-inputs
+     (list python-hatchling python-mypy python-pytest))
+    (home-page "https://github.com/OneDeadKey/kalamine")
+    (synopsis "Keyboard Layout Maker")
+    (description
+     "Kalamine provides a CLI to create advanced keyboard layout from a
+textual portable description.  It also supports layout emulation via web
+browser.")
+    (license license:expat)))
+
 (define-public python-dm-tree
   (package
     (name "python-dm-tree")

base-commit: 4a0549be52f3f46fbce61342d8de30f7b83130c5
-- 
2.41.0

[bug#67999] [PATCH v2] gnu: Add kalamine.

[Adriel Dumas--Jondeau via Guix-patches via]

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


Hi,

Thank for your work and your input, I'll try to improve my futures
patches with these in mind :)

-- 
Adriel

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

bug#67999: [PATCH v2] gnu: Add kalamine.

[Nicolas Goaziou via Guix-patches via]

Hello,

Sharlatan Hellseher <sharlatanus@gmail.com> writes:

> From: Adriel Dumas--Jondeau <leirda@disroot.org>
>
> * gnu/packages/python-xyz.scm (kalamine): New variable.

Thanks to both of you. I updated the package to 0.36, removed some
unnecessary capitalization in the synopsis, and applied it.

Regards,
-- 
Nicolas Goaziou