bug#26722: [PATCH] Add tailon.

bug#26722: [PATCH] Add tailon.

[Christopher Baines]

bug#26722: [PATCH 1/3] gnu: Add python-sockjs-tornado.

[Christopher Baines]

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 22fadea27..5fbc012b7 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4217,6 +4217,36 @@ routines such as routines for numerical integration and optimization.")
   (package-with-python2
    (strip-python2-variant python-scipy)))
 
+(define-public python-sockjs-tornado
+  (package
+    (name "python-sockjs-tornado")
+    (version "1.0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/source/"
+             "s/sockjs-tornado/sockjs-tornado-" version ".tar.gz"))
+       (sha256
+        (base32
+         "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-tornado" ,python-tornado)))
+    (home-page "http://github.com/mrjoes/sockjs-tornado/")
+    (synopsis
+     "SockJS python server implementation on top of Tornado framework")
+    (description
+     "SockJS-tornado provides the server side counterpart to a SockJS client
+library, through the Tornado framework.
+
+SockJS provides a low latency, full duplex, cross-domain communication channel
+between a web browser and web server.")
+    (license license:expat)))
+
+(define-public python2-sockjs-tornado
+  (package-with-python2 python-sockjs-tornado))
+
 (define-public python-socksipy-branch
   (package
     (name "python-socksipy-branch")
-- 
2.12.2

bug#26722: [PATCH 2/3] gnu: python-tornado: Update to 4.5.1.

[Christopher Baines]

* gnu/packages/python.scm (python-tornado): Update to 4.5.1.
---
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 5fbc012b7..d01aa2f56 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6135,13 +6135,13 @@ It is written entirely in Python.")
 (define-public python-tornado
   (package
     (name "python-tornado")
-    (version "4.3")
+    (version "4.5.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "tornado" version))
        (sha256
-        (base32 "1gzgwayl6hmc9jfcl88bni4jcsk2jcca9dn1rvrfsvnijcjx7hn9"))))
+        (base32 "1zbkgcdfq81k298awrm8p0xwbwwn2p3nbizdglzfbkskhai082fv"))))
     (build-system python-build-system)
     (arguments
      '(;; FIXME: Two tests error out with:
-- 
2.12.2

bug#26722: [PATCH 3/3] gnu: Add tailon.

[Christopher Baines]

* gnu/packages/logging.scm (tailon): New variable.
---
 gnu/packages/logging.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index d28094c3a..b441d455a 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -24,8 +24,10 @@
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages autotools))
 
 (define-public log4cpp
@@ -90,3 +92,30 @@ helper macros.  You can log a message by simply streaming things to log at a
 particular severity level.  It allows logging to be controlled from the
 command line.")
     (license license:bsd-3)))
+
+(define-public tailon
+  (package
+    (name "tailon")
+    (version "1.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://pypi.python.org/packages/97/83/"
+             "0591b4f2befe795dcea1f03d437afafa13e6637de78d7c68ec2c1af7d1c0/"
+             name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "08clrwpfdxcv2z2b5ardpmim4alahbw4l7631dhw62xhbcf6wjzz"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-pyyaml" ,python-pyyaml)
+       ("python-sockjs-tornado" ,python-sockjs-tornado)
+       ("python-tornado" ,python-tornado)))
+    (home-page "https://tailon.readthedocs.io/")
+    (synopsis
+     "Webapp for looking at and searching through log files")
+    (description
+     "Tailon provides a web interface around the tail, grep, awk and sed
+commands, displaying the results via a web interface.")
+    (license license:bsd-3)))
-- 
2.12.2

bug#26722: [PATCH 1/3] gnu: Add python-sockjs-tornado.

[Marius Bakke]

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

Hello Chris!

Christopher Baines <mail@cbaines.net> writes:

> * gnu/packages/python.scm (python-sockjs-tornado): New variable.

[...]

> +(define-public python-sockjs-tornado
> +  (package
> +    (name "python-sockjs-tornado")
> +    (version "1.0.3")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append
> +             "https://pypi.python.org/packages/source/"
> +             "s/sockjs-tornado/sockjs-tornado-" version ".tar.gz"))

Please use 'pypi-uri' here.

