guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

90/145: gnu: python-igraph: Update to 0.9.8.


From: guix-commits
Subject: 90/145: gnu: python-igraph: Update to 0.9.8.
Date: Mon, 10 Jan 2022 11:44:13 -0500 (EST)

apteryx pushed a commit to branch version-1.4.0
in repository guix.

commit ac1edb804fe1011c2f6ce0a6d814b0ec72085300
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Dec 23 01:15:10 2021 -0500

    gnu: python-igraph: Update to 0.9.8.
    
    * gnu/packages/graph.scm (python-igraph): Update to 0.9.8.
    [origin]: Fetch from git.
    [configure-flags]: Delete argument.
    [phases]{build}: No longer override phase.
    {check}: Preserve ordering and streamline.
    {specify-libigraph-location}: New phase.
    [native-inputs]: Remove pkg-config.
    [home-page]: Update.
---
 gnu/packages/graph.scm | 55 ++++++++++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index d33fcdf6dd..90f32cc23e 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -27,6 +27,7 @@
 
 (define-module (gnu packages graph)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module (guix packages)
   #:use-module (guix utils)
@@ -146,36 +147,46 @@ more.")
     (license license:gpl2+)))
 
 (define-public python-igraph
-  (package (inherit igraph)
+  (package/inherit igraph
     (name "python-igraph")
-    (version "0.8.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "python-igraph" version))
-       (sha256
-        (base32 "0wkxrs28qdvnrz7d4jzcf2bh6v2yqzx3wyfziihfgsi2gn6n60a6"))))
+    (version "0.9.8")
+    (source (origin
+              (method git-fetch)
+              ;; The PyPI archive lacks tests.
+              (uri (git-reference
+                    (url "https://github.com/igraph/python-igraph";)
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0nwwfqvj4gp91b9j67zq4l58srr4r8qfqh90ygx17zyrybkx7ns6"))))
     (build-system python-build-system)
     (arguments
-     '(#:configure-flags
-       (list "--use-pkg-config")
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'build
-           (lambda _
-             (invoke "python" "./setup.py" "build" "--use-pkg-config")))
-         (delete 'check)
-         (add-after 'install 'check
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (add-installed-pythonpath inputs outputs)
-             (invoke "pytest" "-v"))))))
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'specify-libigraph-location
+            (lambda _
+              (let ((igraph #$(this-package-input "igraph")))
+                (substitute* "setup.py"
+                  (("(LIBIGRAPH_FALLBACK_INCLUDE_DIRS = ).*" _ var)
+                   (string-append
+                    var (format #f "[~s]~%" (string-append igraph
+                                                           
"/include/igraph"))))
+                  (("(LIBIGRAPH_FALLBACK_LIBRARY_DIRS = ).*" _ var)
+                   (string-append
+                    var (format #f "[~s]~%" (string-append igraph 
"/lib"))))))))
+          (replace 'check
+            (lambda* (#:key tests? #:allow-other-keys)
+              (when tests?
+                (invoke "pytest" "-v")))))))
     (inputs
      (list igraph))
     (propagated-inputs
      (list python-texttable))
     (native-inputs
-     (list pkg-config python-pytest))
-    (home-page "https://pypi.org/project/python-igraph/";)
+     (list python-pytest))
+    (home-page "https://igraph.org/python/";)
     (synopsis "Python bindings for the igraph network analysis library")))
 
 (define-public r-rbiofabric



reply via email to

[Prev in Thread] Current Thread [Next in Thread]