diff options
| author | Andreas Enge <andreas@enge.fr> | 2023-03-20 18:21:47 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2023-03-20 18:49:06 +0100 |
| commit | ccb62d8feb50e2859d7c41429a9e3d9e0fe30bfe (patch) | |
| tree | 4ab573cee33f277828ad553a22579175b1dda22d /gnu/packages/graph.scm | |
| parent | 098bd280f82350073e8280e37d56a14162eed09c (diff) | |
| parent | f80215c7c4ae5ea0c316f4766e6c05ae4218ede3 (diff) | |
| download | guix-ccb62d8feb50e2859d7c41429a9e3d9e0fe30bfe.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/graph.scm')
| -rw-r--r-- | gnu/packages/graph.scm | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 104fe07b58..b719b1be42 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -230,24 +230,30 @@ lines.") "0kc9v5ampq2paw6sls6zdchvqvis7b1z8xhdvlhz5xxdr1vj5xnn")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases + (list + #:phases + #~(modify-phases %standard-phases (add-before 'build 'skip-npm ;; npm is not packaged so build without it (lambda _ (setenv "SKIP_NPM" "T"))) - (add-after 'unpack 'chdir - (lambda _ - (chdir "packages/python/plotly") - #t)) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-x" "plotly/tests/test_core") - (invoke "pytest" "-x" "plotly/tests/test_io") - ;; FIXME: Add optional dependencies and enable their tests. - ;; (invoke "pytest" "-x" "plotly/tests/test_optional") - (invoke "pytest" "_plotly_utils/tests"))))))) + (add-after 'unpack 'fix-version + ;; Versioneer is useless when there is no git metadata. + (lambda _ + (substitute* "packages/python/plotly/setup.py" + (("version=versioneer.get_version\\(),") + (format #f "version=~s," #$version))))) + (add-after 'fix-version 'chdir + (lambda _ + (chdir "packages/python/plotly"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-x" "plotly/tests/test_core") + (invoke "pytest" "-x" "plotly/tests/test_io") + ;; FIXME: Add optional dependencies and enable their tests. + ;; (invoke "pytest" "-x" "plotly/tests/test_optional") + (invoke "pytest" "_plotly_utils/tests"))))))) (native-inputs (list python-ipywidgets python-pytest python-xarray)) (propagated-inputs @@ -605,7 +611,7 @@ transformed into common image formats for display or printing.") (define-public python-graph-tool (package (name "python-graph-tool") - (version "2.45") + (version "2.46") (source (origin (method url-fetch) (uri (string-append @@ -613,7 +619,7 @@ transformed into common image formats for display or printing.") version ".tar.bz2")) (sha256 (base32 - "0s46qqg454kwq2px7x1a4ckryclkxnrz1r7gj6bv40nsrynafbgr")))) + "0x9jgnq9xcja3q954y7nhdzd374p4h203pymxh51b6lqqbq0hm9h")))) (build-system gnu-build-system) (arguments `(#:imported-modules (,@%gnu-build-system-modules |