GNU bug report logs - #30117
[PATCH] gnu: Add python-shapely and python2-shapely.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 30117 in the body.
You can then email your comments to 30117 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kkebreau <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: Kei Kebreau <kkebreau <at> posteo.net>
Subject: [PATCH] gnu: Add python-shapely and python2-shapely.
Date: Sun, 14 Jan 2018 20:31:17 -0500

* gnu/packages/python.scm (python-shapely, python2-shapely): New variables.
---
 gnu/packages/python.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0b582e6b7..17422673f 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -41,7 +41,7 @@
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe <at> gmail.com>
 ;;; Copyright © 2017 José Miguel Sánchez García <jmi2k <at> openmailbox.org>
 ;;; Copyright © 2017 Roel Janssen <roel <at> gnu.org>
-;;; Copyright © 2017 Kei Kebreau <kkebreau <at> posteo.net>
+;;; Copyright © 2017, 2018 Kei Kebreau <kkebreau <at> posteo.net>
 ;;; Copyright © 2017 Rutger Helling <rhelling <at> mykolab.com>
 ;;; Copyright © 2017 Muriithi Frederick Muriuki <fredmanglis <at> gmail.com>
 ;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley <at> openmailbox.org>
@@ -76,6 +76,7 @@
   #:use-module (gnu packages file)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages gcc)
+  #:use-module (gnu packages geo)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
@@ -470,6 +471,53 @@ pidof, tty, taskset, pmap.")
 (define-public python2-psutil
   (package-with-python2 python-psutil))
 
+(define-public python-shapely
+  (package
+    (name "python-shapely")
+    (version "1.6.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "Shapely" version))
+       (sha256
+        (base32
+         "0svc58dzcw9gj92b4sgq35sdxkf85z0qwlzxarkzq4bp3h8jy58l"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-cython" ,python-cython)
+       ("python-matplotlib" ,python-matplotlib)
+       ("python-pyqt" ,python-pyqt)
+       ("python-pytest" ,python-pytest)
+       ("python-pytest-cov" ,python-pytest-cov)))
+    (inputs
+     `(("geos" ,geos)))
+    (propagated-inputs
+     `(("python-numpy" ,python-numpy)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-geos-path
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((geos (assoc-ref inputs "geos"))
+                   (glibc (assoc-ref inputs ,(if (%current-target-system)
+                                                 "cross-libc" "libc"))))
+               (substitute* "shapely/geos.py"
+                 (("_lgeos = load_dll\\('geos_c', fallbacks=.*\\)")
+                  (string-append "_lgeos = load_dll('geos_c', fallbacks=['"
+                                 geos "/lib/libgeos_c.so'])"))
+                 (("free = load_dll\\('c'\\)\\.free")
+                  (string-append "free = load_dll('c', fallbacks=['"
+                                 glibc "/lib/libc.so.6']).free"))))
+             #t)))))
+    (home-page
+     "https://github.com/Toblerity/Shapely")
+    (synopsis "Library for the manipulation and analysis of geometric objects")
+    (description "Geometric objects, predicates, and operations")
+    (license license:bsd-3)))
+
+(define-public python2-shapely
+  (package-with-python2 python-shapely))
+
 (define-public python-clyent
   (package
     (name "python-clyent")
-- 
2.15.1

Message #8 received at 30117 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Kei Kebreau <kkebreau <at> posteo.net>
Cc: 30117 <at> debbugs.gnu.org
Subject: Re: [bug#30117] [PATCH] gnu: Add python-shapely and python2-shapely.
Date: Tue, 16 Jan 2018 15:39:53 +0100

Kei Kebreau <kkebreau <at> posteo.net> skribis:

> * gnu/packages/python.scm (python-shapely, python2-shapely): New variables.

[...]

> +    (home-page
> +     "https://github.com/Toblerity/Shapely")
> +    (synopsis "Library for the manipulation and analysis of geometric objects")
> +    (description "Geometric objects, predicates, and operations")

Please make it a full sentence.  :-)

Otherwise LGTM, thanks!

Ludo’.

Message #13 received at 30117-done <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kkebreau <at> posteo.net>
To: ludo <at> gnu.org (Ludovic Courtès)
Cc: 30117-done <at> debbugs.gnu.org
Subject: Re: [bug#30117] [PATCH] gnu: Add python-shapely and python2-shapely.
Date: Tue, 16 Jan 2018 19:11:50 -0500

[Message part 1 (text/plain, inline)]

ludo <at> gnu.org (Ludovic Courtès) writes:

> Kei Kebreau <kkebreau <at> posteo.net> skribis:
>
>> * gnu/packages/python.scm (python-shapely, python2-shapely): New variables.
>
> [...]
>
>> +    (home-page
>> +     "https://github.com/Toblerity/Shapely")
>> + (synopsis "Library for the manipulation and analysis of geometric
>> objects")
>> +    (description "Geometric objects, predicates, and operations")
>
> Please make it a full sentence.  :-)
>
> Otherwise LGTM, thanks!
>
> Ludo’.

Pushed to master with appropriate changes. Thanks for reviewing!

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.