[bug#30341] [PATCH 1/4] gnu: Add python-pyte.

[bug#30341] [PATCH 1/4] gnu: Add python-pyte.

[Hartmut Goebel]

* gnu/packages/python.scm (python-pyte, python2-pyte): New variables.
---
 gnu/packages/python.scm | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9483ad6b1..c5f8ee43f 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -19,7 +19,7 @@
 ;;; Copyright © 2015, 2016 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
 ;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
-;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
+;;; Copyright © 2016, 2018 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2016 Daniel Pimentel <d4n1@d4n1.org>
 ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2016, 2017 Troy Sankey <sankeytms@gmail.com>
@@ -12417,3 +12417,43 @@ style guide, even if the original code didn't violate the style guide.")
 
 (define-public python2-yapf
   (package-with-python2 python-yapf))
+
+(define-public python-pyte
+  (package
+    (name "python-pyte")
+    (version "0.7.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "pyte" version))
+        (sha256
+          (base32
+           "1an54hvyjm8gncx8cgabz9mkpgjkdb0bkyjlkh7g7f94nr3wnfl7"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'remove-failing-test
+           ;; TODO: Reenable when the `captured` files required by this test
+           ;; are included in the archive.
+           (lambda _
+             (delete-file "tests/test_input_output.py"))))))
+    (propagated-inputs
+     `(("python-wcwidth", python-wcwidth)))
+    (native-inputs
+     `(("python-pytest-runner" ,python-pytest-runner)
+       ("python-pytest" ,python-pytest)))
+    (home-page "https://pyte.readthedocs.io/")
+    (synopsis "Simple VTXXX-compatible terminal emulator")
+    (description "@code{pyte} is an in-memory VTxxx-compatible terminal
+emulator.  @var{VTxxx} stands for a series of video terminals, developed by
+DEC between 1970 and 1995.  The first and probably most famous one was the
+VT100 terminal, which is now a de-facto standard for all virtual terminal
+emulators.
+
+pyte is as a fork of vt102, which was an incomplete pure Python implementation
+of VT100 terminal.")
+    (license license:lgpl3)))
+
+(define-public python2-pyte
+  (package-with-python2 python-pyte))
-- 
2.13.6

[bug#30341] [PATCH 2/4] gnu: Add python-blessings.

[Hartmut Goebel]

* gnu/packages/python.scm (python-blessings, python2-blessings): New
  variables.
---
 gnu/packages/python.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index c5f8ee43f..61739ceb6 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12457,3 +12457,34 @@ of VT100 terminal.")
 
 (define-public python2-pyte
   (package-with-python2 python-pyte))
+
+(define-public python-blessings
+  (package
+    (name "python-blessings")
+    (version "1.6.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "blessings" version))
+        (sha256
+          (base32
+           "1smngy65p8mi62lgm04icasx22v976szhs2aq95y2ljmi1srb4bl"))))
+    (build-system python-build-system)
+    (arguments
+     ;; TODO: For py3, 2to2 is used to convert the code, but test-suite fails
+     `(#:tests? #f))
+    (native-inputs
+     `(("python-nose" ,python-nose)))
+    (home-page "https://pypi.python.org/pypi/blessings")
+    (synopsis "Simple but powerful module to manage terminal color, styling,
+and positioning")
+    (description "Blessings is a pythonic API to manipulate terminal color,
+styling, and positioning.  It provides similar features to curses but avoids
+some of curses’s limitations: it does not require clearing the whole screen
+for little changes, provides a scroll-back buffer after the program exits, and
+avoids styling altogether when the output is redirected to something other
+than a terminal.")
+    (license license:expat)))
+
+(define-public python2-blessings
+  (package-with-python2 python-blessings))
-- 
2.13.6

[bug#30341] [PATCH 3/4] gnu: Add python-curtsies.

[Hartmut Goebel]

* gnu/packages/python.scm (python-curtsies, python2-curtsies): New variables.
---
 gnu/packages/python.scm | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 61739ceb6..49b698f3d 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12488,3 +12488,39 @@ than a terminal.")
 
 (define-public python2-blessings
   (package-with-python2 python-blessings))
+
+(define-public python-curtsies
+  (package
+    (name "python-curtsies")
+    (version "0.2.11")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "curtsies" version))
+        (sha256
+          (base32
+           "1vljmw3sy6lrqahhpyg4gk13mzcx3mwhvg8s41698ms3cpgkjipc"))))
+    (build-system python-build-system)
+   (arguments
+    `(#:phases
+      (modify-phases %standard-phases
+        (replace 'check
+          (lambda _
+            (zero? (system* "nosetests" "-v")))))))
+    (propagated-inputs
+     `(("python-blessings" ,python-blessings)
+       ("python-wcwidth", python-wcwidth)))
+    (native-inputs
+     `(("python-mock" ,python-mock)
+       ("python-pyte" ,python-pyte)
+       ("python-nose" ,python-nose)))
+    (home-page "https://github.com/thomasballinger/curtsies")
+    (synopsis "Library for curses-like terminal interaction with colored
+strings")
+    (description "Curtsies is a Python library for interacting with the
+terminal.  It features string-like objects which carry formatting information,
+per-line fullscreen terminal rendering, and keyboard input event reporting.")
+    (license license:expat)))
+
+(define-public python2-curtsies
+  (package-with-python2 python-curtsies))
-- 
2.13.6

[bug#30341] [PATCH 3/4] gnu: Add python-curtsies.

[Marius Bakke]

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

Hartmut Goebel <h.goebel@crazy-compilers.com> writes:

> * gnu/packages/python.scm (python-curtsies, python2-curtsies): New variables.

Also fit for terminals.scm, I think.

> ---
>  gnu/packages/python.scm | 36 ++++++++++++++++++++++++++++++++++++
>  1 file changed, 36 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 61739ceb6..49b698f3d 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -12488,3 +12488,39 @@ than a terminal.")
>  
>  (define-public python2-blessings
>    (package-with-python2 python-blessings))
> +
> +(define-public python-curtsies
> +  (package
> +    (name "python-curtsies")
> +    (version "0.2.11")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (pypi-uri "curtsies" version))
> +        (sha256
> +          (base32

Please run the indentation of all these through emacs :-)

> +           "1vljmw3sy6lrqahhpyg4gk13mzcx3mwhvg8s41698ms3cpgkjipc"))))
> +    (build-system python-build-system)
> +   (arguments
> +    `(#:phases
> +      (modify-phases %standard-phases
> +        (replace 'check
> +          (lambda _
> +            (zero? (system* "nosetests" "-v")))))))

Use (invoke ...) instead of (zero? (system* ...)).

Other than that LGTM.

> +    (propagated-inputs
> +     `(("python-blessings" ,python-blessings)
> +       ("python-wcwidth", python-wcwidth)))
> +    (native-inputs
> +     `(("python-mock" ,python-mock)
> +       ("python-pyte" ,python-pyte)
> +       ("python-nose" ,python-nose)))
> +    (home-page "https://github.com/thomasballinger/curtsies")
> +    (synopsis "Library for curses-like terminal interaction with colored
> +strings")
> +    (description "Curtsies is a Python library for interacting with the
> +terminal.  It features string-like objects which carry formatting information,
> +per-line fullscreen terminal rendering, and keyboard input event reporting.")
> +    (license license:expat)))
> +
> +(define-public python2-curtsies
> +  (package-with-python2 python-curtsies))
> -- 
> 2.13.6

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

[bug#30341] [PATCH 4/4] gnu: Add bpython.

[Hartmut Goebel]

* gnu/packages/python.scm (bpython, bpython2): New variables.
---
 gnu/packages/python.scm | 84 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 49b698f3d..6d2eb3dab 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12524,3 +12524,87 @@ per-line fullscreen terminal rendering, and keyboard input event reporting.")
 
 (define-public python2-curtsies
   (package-with-python2 python-curtsies))
+
+(define-public bpython
+  (package
+    (name "bpython")
+    (version "0.17")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "bpython" version))
+        (sha256
+          (base32
+           "1mbah208jhd7bsfaa17fwpi55f7fvif0ghjwgrjmpmx8w1vqab9l"))
+        (file-name (string-append name "-" version ".tar.gz"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'remove-failing-test ;; FIXME
+           (lambda _
+             (delete-file "bpython/test/test_args.py")))
+         (add-after 'wrap 'add-aliases
+           ;; for symmetry to bpython2, add symlinks bypthon3, bpdb3, etc.
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (for-each
+                (lambda (old new)
+                  (symlink old ;; (string-append out "/bin/" old)
+                           (string-append out "/bin/" new)))
+                '("bpython" "bpython-curses" "bpython-urwid" "bpdb")
+                '("bpython3" "bpython3-curses" "bpython3-urwid" "bpdb3"))))))))
+    (propagated-inputs
+     `(("python-pygments" ,python-pygments)
+       ("python-requests", python-requests)
+       ("python-babel" ,python-babel) ;; optional, for internationalization
+       ("python-curtsies" ,python-curtsies) ;; >= 0.1.18
+       ("python-greenlet" ,python-greenlet)
+       ("python-urwid" ,python-urwid) ;; for bpython-urwid only
+       ("python-six" ,python-six)))
+    (native-inputs
+     `(("python-sphinx" ,python-sphinx)
+       ("python-mock" ,python-mock)))
+    (home-page "https://bpython-interpreter.org/")
+    (synopsis "Fancy interface to the Python interpreter")
+    (description "Bpython is a fancy interface to the Python
+interpreter. bpython's main features are
+
+@enumerate
+@item in-line syntax highlighting,
+@item readline-like autocomplete with suggestions displayed as you type,
+@item expected parameter list for any Python function,
+@item \"rewind\" function to pop the last line of code from memory and
+      re-evaluate,
+@item send the code you've entered off to a pastebin,
+@item save the code you've entered to a file, and
+@item auto-indentation.
+@end enumerate")
+    (license license:expat)))
+
+(define-public bpython2
+  (let ((base (package-with-python2
+               (strip-python2-variant bpython))))
+    (package (inherit base)
+      (name "bpython2")
+      (arguments
+       `(#:python ,python-2
+         #:phases
+         (modify-phases %standard-phases
+         (add-after 'unpack 'remove-failing-test ;; FIXME
+           (lambda _
+             (delete-file "bpython/test/test_args.py")
+             (substitute* "bpython/test/test_curtsies_repl.py"
+               (("^(\\s*def )(test_get_last_word_with_prev_line\\W)" _ a b)
+                (string-append a "xxx_off_" b))
+               (("^(\\s*def )(test_complex\\W)" _ a b)
+                (string-append a "xxx_off_" b)))))
+           (add-before 'build 'rename-scripts
+             ;; rename the scripts to bypthon2, bpdb2, etc.
+             (lambda _
+               (substitute* "setup.py"
+                 (("^(\\s+'bpdb)(\\s+=.*',?)\\s*?$" _ name rest)
+                  (string-append name "2" rest "\n"))
+                 (("^(\\s+'bpython)(-\\S+)?(\\s+=.*',?)\\s*?$" _ name sub rest)
+                  (string-append name "2" (or sub "") rest "\n")))
+               #t))))))))
-- 
2.13.6

[bug#30341] [PATCH 4/4] gnu: Add bpython.

[Marius Bakke]

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

Hartmut Goebel <h.goebel@crazy-compilers.com> writes:

> * gnu/packages/python.scm (bpython, bpython2): New variables.

[...]

> +(define-public bpython
> +  (package
> +    (name "bpython")
> +    (version "0.17")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (pypi-uri "bpython" version))
> +        (sha256
> +          (base32
> +           "1mbah208jhd7bsfaa17fwpi55f7fvif0ghjwgrjmpmx8w1vqab9l"))
> +        (file-name (string-append name "-" version ".tar.gz"))))

I think (file-name ...) here is unnecessary, no?

> +    (build-system python-build-system)
> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'remove-failing-test ;; FIXME
> +           (lambda _
> +             (delete-file "bpython/test/test_args.py")))

 #t))

Could you add some information about why this is deleted?

> +         (add-after 'wrap 'add-aliases
> +           ;; for symmetry to bpython2, add symlinks bypthon3, bpdb3, etc.
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (let ((out (assoc-ref outputs "out")))
> +               (for-each
> +                (lambda (old new)
> +                  (symlink old ;; (string-append out "/bin/" old)
                                  ^^^ leftover comment? :)
> +                           (string-append out "/bin/" new)))
> +                '("bpython" "bpython-curses" "bpython-urwid" "bpdb")
> +                '("bpython3" "bpython3-curses" "bpython3-urwid" "bpdb3"))))))))

                  #t)))

> +    (propagated-inputs
> +     `(("python-pygments" ,python-pygments)
> +       ("python-requests", python-requests)
> +       ("python-babel" ,python-babel) ;; optional, for internationalization
> +       ("python-curtsies" ,python-curtsies) ;; >= 0.1.18
> +       ("python-greenlet" ,python-greenlet)
> +       ("python-urwid" ,python-urwid) ;; for bpython-urwid only
                                         ^^^
                                         only one semicolon for inline comments.
> +       ("python-six" ,python-six)))
> +    (native-inputs
> +     `(("python-sphinx" ,python-sphinx)
> +       ("python-mock" ,python-mock)))
> +    (home-page "https://bpython-interpreter.org/")
> +    (synopsis "Fancy interface to the Python interpreter")
> +    (description "Bpython is a fancy interface to the Python
> +interpreter. bpython's main features are
> +
> +@enumerate
> +@item in-line syntax highlighting,
> +@item readline-like autocomplete with suggestions displayed as you type,
> +@item expected parameter list for any Python function,
> +@item \"rewind\" function to pop the last line of code from memory and
> +      re-evaluate,
> +@item send the code you've entered off to a pastebin,
> +@item save the code you've entered to a file, and
> +@item auto-indentation.
> +@end enumerate")
> +    (license license:expat)))
> +
> +(define-public bpython2
> +  (let ((base (package-with-python2
> +               (strip-python2-variant bpython))))
> +    (package (inherit base)
> +      (name "bpython2")
> +      (arguments
> +       `(#:python ,python-2
> +         #:phases
> +         (modify-phases %standard-phases
> +         (add-after 'unpack 'remove-failing-test ;; FIXME
> +           (lambda _
> +             (delete-file "bpython/test/test_args.py")
> +             (substitute* "bpython/test/test_curtsies_repl.py"
> +               (("^(\\s*def )(test_get_last_word_with_prev_line\\W)" _ a b)
> +                (string-append a "xxx_off_" b))
> +               (("^(\\s*def )(test_complex\\W)" _ a b)
> +                (string-append a "xxx_off_" b)))))

#t))

I'm not sure what's going on here, can you add a comment?

Other than that looks good, thanks!

> +           (add-before 'build 'rename-scripts
> +             ;; rename the scripts to bypthon2, bpdb2, etc.
> +             (lambda _
> +               (substitute* "setup.py"
> +                 (("^(\\s+'bpdb)(\\s+=.*',?)\\s*?$" _ name rest)
> +                  (string-append name "2" rest "\n"))
> +                 (("^(\\s+'bpython)(-\\S+)?(\\s+=.*',?)\\s*?$" _ name sub rest)
> +                  (string-append name "2" (or sub "") rest "\n")))
> +               #t))))))))
> -- 
> 2.13.6

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

bug#30341: [PATCH 4/4] gnu: Add bpython.

[Hartmut Goebel]

Thanks for the review. I adresses all your remarks and pushes as

3026de3fc..34581f68c

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

[bug#30341] [PATCH 2/4] gnu: Add python-blessings.

[Marius Bakke]

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

Hartmut Goebel <h.goebel@crazy-compilers.com> writes:

> * gnu/packages/python.scm (python-blessings, python2-blessings): New
>   variables.

Perhaps this too can go in terminals.scm?

> ---
>  gnu/packages/python.scm | 31 +++++++++++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index c5f8ee43f..61739ceb6 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -12457,3 +12457,34 @@ of VT100 terminal.")
>  
>  (define-public python2-pyte
>    (package-with-python2 python-pyte))
> +
> +(define-public python-blessings
> +  (package
> +    (name "python-blessings")
> +    (version "1.6.1")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (pypi-uri "blessings" version))
> +        (sha256
> +          (base32
           ^^^
Indentation is off.

> +           "1smngy65p8mi62lgm04icasx22v976szhs2aq95y2ljmi1srb4bl"))))
> +    (build-system python-build-system)
> +    (arguments
> +     ;; TODO: For py3, 2to2 is used to convert the code, but test-suite fails
> +     `(#:tests? #f))
> +    (native-inputs
> +     `(("python-nose" ,python-nose)))
> +    (home-page "https://pypi.python.org/pypi/blessings")

I think <https://github.com/erikrose/blessings> is more home-page-y, but
no strong opinion.

> +    (synopsis "Simple but powerful module to manage terminal color, styling,
> +and positioning")

Maybe s/Simple but powerful/Python/ to keep the synopsis "dry".

LGTM otherwise.

> +    (description "Blessings is a pythonic API to manipulate terminal color,
> +styling, and positioning.  It provides similar features to curses but avoids
> +some of curses’s limitations: it does not require clearing the whole screen
> +for little changes, provides a scroll-back buffer after the program exits, and
> +avoids styling altogether when the output is redirected to something other
> +than a terminal.")
> +    (license license:expat)))
> +
> +(define-public python2-blessings
> +  (package-with-python2 python-blessings))
> -- 
> 2.13.6

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

[bug#30341] [PATCH 1/4] gnu: Add python-pyte.

[Marius Bakke]

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

Hartmut Goebel <h.goebel@crazy-compilers.com> writes:

> * gnu/packages/python.scm (python-pyte, python2-pyte): New variables.

Perhaps we can add this to "terminals.scm" to try and prevent python.scm
from growing out of control again.

[...]

> +(define-public python-pyte
> +  (package
> +    (name "python-pyte")
> +    (version "0.7.0")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (pypi-uri "pyte" version))
> +        (sha256
> +          (base32
> +           "1an54hvyjm8gncx8cgabz9mkpgjkdb0bkyjlkh7g7f94nr3wnfl7"))))
> +    (build-system python-build-system)
> +    (arguments
> +     '(#:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'remove-failing-test
> +           ;; TODO: Reenable when the `captured` files required by this test
> +           ;; are included in the archive.
> +           (lambda _
> +             (delete-file "tests/test_input_output.py"))))))

(delete-file ...) has an unspecified return value, so add a #t here.

> +    (propagated-inputs
> +     `(("python-wcwidth", python-wcwidth)))
> +    (native-inputs
> +     `(("python-pytest-runner" ,python-pytest-runner)
> +       ("python-pytest" ,python-pytest)))
> +    (home-page "https://pyte.readthedocs.io/")
> +    (synopsis "Simple VTXXX-compatible terminal emulator")
> +    (description "@code{pyte} is an in-memory VTxxx-compatible terminal
> +emulator.  @var{VTxxx} stands for a series of video terminals, developed by
> +DEC between 1970 and 1995.  The first and probably most famous one was the
> +VT100 terminal, which is now a de-facto standard for all virtual terminal
> +emulators.
> +
> +pyte is as a fork of vt102, which was an incomplete pure Python implementation
s/is as/is/ ?


> +of VT100 terminal.")
> +    (license license:lgpl3)))

Since the source files don't specify which version, this is LGPL3+.

Other than that LGTM.

> +
> +(define-public python2-pyte
> +  (package-with-python2 python-pyte))
> -- 
> 2.13.6

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