> +       (sha256
> +        (base32
> +         "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd"))))
> +    (build-system python-build-system)
> +    (inputs
> +     `(("python-tornado" ,python-tornado)))

Python does not have a good mechanism for specifying exact versions of
runtime dependencies, so they should normally be propagated. If the
package does not import this at runtime (e.g. only needed for tests) it
should be a 'native-input'.

LGTM with those changes.

> +    (home-page "http://github.com/mrjoes/sockjs-tornado/")
> +    (synopsis
> +     "SockJS python server implementation on top of Tornado framework")
> +    (description
> +     "SockJS-tornado provides the server side counterpart to a SockJS client
> +library, through the Tornado framework.
> +
> +SockJS provides a low latency, full duplex, cross-domain communication channel
> +between a web browser and web server.")
> +    (license license:expat)))
> +
> +(define-public python2-sockjs-tornado
> +  (package-with-python2 python-sockjs-tornado))
> +
>  (define-public python-socksipy-branch
>    (package
>      (name "python-socksipy-branch")
> -- 
> 2.12.2

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

bug#26722: [PATCH 2/3] gnu: python-tornado: Update to 4.5.1.

[Marius Bakke]

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

Christopher Baines <mail@cbaines.net> writes:

> * gnu/packages/python.scm (python-tornado): Update to 4.5.1.
> ---
>  gnu/packages/python.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 5fbc012b7..d01aa2f56 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -6135,13 +6135,13 @@ It is written entirely in Python.")
>  (define-public python-tornado
>    (package
>      (name "python-tornado")
> -    (version "4.3")
> +    (version "4.5.1")
>      (source
>       (origin
>         (method url-fetch)
>         (uri (pypi-uri "tornado" version))
>         (sha256
> -        (base32 "1gzgwayl6hmc9jfcl88bni4jcsk2jcca9dn1rvrfsvnijcjx7hn9"))))
> +        (base32 "1zbkgcdfq81k298awrm8p0xwbwwn2p3nbizdglzfbkskhai082fv"))))

LGTM, assuming the few dependent packages (from `guix refresh -l
python{,2}-tornado`) still builds.

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

bug#26722: [PATCH 3/3] gnu: Add tailon.

[Marius Bakke]

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

Christopher Baines <mail@cbaines.net> writes:

> * gnu/packages/logging.scm (tailon): New variable.

Same comment about 'pypi-uri' and native vs propagated inputs, other
than that looks good. Can you send updated patches? Thanks!

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

bug#26722: [PATCH 1/3] gnu: Add python-sockjs-tornado.

[Christopher Baines]

* gnu/packages/python.scm (python-sockjs-tornado): New variable.
---
 gnu/packages/python.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 22fadea27..85967ba45 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4217,6 +4217,38 @@ routines such as routines for numerical integration and optimization.")
   (package-with-python2
    (strip-python2-variant python-scipy)))
 
+(define-public python-sockjs-tornado
+  (package
+    (name "python-sockjs-tornado")
+    (version "1.0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "sockjs-tornado" version))
+       (sha256
+        (base32
+         "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd"))))
+    (build-system python-build-system)
+    (arguments
+     `(;; There are no tests, and running the test phase requires missing
+       ;; dependencies
+       #:tests? #f))
+    (propagated-inputs
+     `(("python-tornado" ,python-tornado)))
+    (home-page "http://github.com/mrjoes/sockjs-tornado/")
+    (synopsis
+     "SockJS python server implementation on top of Tornado framework")
+    (description
+     "SockJS-tornado provides the server side counterpart to a SockJS client
+library, through the Tornado framework.
+
+SockJS provides a low latency, full duplex, cross-domain communication channel
+between a web browser and web server.")
+    (license license:expat)))
+
+(define-public python2-sockjs-tornado
+  (package-with-python2 python-sockjs-tornado))
+
 (define-public python-socksipy-branch
   (package
     (name "python-socksipy-branch")
-- 
2.12.2

bug#26722: [PATCH 2/3] gnu: python-tornado: Update to 4.5.1.

[Christopher Baines]

* gnu/packages/python.scm (python-tornado): Update to 4.5.1.
---
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 85967ba45..6139287db 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6137,13 +6137,13 @@ It is written entirely in Python.")
 (define-public python-tornado
   (package
     (name "python-tornado")
-    (version "4.3")
+    (version "4.5.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "tornado" version))
        (sha256
-        (base32 "1gzgwayl6hmc9jfcl88bni4jcsk2jcca9dn1rvrfsvnijcjx7hn9"))))
+        (base32 "1zbkgcdfq81k298awrm8p0xwbwwn2p3nbizdglzfbkskhai082fv"))))
     (build-system python-build-system)
     (arguments
      '(;; FIXME: Two tests error out with:
-- 
2.12.2

bug#26722: [PATCH 3/3] gnu: Add tailon.

[Christopher Baines]

* gnu/packages/logging.scm (tailon): New variable.
---
 gnu/packages/logging.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index d28094c3a..2523d65f6 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -24,8 +24,10 @@
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages autotools))
 
 (define-public log4cpp
@@ -90,3 +92,27 @@ helper macros.  You can log a message by simply streaming things to log at a
 particular severity level.  It allows logging to be controlled from the
 command line.")
     (license license:bsd-3)))
+
+(define-public tailon
+  (package
+    (name "tailon")
+    (version "1.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri name version))
+       (sha256
+        (base32
+         "08clrwpfdxcv2z2b5ardpmim4alahbw4l7631dhw62xhbcf6wjzz"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-pyyaml" ,python-pyyaml)
+       ("python-sockjs-tornado" ,python-sockjs-tornado)
+       ("python-tornado" ,python-tornado)))
+    (home-page "https://tailon.readthedocs.io/")
+    (synopsis
+     "Webapp for looking at and searching through log files")
+    (description
+     "Tailon provides a web interface around the tail, grep, awk and sed
+commands, displaying the results via a web interface.")
+    (license license:bsd-3)))
-- 
2.12.2

bug#26722: [PATCH 1/3] gnu: Add python-sockjs-tornado.

[Christopher Baines]

[-- Attachment #1.1: Type: text/plain, Size: 1177 bytes --]

On 01/05/17 15:46, Marius Bakke wrote:
> Hello Chris!
> 
> Christopher Baines <mail@cbaines.net> writes:
> 
>> * gnu/packages/python.scm (python-sockjs-tornado): New variable.
> 
> [...]
> 
>> +(define-public python-sockjs-tornado
>> +  (package
>> +    (name "python-sockjs-tornado")
>> +    (version "1.0.3")
>> +    (source
>> +     (origin
>> +       (method url-fetch)
>> +       (uri (string-append
>> +             "https://pypi.python.org/packages/source/"
>> +             "s/sockjs-tornado/sockjs-tornado-" version ".tar.gz"))
> 
> Please use 'pypi-uri' here.
> 
>> +       (sha256
>> +        (base32
>> +         "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd"))))
>> +    (build-system python-build-system)
>> +    (inputs
>> +     `(("python-tornado" ,python-tornado)))
> 
> Python does not have a good mechanism for specifying exact versions of
> runtime dependencies, so they should normally be propagated. If the
> package does not import this at runtime (e.g. only needed for tests) it
> should be a 'native-input'.
> 
> LGTM with those changes.

Thanks for the review Marius, I've now sent some updated patches.


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 858 bytes --]

bug#26722: [PATCH 2/3] gnu: python-tornado: Update to 4.5.1.

[Christopher Baines]

[-- Attachment #1.1: Type: text/plain, Size: 1413 bytes --]

On 01/05/17 15:49, Marius Bakke wrote:
> Christopher Baines <mail@cbaines.net> writes:
> 
>> * gnu/packages/python.scm (python-tornado): Update to 4.5.1.
>> ---
>>  gnu/packages/python.scm | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
>> index 5fbc012b7..d01aa2f56 100644
>> --- a/gnu/packages/python.scm
>> +++ b/gnu/packages/python.scm
>> @@ -6135,13 +6135,13 @@ It is written entirely in Python.")
>>  (define-public python-tornado
>>    (package
>>      (name "python-tornado")
>> -    (version "4.3")
>> +    (version "4.5.1")
>>      (source
>>       (origin
>>         (method url-fetch)
>>         (uri (pypi-uri "tornado" version))
>>         (sha256
>> -        (base32 "1gzgwayl6hmc9jfcl88bni4jcsk2jcca9dn1rvrfsvnijcjx7hn9"))))
>> +        (base32 "1zbkgcdfq81k298awrm8p0xwbwwn2p3nbizdglzfbkskhai082fv"))))
> 
> LGTM, assuming the few dependent packages (from `guix refresh -l
> python{,2}-tornado`) still builds.

Thanks for pointing this out. I didn't spot any problems in existing
packages, although I did spot that the python2-sockjs-tornado failed to
build regardless of the version of python2-tornado. I think the issue
was the setup.py test command being run and pulling in some random
packages, which can be resolved by disabling the tests, as there are no
tests to run.



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 858 bytes --]

