[bug#27961] [PATCH 0/5] Update python-orator, Move to databases.scm

[bug#27961] [PATCH 0/5] Update python-orator, Move to databases.scm

[Ben Woodcroft]

Hi,

This patch set updates python-orator to 0.9.7, adding some new packages.

To reduce the number of packages in python.scm, orator is moved to 
databases.scm, and some new packages are put in time.scm - is that sensible?

TIA for the review.

ben

[bug#27961] [PATCH 1/5] gnu: Add python-backpack.

[Ben Woodcroft]

* gnu/packages/python.scm (python-backpack): New variable.
---
 gnu/packages/python.scm | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index cf77abdba..7a18c0e14 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12,7 +12,7 @@
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
 ;;; Copyright © 2015, 2016 David Thompson <davet@gnu.org>
 ;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2015 Ben Woodcroft <donttrustben@gmail.com>
+;;; Copyright © 2015, 2017 Ben Woodcroft <donttrustben@gmail.com>
 ;;; Copyright © 2015, 2016 Erik Edrosa <erik.edrosa@gmail.com>
 ;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2015 Kyle Meyer <kyle@kyleam.com>
@@ -11940,6 +11940,32 @@ YAML-serialized data.")
 (define-public python2-pyaml
   (package-with-python2 python-pyaml))
 
+(define-public python-backpack
+  (package
+    (name "python-backpack")
+    (version "0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "backpack" version))
+       (sha256
+        (base32
+         "14rq1mvm0jda90lcx9gyyby9dvq4x3js2cmxvd6vl4686ixwyqh1"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-pytest" ,python-pytest)
+       ("python-nose" ,python-nose)))
+    (propagated-inputs
+     `(("python-simplejson" ,python-simplejson)))
+    (home-page "https://github.com/sdispater/backpack")
+    (synopsis "Utilities for working with Python collections")
+    (description "Backpack provides some useful utilities for working with
+collections of data..")
+    (license license:expat)))
+
+(define-public python2-backpack
+  (package-with-python2 python-backpack))
+
 (define-public python-flexmock
   (package
     (name "python-flexmock")
-- 
2.13.4

[bug#27961] [PATCH 2/5] gnu: Add python-pytzdata.

[Ben Woodcroft]

* gnu/packages/time.scm (python-pytzdata): New variable.
---
 gnu/packages/time.scm | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm
index ba54d1d00..e9077cb1d 100644
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,7 +22,9 @@
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
-  #:use-module (guix build-system gnu))
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
+  #:use-module (gnu packages python))
 
 (define-public time
   (package
@@ -55,3 +58,28 @@
 program uses.  The display output of the program can be customized or saved
 to a file.")
     (license gpl2+)))
+
+(define-public python-pytzdata
+  (package
+    (name "python-pytzdata")
+    (version "2017.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytzdata" version))
+       (sha256
+        (base32
+         "1c1az8spm2d3km6qhjy69y4dlj71p6984l48mizr83nh4f0ipld4"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-pytest" ,python-pytest)
+       ("python-nose" ,python-nose)))
+    (home-page
+     "https://github.com/sdispater/pytzdata")
+    (synopsis "Timezone database for Python")
+    (description
+     "This library provides a timezone database for Python.")
+    (license expat)))
+
+(define-public python2-tzdata
+  (package-with-python2 python-pytzdata))
-- 
2.13.4

[bug#27961] [PATCH 3/5] gnu: Add python-pendulum.

[Ben Woodcroft]

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

diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm
index e9077cb1d..88617b8d7 100644
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@ -83,3 +83,33 @@ to a file.")
 
 (define-public python2-tzdata
   (package-with-python2 python-pytzdata))
+
+(define-public python-pendulum
+  (package
+    (name "python-pendulum")
+    (version "1.2.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pendulum" version))
+       (sha256
+        (base32
+         "1fj36yxi2f4lzchzd8ny1qjl67dbypnk0gn8qwad2w78579m8m8z"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-pytest" ,python-pytest)
+       ("python-nose" ,python-nose)))
+    (propagated-inputs
+     `(("python-dateutil" ,python-dateutil)
+       ("python-pytzdata" ,python-pytzdata)
+       ("python-tzlocal" ,python-tzlocal)))
+    (home-page "https://github.com/sdispater/pendulum")
+    (synopsis "Alternate API for Python datetimes")
+    (description "Pendulum is a drop-in replacement for the standard
+@{datetime} class, providing an alternative API.  As it inherits from the
+standard @code{datetime}so you can replace all your @code{datetime} instances
+by Pendulum instances in you code")
+    (license expat)))
+
+(define-public python2-pendulum
+  (package-with-python2 python-pendulum))
-- 
2.13.4

[bug#27961] [PATCH 4/5] gnu: python-orator: Update to 0.9.7.

[Ben Woodcroft]

* gnu/packages/python.scm (python-orator): Update to 0.9.7.
[propagated-inputs]: Remove python-arrow.  Add python-backpack,
python-pendulum, python-pygments, python-six.
(python2-orator): Likewise.
[propagated-inputs]: Remove python2-ipaddress.
---
 gnu/packages/python.scm | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7a18c0e14..2375578d8 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -107,6 +107,7 @@
   #:use-module (gnu packages statistics)
   #:use-module (gnu packages tex)
   #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages time)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages video)
@@ -11990,24 +11991,27 @@ mocks, stubs and fakes.")
 (define-public python-orator
   (package
     (name "python-orator")
-    (version "0.8.2")
+    (version "0.9.7")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "orator" version))
               (sha256
                (base32
-                "1li49irsqha17nrda4nsb48biyy0rarp9pphf0jpqwm5zr8hv569"))))
+                "14r58z64fdp76ixnvmi4lni762b405ynmsx6chr1qihs3yl9zn6c"))))
     (build-system python-build-system)
     (arguments '(#:tests? #f)) ; no tests
     (propagated-inputs
-     `(("python-arrow" ,python-arrow)
+     `(("python-backpack" ,python-backpack)
        ("python-blinker" ,python-blinker)
        ("python-cleo" ,python-cleo)
        ("python-faker" ,python-faker)
        ("python-inflection" ,python-inflection)
        ("python-lazy-object-proxy" ,python-lazy-object-proxy)
+       ("python-pendulum" ,python-pendulum)
        ("python-pyaml" ,python-pyaml)
+       ("python-pygments" ,python-pygments)
        ("python-simplejson" ,python-simplejson)
+       ("python-six" ,python-six)
        ("python-wrapt" ,python-wrapt)))
     (home-page "https://orator-orm.com/")
     (synopsis "ActiveRecord ORM for Python")
@@ -12018,12 +12022,7 @@ implementation for Python.")
     (properties `((python2-variant . ,(delay python2-orator))))))
 
 (define-public python2-orator
-  (let ((base (package-with-python2 (strip-python2-variant python-orator))))
-    (package
-      (inherit base)
-      (propagated-inputs
-       `(("python2-ipaddress" ,python2-ipaddress)
-         ,@(package-propagated-inputs base))))))
+  (package-with-python2 (strip-python2-variant python-orator)))
 
 (define-public python-prompt-toolkit
  (package
-- 
2.13.4

[bug#27961] [PATCH 5/5] gnu: python-orator: Move to (gnu packages databases).

[Ben Woodcroft]

* gnu/packages/python.scm: Remove (gnu packages time) import.
(python-orator, python2-orator): Move from here ...
* gnu/packages/databases.scm: ... to here.
---
 gnu/packages/databases.scm | 38 ++++++++++++++++++++++++++++++++++++++
 gnu/packages/python.scm    | 37 -------------------------------------
 2 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 13efc5edc..bb2c3eeec 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -17,6 +17,7 @@
 ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
 ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -51,6 +52,7 @@
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages time)
   #:use-module (gnu packages jemalloc)
   #:use-module (gnu packages language)
   #:use-module (gnu packages libevent)
@@ -1619,3 +1621,39 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.")
 
 (define-public python2-lmdb
   (package-with-python2 python-lmdb))
+
+(define-public python-orator
+  (package
+    (name "python-orator")
+    (version "0.9.7")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "orator" version))
+              (sha256
+               (base32
+                "14r58z64fdp76ixnvmi4lni762b405ynmsx6chr1qihs3yl9zn6c"))))
+    (build-system python-build-system)
+    (arguments '(#:tests? #f)) ; no tests
+    (propagated-inputs
+     `(("python-backpack" ,python-backpack)
+       ("python-blinker" ,python-blinker)
+       ("python-cleo" ,python-cleo)
+       ("python-faker" ,python-faker)
+       ("python-inflection" ,python-inflection)
+       ("python-lazy-object-proxy" ,python-lazy-object-proxy)
+       ("python-pendulum" ,python-pendulum)
+       ("python-pyaml" ,python-pyaml)
+       ("python-pygments" ,python-pygments)
+       ("python-simplejson" ,python-simplejson)
+       ("python-six" ,python-six)
+       ("python-wrapt" ,python-wrapt)))
+    (home-page "https://orator-orm.com/")
+    (synopsis "ActiveRecord ORM for Python")
+    (description
+     "Orator provides a simple ActiveRecord-like Object Relational Mapping
+implementation for Python.")
+    (license license:expat)
+    (properties `((python2-variant . ,(delay python2-orator))))))
+
+(define-public python2-orator
+  (package-with-python2 (strip-python2-variant python-orator)))
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 2375578d8..46691c7fe 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -107,7 +107,6 @@
   #:use-module (gnu packages statistics)
   #:use-module (gnu packages tex)
   #:use-module (gnu packages texinfo)
