Archived
1
0
Fork 0

gnu: python-networkx: Update to 2.4.

* gnu/packages/python-xyz.scm (python-networkx): Update to 2.4.
[source](uri): Download tarball instead of zipball.
[arguments]: New field.
[native-inputs]: Remove PYTHON-NOSE and UNZIP.  Add PYTHON-PYTEST.
[properties]: New field.
(python2-networkx): Stick with version 2.2.
This commit is contained in:
Marius Bakke 2020-03-15 13:32:12 +01:00
parent c19930dc6b
commit 5a9980d55e
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -6118,29 +6118,52 @@ interfaces in an easy and portable manner.")
(define-public python-networkx (define-public python-networkx
(package (package
(name "python-networkx") (name "python-networkx")
(version "2.2") (version "2.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "networkx" version ".zip")) (uri (pypi-uri "networkx" version))
(sha256 (sha256
(base32 "12swxb15299v9vqjsq4z8rgh5sdhvpx497xwnhpnb0gynrx6zra5")))) (base32 "0r2wr7aqay9fwjrgk35fkjzk8lvvb4i4df7ndaqzkr4ndw5zzx7q"))))
(build-system python-build-system) (build-system python-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(if tests?
(invoke "pytest" "-vv" "--pyargs" "networkx")
(format #t "test suite not run~%"))
#t)))))
;; python-decorator is needed at runtime. ;; python-decorator is needed at runtime.
(propagated-inputs (propagated-inputs
`(("python-decorator" ,python-decorator))) `(("python-decorator" ,python-decorator)))
(native-inputs (native-inputs
`(("python-nose" ,python-nose) `(("python-pytest" ,python-pytest)))
("unzip" ,unzip)))
(home-page "https://networkx.github.io/") (home-page "https://networkx.github.io/")
(synopsis "Python module for creating and manipulating graphs and networks") (synopsis "Python module for creating and manipulating graphs and networks")
(description (description
"NetworkX is a Python package for the creation, manipulation, and study "NetworkX is a Python package for the creation, manipulation, and study
of the structure, dynamics, and functions of complex networks.") of the structure, dynamics, and functions of complex networks.")
(properties `((python2-variant . ,(delay python2-networkx))))
(license license:bsd-3))) (license license:bsd-3)))
;; NetworkX 2.2 is the last version with support for Python 2.
(define-public python2-networkx (define-public python2-networkx
(package-with-python2 python-networkx)) (let ((base (package-with-python2 (strip-python2-variant python-networkx))))
(package
(inherit base)
(version "2.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "networkx" version ".zip"))
(sha256
(base32
"12swxb15299v9vqjsq4z8rgh5sdhvpx497xwnhpnb0gynrx6zra5"))))
(arguments
`(#:python ,python-2))
(native-inputs
`(("python-nose" ,python2-nose)
("unzip" ,unzip))))))
(define-public python-datrie (define-public python-datrie
(package (package