bug#26722: [PATCH 3/3] gnu: Add tailon.

[Christopher Baines]

[-- Attachment #1.1: Type: text/plain, Size: 550 bytes --]

On 01/05/17 15:51, Marius Bakke wrote:
> Christopher Baines <mail@cbaines.net> writes:
> 
>> * gnu/packages/logging.scm (tailon): New variable.
> 
> Same comment about 'pypi-uri' and native vs propagated inputs, other
> than that looks good. Can you send updated patches? Thanks!

I've switched the pypi-uri here, but left the inputs as just inputs. I
view the tailon package as an application, and not a library, and the
inputs paths are included in the wrapped bin/tailon script, which means
that it works without propagating them.



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 858 bytes --]

bug#26722: [PATCH 3/3] gnu: Add tailon.

[Marius Bakke]

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

Christopher Baines <mail@cbaines.net> writes:

> On 01/05/17 15:51, Marius Bakke wrote:
>> Christopher Baines <mail@cbaines.net> writes:
>> 
>>> * gnu/packages/logging.scm (tailon): New variable.
>> 
>> Same comment about 'pypi-uri' and native vs propagated inputs, other
>> than that looks good. Can you send updated patches? Thanks!
>
> I've switched the pypi-uri here, but left the inputs as just inputs. I
> view the tailon package as an application, and not a library, and the
> inputs paths are included in the wrapped bin/tailon script, which means
> that it works without propagating them.

