[PATCH] Add tailon.

Done

Details

2 participants

Christopher Baines
Marius Bakke

Owner: unassigned

Submitted by: Christopher Baines

Severity: normal

Debbugs page

Christopher Baines wrote 8 years ago

Recipients:(address . guix-patches@gnu.org)

Message-ID:a006eadf-13ae-148d-4a1f-28d170ac2037@cbaines.net

Christopher Baines wrote 8 years ago

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

Recipients:(address . 26722@debbugs.gnu.org)

Message-ID:20170430214415.3029-2-mail@cbaines.net

* gnu/packages/python.scm (python-tornado): Update to 4.5.1.

---

gnu/packages/python.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)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

Christopher Baines wrote 8 years ago

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

Recipients:(address . 26722@debbugs.gnu.org)

Message-ID:20170430214415.3029-1-mail@cbaines.net

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

---

gnu/packages/python.scm | 30 ++++++++++++++++++++++++++++++

1 file changed, 30 insertions(+)

Toggle diff (43 lines)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

Christopher Baines wrote 8 years ago

[PATCH 3/3] gnu: Add tailon.

Recipients:(address . 26722@debbugs.gnu.org)

Message-ID:20170430214415.3029-3-mail@cbaines.net

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

---

gnu/packages/logging.scm | 29 +++++++++++++++++++++++++++++

1 file changed, 29 insertions(+)

Toggle diff (48 lines)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

Marius Bakke wrote 8 years ago

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

Recipients:

Message-ID:87inlkhby9.fsf@fastmail.com

Hello Chris!

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (2 lines)

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

[...]

Toggle quote (11 lines)> +(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.

Toggle quote (7 lines)

> + (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.

Toggle quote (19 lines)> +    (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

Marius Bakke wrote 8 years ago

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

Recipients:

Message-ID:87fugohbtn.fsf@fastmail.com

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (23 lines)> * 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.

Marius Bakke wrote 8 years ago

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

Recipients:

Message-ID:87d1bshbqd.fsf@fastmail.com

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (2 lines)

> * 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!

Christopher Baines wrote 8 years ago

[PATCH 3/3] gnu: Add tailon.

Recipients:(address . 26722@debbugs.gnu.org)

Message-ID:20170501192215.6678-3-mail@cbaines.net

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

---

gnu/packages/logging.scm | 26 ++++++++++++++++++++++++++

1 file changed, 26 insertions(+)

Toggle diff (45 lines)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

Christopher Baines wrote 8 years ago

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

Recipients:(address . 26722@debbugs.gnu.org)

Message-ID:20170501192215.6678-2-mail@cbaines.net

* gnu/packages/python.scm (python-tornado): Update to 4.5.1.

---

gnu/packages/python.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)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

Christopher Baines wrote 8 years ago

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

Recipients:(address . 26722@debbugs.gnu.org)

Message-ID:20170501192215.6678-1-mail@cbaines.net

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

---

gnu/packages/python.scm | 32 ++++++++++++++++++++++++++++++++

1 file changed, 32 insertions(+)

Toggle diff (45 lines)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

Christopher Baines wrote 8 years ago

Recipients:

Message-ID:e9ec0ce1-04c8-ef66-c64c-5deb0a560180@cbaines.net

On 01/05/17 15:46, Marius Bakke wrote:

Toggle quote (35 lines)> 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: signature.asc

Christopher Baines wrote 8 years ago

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

Recipients:

Message-ID:20a9db5e-e010-d774-6439-b7952f65bdb4@cbaines.net

On 01/05/17 15:49, Marius Bakke wrote:

Toggle quote (28 lines)> 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: signature.asc

Christopher Baines wrote 8 years ago

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

Recipients:

Message-ID:aed40d1a-9dfc-85a1-d299-1939ee580ff5@cbaines.net

On 01/05/17 15:51, Marius Bakke wrote:

Toggle quote (7 lines)

> 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: signature.asc

Marius Bakke wrote 8 years ago

Recipients:

Message-ID:87shkofdfy.fsf@fastmail.com

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (13 lines)> 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!

Marius Bakke wrote 8 years ago

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

Recipients:

Message-ID:87pofsfcy3.fsf@fastmail.com

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (38 lines)> 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 :)

Closed

Christopher Baines wrote 8 years ago

Recipients:

Message-ID:565ef392-5f03-ac11-aac2-45ed713e732e@cbaines.net

On 01/05/17 23:07, Marius Bakke wrote:

Toggle quote (42 lines)> 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: signature.asc

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 26722@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 26722

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags

mumi command -t +confirmed -t +easy

Or, remove the moreinfo tag and set the help tag

mumi command -t -moreinfo -t +help

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date