[bug#48428] [PATCH 1/5] gnu: python-pyte: Update to 0.8.0.

[bug#48428] [PATCH 1/5] gnu: python-pyte: Update to 0.8.0.

[Stefan Reichör]

* gnu/packages/terminals.scm (python-pyte): Update to 0.8.0.
---
 gnu/packages/terminals.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 14774a5843..1810b533fa 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2020 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
 ;;; Copyright © 2021 Raphaël Mélotte <raphael.melotte@mind.be>
+;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -894,14 +895,14 @@ terminal or piped input.")
 (define-public python-pyte
   (package
     (name "python-pyte")
-    (version "0.7.0")
+    (version "0.8.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pyte" version))
        (sha256
         (base32
-         "1an54hvyjm8gncx8cgabz9mkpgjkdb0bkyjlkh7g7f94nr3wnfl7"))))
+         "1ic8b9xrg76z55qrvbgpwrgg0mcq0dqgy147pqn2cvrdjwzd0wby"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
-- 
2.25.1

[bug#48426] [PATCH 2/5] gnu: Add python-easy-ansi.

[Stefan Reichör]

* gnu/packages/python-xyz.scm (python-easy-ansi): New variable.
---
 gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index cf0eba3234..98368129ed 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -16499,6 +16499,31 @@ converting text with ANSI color codes to HTML or LaTeX.")
 (define-public python2-ansi2html
   (package-with-python2 python-ansi2html))
 
+(define-public python-easy-ansi
+  (package
+    (name "python-easy-ansi")
+    (version "0.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "easy-ansi" version))
+        (sha256
+          (base32
+            "06ind48rb6bc8givysnak60g3rhk0zmch9ar80r00gzc6k6bgqfp"))))
+    (build-system python-build-system)
+    (home-page
+      "https://gitlab.com/joeysbytes/easy-ansi")
+    (synopsis
+      "Terminal framework API to give you an easy way to use colors, cursor
+control movements, and line/box drawing.")
+    (description
+      "Easy ANSI is a terminal framework API to give you an easy way to use
+colors, cursor control movements, and line/box drawing.  It is not meant as a
+replacement to more full-featured frameworks (such as curses or urwid), but as
+a tool to quickly create nice-looking screens in your terminal window.  You
+can even create animations with the cursor controls.")
+    (license license:expat)))
+
 (define-public python-ddt
   (package
     (name "python-ddt")
-- 
2.25.1

[bug#48427] [PATCH 3/5] gnu: Add python-aiostream.

[Stefan Reichör]

* gnu/packages/python-xyz.scm (python-aiostream): New variable.
---
 gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 98368129ed..8e769c08f2 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -20187,6 +20187,36 @@ generators and Python 3.7's context managers into Python 3.5.")
 manager compatible with @code{asyncio}.")
     (license license:asl2.0)))
 
+(define-public python-aiostream
+  (package
+    (name "python-aiostream")
+    (version "0.4.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "aiostream" version))
+        (sha256
+          (base32
+            "1k33bxrp24pa7c3hygzkv0lqvjil689aj442hzhgzv8vsbqmwd1n"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f)) ; tests fail, not sure why
+    ;; (native-inputs
+    ;;  `(("python-pytest" ,python-pytest)
+    ;;    ("python-pytest-asyncio" ,python-pytest-asyncio)
+    ;;    ("python-pytest-cov" ,python-pytest-cov)
+    ;;    ("python-pytest-runner" ,python-pytest-runner)))
+    (home-page
+      "https://github.com/vxgmichel/aiostream")
+    (synopsis
+      "Generator-based operators for asynchronous iteration")
+    (description
+      "aiostream provides a collection of stream operators that can be
+combined to create asynchronous pipelines of operations.  It can be seen as an
+asynchronous version of itertools, although some aspects are slightly
+different.")
+    (license license:gpl3+)))
+
 (define-public python-glob2
   (package
     (name "python-glob2")
-- 
2.25.1

[bug#48429] [PATCH 4/5] gnu: Add python-aiofiles-0.5.0.

[Stefan Reichör]

* gnu/packages/python-xyz.scm (python-aiofiles-0.5.0): New variable.
---
 gnu/packages/python-xyz.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8e769c08f2..431f2aa85d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -25113,6 +25113,19 @@ process.")
 disk files in asyncio applications.")
     (license license:asl2.0)))
 
+;; Used by python-multiplex
+(define-public python-aiofiles-0.5.0
+  (package (inherit python-aiofiles)
+    (name "python-aiofiles-0.5.0")
+    (version "0.5.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "aiofiles" version))
+        (sha256
+          (base32
+            "1bqmv019x16qa3zah0z915cw6z4va3fjs60fk2s7vyah3gyvrrlq"))))))
+
 (define-public python-pyre-extensions
   (package
     (name "python-pyre-extensions")
-- 
2.25.1

[bug#48430] [PATCH 5/5] gnu: Add python-multiplex.

[Stefan Reichör]

* gnu/packages/python-xyz.scm (python-multiplex): New variable.
---
 gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 431f2aa85d..ff2ce6ad32 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -24983,6 +24983,34 @@ applications with variable CPU loads).")
 (define-public python2-parallel
   (package-with-python2 python-parallel))
 
+(define-public python-multiplex
+  (package
+    (name "python-multiplex")
+    (version "0.5.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "multiplex" version))
+        (sha256
+          (base32
+            "1g01xwx5z0m1dvp5d69ndj8hz80d2z5xzasixa7c0k6ny93f9qhg"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      `(("python-aiofiles" ,python-aiofiles-0.5.0)
+        ("python-aiostream" ,python-aiostream)
+        ("python-click" ,python-click)
+        ("python-easy-ansi" ,python-easy-ansi)
+        ("python-pyte" ,python-pyte)))
+    (home-page
+      "https://github.com/dankilman/multiplex")
+    (synopsis
+      "View output of multiple processes, in parallel, in the console, with an
+interactive TUI")
+    (description
+      "Can be used as cli tool or as python library to view output of parallel
+running processes")
+    (license license:expat)))
+
 (define-public python-djvulibre
   (package
     (name "python-djvulibre")
-- 
2.25.1

[bug#48427] [PATCH 3/5] gnu: Add python-aiostream.

[Vinicius Monego]

Hi,

Em sex, 2021-05-14 às 23:17 +0200, Stefan Reichör escreveu:
> * gnu/packages/python-xyz.scm (python-aiostream): New variable.

Thank you.

> 
> +(define-public python-aiostream
> +  (package
> +    (name "python-aiostream")
> +    (version "0.4.3")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (pypi-uri "aiostream" version))
> +        (sha256
> +          (base32
> +           
> "1k33bxrp24pa7c3hygzkv0lqvjil689aj442hzhgzv8vsbqmwd1n"))))
> +    (build-system python-build-system)
> +    (arguments
> +     `(#:tests? #f)) ; tests fail, not sure why

Tests are not included in the PyPI tarball. That happens often in the
Python ecosystem, and in those cases we fetch directly from the
upstream repository.

After changing the source and adding #:test-target "pytest" to the
arguments (requires python-pytest-runner which is already there), I
could succesfully build the project with tests:

    (source
     (origin
       (method git-fetch)
       (uri (git-reference
             (url "https://github.com/vxgmichel/aiostream")
             (commit (string-append "v" version))))
       (file-name (git-file-name name version))
       (sha256
        (base32
"1r3x9qwl08yscmzvhafc6gsmq84lr17s6p7a1qxr49cmdvjzsc13"))))
    (arguments
     `(#:test-target "pytest"))

Note that python-build-system will run "python setup.py test" which is
used for unittest tests. If the project uses Pytest, as many do, we
often have to be explicit in the build either by adding #:test-target
"pytest" to the arguments and python-pytest-runner to native-inputs, or
by replacing the check phase and invoking pytest manually. Since
pytest-runner was deprecated recently, I believe the latter is the
better option from now on. The build could succeed without being
explicit, but you will see a message like "0 tests ran succesfully".
That may have happened in patches 2 and 5 from the series.

> +    (home-page
> +      "https://github.com/vxgmichel/aiostream")
> +    (synopsis
> +      "Generator-based operators for asynchronous iteration")

We don't break lines for the arguments of home-page and synopsis. The
pypi importer will add them by default, but they should be removed
while editing.

In the description, I'd replace "aiostream" with "@code{aiostream}".

The LICENSE file states GPL 3, though there are no copyright headers to
say "any later version". setup.py also says "gplv3". I'm guessing the
license should be gpl3 only, though I'm not sure about that one.

LGTM otherwise.

Could you check the rest of the series to see if the tests are running
correctly and then send a v2? I am not a committer and can't apply it
myself, so I have to leave that part for somebody else.

Vinicius

[bug#48426] [PATCH] gnu: Add python-easy-ansi.

[Stefan Reichör]

* gnu/packages/python-xyz.scm (python-easy-ansi): New variable.
---
I switched the source location to gitlab (from pypi).
However I was not able to find out how to run the tests

 gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d978942402..9b9510f043 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -16551,6 +16551,31 @@ converting text with ANSI color codes to HTML or LaTeX.")
 (define-public python2-ansi2html
   (package-with-python2 python-ansi2html))
 
+(define-public python-easy-ansi
+  (package
+    (name "python-easy-ansi")
+    (version "0.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.com/joeysbytes/easy-ansi")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0albh55ynzs98qy9pln4qaxw5qhhh3lk09jy9bx19gycrp1c3lc3"))))
+    (build-system python-build-system)
+    (home-page "https://gitlab.com/joeysbytes/easy-ansi")
+    (synopsis "Terminal framework API to give you an easy way to use colors, cursor
+control movements, and line/box drawing.")
+    (description
+     "Easy ANSI is a terminal framework API to give you an easy way to use
+colors, cursor control movements, and line/box drawing.  It is not meant as a
+replacement to more full-featured frameworks (such as curses or urwid), but as
+a tool to quickly create nice-looking screens in your terminal window.  You
+can even create animations with the cursor controls.")
+    (license license:expat)))
+
 (define-public python-ddt
   (package
     (name "python-ddt")
-- 
2.25.1

[bug#48427] [PATCH] gnu: Add python-aiostream.

[Stefan Reichör]

* gnu/packages/python-xyz.scm (python-aiostream): New variable.
---
Vinicius, thanks for your review.
Here is my attempt to follow your hints

 gnu/packages/python-xyz.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 9b9510f043..a465ecbda6 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -20232,6 +20232,35 @@ generators and Python 3.7's context managers into Python 3.5.")
 manager compatible with @code{asyncio}.")
     (license license:asl2.0)))
 
+(define-public python-aiostream
+  (package
+    (name "python-aiostream")
+    (version "0.4.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/vxgmichel/aiostream")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1r3x9qwl08yscmzvhafc6gsmq84lr17s6p7a1qxr49cmdvjzsc13"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:test-target "pytest"))
+    (native-inputs
+     `(("python-pytest" ,python-pytest)
+       ("python-pytest-asyncio" ,python-pytest-asyncio)
+       ("python-pytest-cov" ,python-pytest-cov)
+       ("python-pytest-runner" ,python-pytest-runner)))
+    (home-page "https://github.com/vxgmichel/aiostream")
+    (synopsis "Generator-based operators for asynchronous iteration")
+    (description "aiostream provides a collection of stream operators that can
+be combined to create asynchronous pipelines of operations.  It can be seen as
+an asynchronous version of itertools, although some aspects are slightly
+different.")
+    (license license:gpl3)))
+
 (define-public python-glob2
   (package
     (name "python-glob2")
-- 
2.25.1

[bug#48430] [PATCH] gnu: Add python-multiplex.

[Stefan Reichör]

* gnu/packages/python-xyz.scm (python-multiplex): New variable.
---
I was not able to switch the source url to github since the poetry
build system is required there. I have no idea how to use poetry from within guix

gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f208a7d153..d68e237830 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -25062,6 +25062,32 @@ applications with variable CPU loads).")
 (define-public python2-parallel
   (package-with-python2 python-parallel))
 
+(define-public python-multiplex
+  (package
+    (name "python-multiplex")
+    (version "0.5.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "multiplex" version))
+        (sha256
+          (base32
+            "1g01xwx5z0m1dvp5d69ndj8hz80d2z5xzasixa7c0k6ny93f9qhg"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      `(("python-aiofiles" ,python-aiofiles-0.5.0)
+        ("python-aiostream" ,python-aiostream)
+        ("python-click" ,python-click)
+        ("python-easy-ansi" ,python-easy-ansi)
+        ("python-pyte" ,python-pyte)))
+    (home-page "https://github.com/dankilman/multiplex")
+    (synopsis "View output of multiple processes, in parallel, in the console,
+with an interactive TUI")
+    (description
+      "Can be used as cli tool or as python library to view output of parallel
+running processes")
+    (license license:expat)))
+
 (define-public python-djvulibre
   (package
     (name "python-djvulibre")
-- 
2.25.1

bug#48426: [PATCH] gnu: Add python-easy-ansi.

[Nicolas Goaziou]

Hello,

Stefan Reichör <stefan@xsteve.at> writes:

> * gnu/packages/python-xyz.scm (python-easy-ansi): New variable.

I drastically shortened synopsis and applied your patch. Thank you.

Regards,
-- 
Nicolas Goaziou

[bug#48430] [PATCH] gnu: Add python-multiplex.

[Vinicius Monego]

Em sáb, 2021-05-29 às 23:10 +0200, Stefan Reichör escreveu:
> * gnu/packages/python-xyz.scm (python-multiplex): New variable.
> ---
> I was not able to switch the source url to github since the poetry
> build system is required there. I have no idea how to use poetry from
> within guix
> 

Hi,

I was taking a look at this series again.

> gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++
>  1 file changed, 26 insertions(+)
> 
> diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-
> xyz.scm
> index f208a7d153..d68e237830 100644
> --- a/gnu/packages/python-xyz.scm
> +++ b/gnu/packages/python-xyz.scm
> @@ -25062,6 +25062,32 @@ applications with variable CPU loads).")
>  (define-public python2-parallel
>    (package-with-python2 python-parallel))
>  
> +(define-public python-multiplex
> +  (package
> +    (name "python-multiplex")
> +    (version "0.5.1")
> +    (source
> +      (origin

Indentation is 1 space below source. If you're using Emacs it can fix
indentation with M-x indent-sexp (C-M-q) with the cursor on the
beginning of the expression.

> +        (method url-fetch)
> +        (uri (pypi-uri "multiplex" version))
> +        (sha256
> +          (base32
> +           
> "1g01xwx5z0m1dvp5d69ndj8hz80d2z5xzasixa7c0k6ny93f9qhg"))))
> +    (build-system python-build-system)

I'd suggest to add something like

> (arguments
>  `(#:tests? #f)) ; no tests in PyPI and no setup.py in github

in this place.

> +    (propagated-inputs
> +      `(("python-aiofiles" ,python-aiofiles-0.5.0)

If multiplex must match aiofiles version, issue 48429 can be skipped
since multiplex is now at 0.6.0 and we have aiofiles 0.6.0.

> +        ("python-aiostream" ,python-aiostream)
> +        ("python-click" ,python-click)
> +        ("python-easy-ansi" ,python-easy-ansi)
> +        ("python-pyte" ,python-pyte)))
> +    (home-page "https://github.com/dankilman/multiplex")
> +    (synopsis "View output of multiple processes, in parallel, in
> the console,
> +with an interactive TUI")

Please keep synopsis under 78 columns. I'd suggest something like "View
output of multiple process with an interactive TUI".

> +    (description
> +      "Can be used as cli tool or as python library to view output
> of parallel
> +running processes")

Description must be a full sentence. For instance: "Multiplex is a CLI
tool and a Python library to view output of running processes in
parallel.", or something alone these lines.

> +    (license license:expat)))
> +
>  (define-public python-djvulibre
>    (package
>      (name "python-djvulibre")

Your patch 2 was already merged.

Can you send a series of patches 1, 3 and 5 with -v2 to
48428@debbugs.gnu.org (the first patch)? When merged, that and 48427,
48429 and 48430 can be closed.

Vinicius

bug#48427: [PATCH 3/5] gnu: Add python-aiostream.

[Jelle Licht]

Stefan Reichör <stefan@xsteve.at> writes:

> * gnu/packages/python-xyz.scm (python-aiostream): New variable.
[snip]

Superseded by commit ed18b697c4783f139e23731f5bd0b0ed197997bb, closing.

bug#48428: [PATCH 1/5] gnu: python-pyte: Update to 0.8.0.

[jgart via Guix-patches via]

Hi Stefan,

Thanks for your patch.

I updated to the latest 0.8.1 and applied.

all best,

jgart