-  #:use-module (gnu packages time)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages video)
@@ -11988,42 +11987,6 @@ mocks, stubs and fakes.")
 (define-public python2-flexmock
   (package-with-python2 python-flexmock))
 
-(define-public python-orator
-  (package
-    (name "python-orator")
-    (version "0.9.7")
-    (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "orator" version))
-              (sha256
-               (base32
-                "14r58z64fdp76ixnvmi4lni762b405ynmsx6chr1qihs3yl9zn6c"))))
-    (build-system python-build-system)
-    (arguments '(#:tests? #f)) ; no tests
-    (propagated-inputs
-     `(("python-backpack" ,python-backpack)
-       ("python-blinker" ,python-blinker)
-       ("python-cleo" ,python-cleo)
-       ("python-faker" ,python-faker)
-       ("python-inflection" ,python-inflection)
-       ("python-lazy-object-proxy" ,python-lazy-object-proxy)
-       ("python-pendulum" ,python-pendulum)
-       ("python-pyaml" ,python-pyaml)
-       ("python-pygments" ,python-pygments)
-       ("python-simplejson" ,python-simplejson)
-       ("python-six" ,python-six)
-       ("python-wrapt" ,python-wrapt)))
-    (home-page "https://orator-orm.com/")
-    (synopsis "ActiveRecord ORM for Python")
-    (description
-     "Orator provides a simple ActiveRecord-like Object Relational Mapping
-implementation for Python.")
-    (license license:expat)
-    (properties `((python2-variant . ,(delay python2-orator))))))
-
-(define-public python2-orator
-  (package-with-python2 (strip-python2-variant python-orator)))
-
 (define-public python-prompt-toolkit
  (package
   (name "python-prompt-toolkit")
-- 
2.13.4

[bug#27961] [PATCH 1/5] gnu: Add python-backpack.

[Ricardo Wurmus]

Ben Woodcroft <donttrustben@gmail.com> writes:

> * gnu/packages/python.scm (python-backpack): New variable.
> ---
[…]
> +    (description "Backpack provides some useful utilities for working with
> +collections of data..")

Please remove the extra period at the end.
Other than that it’s okay to push this.

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

[bug#27961] [PATCH 2/5] gnu: Add python-pytzdata.

[Ricardo Wurmus]

Hi Ben,

> * gnu/packages/time.scm (python-pytzdata): New variable.
> ---
[…]
> +    (home-page
> +     "https://github.com/sdispater/pytzdata")

I’d pull the string onto the same line as “home-page”.

LGTM!

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

[bug#27961] [PATCH 3/5] gnu: Add python-pendulum.

[Ricardo Wurmus]

Ben Woodcroft <donttrustben@gmail.com> writes:

> * gnu/packages/time.scm (python-pendulum): New variable.
> ---
[…]
> +    (description "Pendulum is a drop-in replacement for the standard
> +@{datetime} class, providing an alternative API.  As it inherits from the
> +standard @code{datetime}so you can replace all your @code{datetime} instances

There’s something wrong after @code{datetime}.  I think you can replace
“so” with “,” — otherwise you’re missing a space before “so”.

Okay with this change.

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

[bug#27961] [PATCH 4/5] gnu: python-orator: Update to 0.9.7.

[Ricardo Wurmus]

Hi Ben,

> * gnu/packages/python.scm (python-orator): Update to 0.9.7.
> [propagated-inputs]: Remove python-arrow.  Add python-backpack,
> python-pendulum, python-pygments, python-six.
> (python2-orator): Likewise.
> [propagated-inputs]: Remove python2-ipaddress.

LGTM!

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

[bug#27961] [PATCH 5/5] gnu: python-orator: Move to (gnu packages databases).

[Ricardo Wurmus]

Hi Ben,

> * gnu/packages/python.scm: Remove (gnu packages time) import.
> (python-orator, python2-orator): Move from here ...
> * gnu/packages/databases.scm: ... to here.
> ---
[…]
> diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
> index 13efc5edc..bb2c3eeec 100644
> --- a/gnu/packages/databases.scm
> +++ b/gnu/packages/databases.scm
> @@ -17,6 +17,7 @@
>  ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
>  ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
>  ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
> +;;; Copyright © 2017 Ben Woodcroft <donttrustben@gmail.com>

You also need to update this line:

;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>

to

;;; Copyright © 2015, 2016 Sou Bunnbu <iyzsong@gmail.com>

because python-orator was added in commit
5a7441910d264ec4a04f623267bd6aa0a58755f8, so the copyright needs to be
transferred along.

Okay to push with this change!

Thank you!

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

bug#27961: [PATCH 5/5] gnu: python-orator: Move to (gnu packages databases).

[Ben Woodcroft]

On 17/08/17 00:36, Ricardo Wurmus wrote:
> [..]
>
> Okay to push with this change!
Thanks for these helpful reviews Ricardo. I've now pushed this series 
ending in da1f7a9e16d7debd59b8e1d39291cdf4cc4f6ea0.

ben