[debbugs-tracker] bug#29144: closed ([PATCH 1/3] gnu: Add pydot.)

[GNU bug Tracking System]

Your message dated Tue, 07 Nov 2017 21:07:20 +0100
with message-id <address@hidden>
and subject line Re: [bug#29144] Updated patch
has caused the debbugs.gnu.org bug report #29144,
regarding [PATCH 1/3] gnu: Add pydot.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
29144: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=29144
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH 1/3] gnu: Add pydot.
>
>
>
>
> Date: 
>
> Sat,  4 Nov 2017 20:36:43 +0100
>
>
>
>
>     * gnu/packages/python.scm (python-pydot): New variable.
> ---
>  gnu/packages/python.scm | 24 ++++++++++++++++++++++++
>  1 file changed, 24 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index e8a733919..c16122438 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -44,6 +44,7 @@
>  ;;; Copyright © 2017 Kei Kebreau <address@hidden>
>  ;;; Copyright © 2017 Rutger Helling <address@hidden>
>  ;;; Copyright © 2017 Muriithi Frederick Muriuki <address@hidden>
> +;;; Copyright @ 2017 Gábor Boskovits <address@hidden>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -16871,3 +16872,26 @@ executed more than a given number of times during a 
> given period.")
>  
>  (define-public python2-ratelimiter
>    (package-with-python2 python-ratelimiter))
> +
> +(define-public python-pydot
> +  (package
> +    (name "python-pydot")
> +    (version "1.2.3")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "pydot" version))
> +       (sha256
> +        (base32
> +         "00imlz0033dygb9gdag1xr0cybn33gk5jsdi9ffbszzr97rd7dgd"))))
> +    (build-system python-build-system)
> +    (inputs
> +     `(("python-pyparsing",python-pyparsing)
> +       ("python-chardet",python-chardet)))
> +    (home-page "https://github.com/erocarrera/pydot";)
> +    (synopsis "Python interface to Graphviz's Dot language")
> +    (description
> +     "An interface to Graphviz that can parse and dump
> +into the DOT language used by GraphViz, is written in pure Python,
> +and networkx can convert its graphs to pydot.")
> +    (license license:expat)))
> -- 
> 2.14.2
>
>
>
>
> --- End Message ---

--- Begin Message --- Subject: Re: [bug#29144] Updated patch Date: Tue, 07 Nov 2017 21:07:20 +0100 User-agent: Notmuch/0.25.1 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu)

Gábor Boskovits <address@hidden> writes:

> I've sent an update patch with the requested modidications modulo the unit
> tests.
>
> It seems, that unit tests are not included in the pypi tarball.
>
> Should we go with a git checkout, and do unit tests, or should we leave it
> this way?

Bah.  It would be good to have unit tests, but I don't want to hold this
patch back, so I committed it with the following changes for now:

diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index dbc501733..2fefb41c0 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -226,14 +226,16 @@ be used either as a standalone application, or as a 
python library.")
         (base32
          "00imlz0033dygb9gdag1xr0cybn33gk5jsdi9ffbszzr97rd7dgd"))))
     (build-system python-build-system)
+    ;; FIXME: No tests in PyPi release tarball.
+    (arguments '(#:tests? #f))
     (propagated-inputs
-     `(("python-pyparsing",python-pyparsing)))
-    (native-inputs
-     `(("python-chardet",python-chardet)))
+     `(("python-pyparsing" ,python-pyparsing)))
     (home-page "https://github.com/erocarrera/pydot";)
-    (synopsis "Python interface to Graphviz's Dot language")
+    (synopsis "Python interface to Graphviz's DOT language")
     (description
-     "An interface to Graphviz that can parse and dump
-+into the DOT language used by GraphViz, is written in pure Python,
-+and networkx can convert its graphs to pydot.")
+     "Pydot provides an interface to create, handle, modify and process
+graphs in Graphviz's DOT language, written in pure Python.")
     (license license:expat)))
+
+(define-public python2-pydot
+  (package-with-python2 python-pydot))

Sorry for rewriting the description, but I thought the double Graphviz
mention was redundant and the NetworkX reference rather "out of place"
(presumably other tools too can output to Pydot).  Since the original
text was copied off the README I hope it was okay.  Improvements welcome!

Also adjusted the commit message to mention the extra variable.  Thanks!

signature.asc
Description: PGP signature

--- End Message ---