Oops, you're right. Good catch!

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

bug#26722: [PATCH 1/3] gnu: Add python-sockjs-tornado.

[Marius Bakke]

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

Christopher Baines <mail@cbaines.net> writes:

> On 01/05/17 15:46, Marius Bakke wrote:
>> Hello Chris!
>> 
>> Christopher Baines <mail@cbaines.net> writes:
>> 
>>> * gnu/packages/python.scm (python-sockjs-tornado): New variable.
>> 
>> [...]
>> 
>>> +(define-public python-sockjs-tornado
>>> +  (package
>>> +    (name "python-sockjs-tornado")
>>> +    (version "1.0.3")
>>> +    (source
>>> +     (origin
>>> +       (method url-fetch)
>>> +       (uri (string-append
>>> +             "https://pypi.python.org/packages/source/"
>>> +             "s/sockjs-tornado/sockjs-tornado-" version ".tar.gz"))
>> 
>> Please use 'pypi-uri' here.
>> 
>>> +       (sha256
>>> +        (base32
>>> +         "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd"))))
>>> +    (build-system python-build-system)
>>> +    (inputs
>>> +     `(("python-tornado" ,python-tornado)))
>> 
>> Python does not have a good mechanism for specifying exact versions of
>> runtime dependencies, so they should normally be propagated. If the
>> package does not import this at runtime (e.g. only needed for tests) it
>> should be a 'native-input'.
>> 
>> LGTM with those changes.
>
> Thanks for the review Marius, I've now sent some updated patches.

Cheers! Pushed as 99aa2dce5d376b6612aab0971985f6320c03ecd2 :)

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

bug#26722: [PATCH 1/3] gnu: Add python-sockjs-tornado.

[Christopher Baines]

[-- Attachment #1.1: Type: text/plain, Size: 1438 bytes --]

On 01/05/17 23:07, Marius Bakke wrote:
> Christopher Baines <mail@cbaines.net> writes:
> 
>> On 01/05/17 15:46, Marius Bakke wrote:
>>> Hello Chris!
>>>
>>> Christopher Baines <mail@cbaines.net> writes:
>>>
>>>> * gnu/packages/python.scm (python-sockjs-tornado): New variable.
>>>
>>> [...]
>>>
>>>> +(define-public python-sockjs-tornado
>>>> +  (package
>>>> +    (name "python-sockjs-tornado")
>>>> +    (version "1.0.3")
>>>> +    (source
>>>> +     (origin
>>>> +       (method url-fetch)
>>>> +       (uri (string-append
>>>> +             "https://pypi.python.org/packages/source/"
>>>> +             "s/sockjs-tornado/sockjs-tornado-" version ".tar.gz"))
>>>
>>> Please use 'pypi-uri' here.
>>>
>>>> +       (sha256
>>>> +        (base32
>>>> +         "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd"))))
>>>> +    (build-system python-build-system)
>>>> +    (inputs
>>>> +     `(("python-tornado" ,python-tornado)))
>>>
>>> Python does not have a good mechanism for specifying exact versions of
>>> runtime dependencies, so they should normally be propagated. If the
>>> package does not import this at runtime (e.g. only needed for tests) it
>>> should be a 'native-input'.
>>>
>>> LGTM with those changes.
>>
>> Thanks for the review Marius, I've now sent some updated patches.
> 
> Cheers! Pushed as 99aa2dce5d376b6612aab0971985f6320c03ecd2 :)

Awesome, thanks Marius :)



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 858 bytes --]