[bug#44640] [PATCH 0/3] Add python-git-hammer

[bug#44640] [PATCH 0/3] Add python-git-hammer

[Leo Prikler]

Hi Guix,

I wanted to print out some git statistics for recreational purposes,
but then I noticed, that Guix lacks gitstats [1] and upon further
research it became clear, that it hasn't been too well maintained.  The
last commit appears to have been made in 2016 (see [2]) and there is
also a lack of Python 3 support.  Not ideal at all.  
So I instead set out in search for a different tool to package and
stumbled upon [3].  Packaging that does required a bit of manual
tweaking of the `guix import' output, but it's still rather small and
served its purpose.  I'll be sending the patches shortly.

Regards,
Leo

[1] http://gitstats.sourceforge.net/
[2] https://github.com/hoxu/gitstats
[3] https://github.com/asharov/git-hammer

[bug#44640] [PATCH 1/3] gnu: Add python-beautifultable.

[Leo Prikler]

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index e5b8db02e0..57371f05c7 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -89,6 +89,7 @@
 ;;; Copyright © 2020 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
 ;;; Copyright © 2020 Bonface Munyoki Kilyungi <bonfacemunyoki@gmail.com>
 ;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
+;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -18232,6 +18233,44 @@ gevent-powered application.")
 (define-public python2-gipc
   (package-with-python2 python-gipc))
 
+(define-public python-beautifultable
+  (package
+    (name "python-beautifultable")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "beautifultable" version))
+       (sha256
+        (base32
+         "0wwlbifcbpzy3wfv6yzsxncarsngzizmmxbn6cy5gazlcq7h4k5x"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-wcwidth" ,python-wcwidth)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-setup.py
+           (lambda _
+             (substitute* "setup.py"
+               (("setup\\(")
+                "setup(\n    test_suite=\"test\",")))))))
+    (home-page "https://github.com/pri22296/beautifultable")
+    (synopsis "Print ASCII tables for terminals")
+    (description "@code{python-beautifultable} provides a class for easily
+printing tabular data in a visually appealing ASCII format to a terminal.
+
+Features include, but are not limited to:
+@itemize
+@item Full customization of the look and feel of the table
+@item Row and column accessors.
+@item Full support for colors using ANSI sequences or any library.
+@item Plenty of predefined styles and option to create custom ones.
+@item Support for Unicode characters.
+@item Supports streaming table when data is slow to retrieve.
+@end itemize")
+    (license license:expat)))
+
 (define-public python-fusepy
   (package
     (name "python-fusepy")
-- 
2.29.2

[bug#44640] [PATCH 2/3] gnu: Add python-globber.

[Leo Prikler]

* gnu/packages/python-xyz.scm (python-globber): 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 57371f05c7..7b9ab21671 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -18271,6 +18271,31 @@ Features include, but are not limited to:
 @end itemize")
     (license license:expat)))
 
+(define-public python-globber
+  (package
+    (name "python-globber")
+    (version "0.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "globber" version))
+       (sha256
+        (base32
+         "0w7gaqpfc9j9l6hgm0cl7hrlf3lr0w7ifns035cksa1r16mhlwlr"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f)) ; missing from distribution
+    (home-page "https://github.com/asharov/globber")
+    (synopsis
+     "Library for string matching with glob patterns")
+    (description
+     "Globber is a Python library for matching file names against glob patterns.
+In contrast to other glob-matching libraries, it matches arbitrary strings and
+doesn't require the matched names to be existing files.  In addition, it
+supports the globstar @code{**} operator to match an arbitrary number of
+path components.")
+    (license license:asl2.0)))
+
 (define-public python-fusepy
   (package
     (name "python-fusepy")
-- 
2.29.2

[bug#44640] [PATCH 3/3] gnu: Add python-git-hammer.

[Leo Prikler]

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7b9ab21671..c5da6b24d6 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -18296,6 +18296,37 @@ supports the globstar @code{**} operator to match an arbitrary number of
 path components.")
     (license license:asl2.0)))
 
+(define-public python-git-hammer
+  (package
+    (name "python-git-hammer")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "git-hammer" version))
+       (sha256
+        (base32
+         "16kcijngd3v6f0ym1j4qb6sp08cqb3iprqn080k3yqgd0b17dfc6"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f)) ; missing from distribution
+    (propagated-inputs
+     `(("python-beautifultable" ,python-beautifultable)
+       ("python-dateutil" ,python-dateutil)
+       ("python-gitpython" ,python-gitpython)
+       ("python-globber" ,python-globber)
+       ("python-matplotlib" ,python-matplotlib)
+       ("python-sqlalchemy" ,python-sqlalchemy)
+       ("python-sqlalchemy-utils"
+        ,python-sqlalchemy-utils)))
+    (home-page "https://github.com/asharov/git-hammer")
+    (synopsis "Provide statistics for git repositories")
+    (description
+     "Git Hammer is a statistics tool for projects in git repositories.
+Its major feature is tracking the number of lines authored by each person for every
+commit, but it also includes some other useful statistics.")
+    (license license:asl2.0)))
+
 (define-public python-fusepy
   (package
     (name "python-fusepy")
-- 
2.29.2

[bug#44640] [PATCH 2/3] gnu: Add python-globber.

[Efraim Flashner]

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

Not a full review (currently building other packages...)

On Sat, Nov 14, 2020 at 06:00:47PM +0100, Leo Prikler wrote:
> * gnu/packages/python-xyz.scm (python-globber): 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 57371f05c7..7b9ab21671 100644
> --- a/gnu/packages/python-xyz.scm
> +++ b/gnu/packages/python-xyz.scm
> @@ -18271,6 +18271,31 @@ Features include, but are not limited to:
>  @end itemize")
>      (license license:expat)))
>  
> +(define-public python-globber
> +  (package
> +    (name "python-globber")
> +    (version "0.2.1")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "globber" version))
> +       (sha256
> +        (base32
> +         "0w7gaqpfc9j9l6hgm0cl7hrlf3lr0w7ifns035cksa1r16mhlwlr"))))
> +    (build-system python-build-system)
> +    (arguments
> +     `(#:tests? #f)) ; missing from distribution

Can we build from a git checkout then? It's better to have the tests and
run them.

> +    (home-page "https://github.com/asharov/globber")
> +    (synopsis
> +     "Library for string matching with glob patterns")

Can you put this on the previous line? It triggers something inside me
to have it on its own line when it's not approaching 80 characters :/

> +    (description
> +     "Globber is a Python library for matching file names against glob patterns.
> +In contrast to other glob-matching libraries, it matches arbitrary strings and
> +doesn't require the matched names to be existing files.  In addition, it
> +supports the globstar @code{**} operator to match an arbitrary number of
> +path components.")
> +    (license license:asl2.0)))
> +
>  (define-public python-fusepy
>    (package
>      (name "python-fusepy")
> -- 
> 2.29.2
> 
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

[bug#44640] [PATCH 3/3] gnu: Add python-git-hammer.

[Efraim Flashner]

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

Not a full review, building other packages atm

On Sat, Nov 14, 2020 at 06:00:48PM +0100, Leo Prikler wrote:
> * gnu/packages/python-xyz.scm (python-git-hammer): New variable.
> ---
>  gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
> 
> diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
> index 7b9ab21671..c5da6b24d6 100644
> --- a/gnu/packages/python-xyz.scm
> +++ b/gnu/packages/python-xyz.scm
> @@ -18296,6 +18296,37 @@ supports the globstar @code{**} operator to match an arbitrary number of
>  path components.")
>      (license license:asl2.0)))
>  

Does it make more sense to put this in version-control than in
python-xyz? Can it be used as a library or is it really just a program
run on its own?

> +(define-public python-git-hammer
> +  (package
> +    (name "python-git-hammer")
> +    (version "0.3.1")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "git-hammer" version))
> +       (sha256
> +        (base32
> +         "16kcijngd3v6f0ym1j4qb6sp08cqb3iprqn080k3yqgd0b17dfc6"))))
> +    (build-system python-build-system)
> +    (arguments
> +     `(#:tests? #f)) ; missing from distribution

Let's build this one from git also, then we can run the tests

> +    (propagated-inputs

These don't need to be propagated if this is an "application" and not a
"library". They can just be regular inputs.

> +     `(("python-beautifultable" ,python-beautifultable)
> +       ("python-dateutil" ,python-dateutil)
> +       ("python-gitpython" ,python-gitpython)
> +       ("python-globber" ,python-globber)
> +       ("python-matplotlib" ,python-matplotlib)
> +       ("python-sqlalchemy" ,python-sqlalchemy)
> +       ("python-sqlalchemy-utils"
> +        ,python-sqlalchemy-utils)))
> +    (home-page "https://github.com/asharov/git-hammer")
> +    (synopsis "Provide statistics for git repositories")
> +    (description
> +     "Git Hammer is a statistics tool for projects in git repositories.
> +Its major feature is tracking the number of lines authored by each person for every
> +commit, but it also includes some other useful statistics.")
> +    (license license:asl2.0)))
> +
>  (define-public python-fusepy
>    (package
>      (name "python-fusepy")
> -- 
> 2.29.2
> 
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

[bug#44640] [PATCH 3/3] gnu: Add python-git-hammer.

[Leo Prikler]

Hello,

Am Dienstag, den 17.11.2020, 12:50 +0200 schrieb Efraim Flashner:
> Not a full review, building other packages atm
> 
> On Sat, Nov 14, 2020 at 06:00:48PM +0100, Leo Prikler wrote:
> > * gnu/packages/python-xyz.scm (python-git-hammer): New variable.
> > ---
> >  gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++
> >  1 file changed, 31 insertions(+)
> > 
> > diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-
> > xyz.scm
> > index 7b9ab21671..c5da6b24d6 100644
> > --- a/gnu/packages/python-xyz.scm
> > +++ b/gnu/packages/python-xyz.scm
> > @@ -18296,6 +18296,37 @@ supports the globstar @code{**} operator
> > to match an arbitrary number of
> >  path components.")
> >      (license license:asl2.0)))
> >  
> 
> Does it make more sense to put this in version-control than in
> python-xyz? Can it be used as a library or is it really just a
> program
> run on its own?
I suppose it can.  To begin with, there is not even an executable,
you're supposed to run it using `python -m githammer`.

> > +(define-public python-git-hammer
> > +  (package
> > +    (name "python-git-hammer")
> > +    (version "0.3.1")
> > +    (source
> > +     (origin
> > +       (method url-fetch)
> > +       (uri (pypi-uri "git-hammer" version))
> > +       (sha256
> > +        (base32
> > +         "16kcijngd3v6f0ym1j4qb6sp08cqb3iprqn080k3yqgd0b17dfc6")))
> > )
> > +    (build-system python-build-system)
> > +    (arguments
> > +     `(#:tests? #f)) ; missing from distribution
> 
> Let's build this one from git also, then we can run the tests
I'm on it, same for 2/3.

> > +    (propagated-inputs
> 
> These don't need to be propagated if this is an "application" and not
> a
> "library". They can just be regular inputs.
See my comment above.

> > +     `(("python-beautifultable" ,python-beautifultable)
> > +       ("python-dateutil" ,python-dateutil)
> > +       ("python-gitpython" ,python-gitpython)
> > +       ("python-globber" ,python-globber)
> > +       ("python-matplotlib" ,python-matplotlib)
> > +       ("python-sqlalchemy" ,python-sqlalchemy)
> > +       ("python-sqlalchemy-utils"
> > +        ,python-sqlalchemy-utils)))
> > +    (home-page "https://github.com/asharov/git-hammer")
> > +    (synopsis "Provide statistics for git repositories")
> > +    (description
> > +     "Git Hammer is a statistics tool for projects in git
> > repositories.
> > +Its major feature is tracking the number of lines authored by each
> > person for every
> > +commit, but it also includes some other useful statistics.")
> > +    (license license:asl2.0)))
> > +
> >  (define-public python-fusepy
> >    (package
> >      (name "python-fusepy")
> > -- 
> > 2.29.2

Regards, Leo

[bug#44640] [PATCH 3/3] gnu: Add python-git-hammer.

[Leo Prikler]

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

Attached are the revised patches 0002 and 0003.

[-- Attachment #2: 0002-gnu-Add-python-globber.patch --]
[-- Type: text/x-patch, Size: 1703 bytes --]

From f6005737208cf634b0f981f4b8c9d02bf1b77046 Mon Sep 17 00:00:00 2001
From: Leo Prikler <leo.prikler@student.tugraz.at>
Date: Tue, 17 Nov 2020 13:22:02 +0100
Subject: [PATCH 2/3] gnu: Add python-globber.

* gnu/packages/python-xyz.scm (python-globber): 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 b1d6005a8e..02ec4aec64 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -18273,6 +18273,31 @@ Features include, but are not limited to:
 @end itemize")
     (license license:expat)))
 
+(define-public python-globber
+  (package
+    (name "python-globber")
+    (version "0.2.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/asharov/globber.git")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "055xf7ja7zjhxis0ab5fnfsx16fsvr5fvc6mixqybanwxh8sgfjk"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/asharov/globber")
+    (synopsis "Library for string matching with glob patterns")
+    (description
+     "Globber is a Python library for matching file names against glob patterns.
+In contrast to other glob-matching libraries, it matches arbitrary strings and
+doesn't require the matched names to be existing files.  In addition, it
+supports the globstar @code{**} operator to match an arbitrary number of
+path components.")
+    (license license:asl2.0)))
+
 (define-public python-fusepy
   (package
     (name "python-fusepy")
-- 
2.29.2


[-- Attachment #3: 0003-gnu-Add-python-git-hammer.patch --]
[-- Type: text/x-patch, Size: 2301 bytes --]

From c4f64923fafab6585ab7d6858d9e44dc59fb31e7 Mon Sep 17 00:00:00 2001
From: Leo Prikler <leo.prikler@student.tugraz.at>
Date: Tue, 17 Nov 2020 13:22:22 +0100
Subject: [PATCH 3/3] gnu: Add python-git-hammer.

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

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 02ec4aec64..11e0570253 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -18298,6 +18298,46 @@ supports the globstar @code{**} operator to match an arbitrary number of
 path components.")
     (license license:asl2.0)))
 
+(define-public python-git-hammer
+  (package
+    (name "python-git-hammer")
+    (version "0.3.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/asharov/git-hammer")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "0f9xlk86ijzpdj25hr1q4wcy8k72v3w470ngwm9mpdkfj8ng84wr"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-setup.py
+           (lambda _
+             (substitute* "setup.py"
+               (("setup\\(")
+                "setup(\n    test_suite=\"test\",")))))))
+    (propagated-inputs
+     `(("python-beautifultable" ,python-beautifultable)
+       ("python-dateutil" ,python-dateutil)
+       ("python-gitpython" ,python-gitpython)
+       ("python-globber" ,python-globber)
+       ("python-matplotlib" ,python-matplotlib)
+       ("python-sqlalchemy" ,python-sqlalchemy)
+       ("python-sqlalchemy-utils"
+        ,python-sqlalchemy-utils)))
+    (home-page "https://github.com/asharov/git-hammer")
+    (synopsis "Provide statistics for git repositories")
+    (description
+     "Git Hammer is a statistics tool for projects in git repositories.
+Its major feature is tracking the number of lines authored by each person for every
+commit, but it also includes some other useful statistics.")
+    (license license:asl2.0)))
+
 (define-public python-fusepy
   (package
     (name "python-fusepy")
-- 
2.29.2

bug#44640: [PATCH 3/3] gnu: Add python-git-hammer.

[Efraim Flashner]

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

Looks good! Patches pushed.


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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