From 009921438672a412ff027f182bffc997be04ff21 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 1 Oct 2023 21:30:03 +0200 Subject: Revert "gnu: poetry: Update to 1.1.12." This reverts commit d477018b57d5b4c13b4dd35aa1c4ee1a00ca76e2. --- gnu/packages/python-xyz.scm | 56 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 12 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d3d91480ac..a40738f5cc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13493,6 +13493,37 @@ (define-public python-msgpack-1.0.2 (base32 "1109s2yynrahwi64ikax68hx0mbclz8p35afmpphw5dwynb49q7s")))))) +;; This msgpack library's name changed from "python-msgpack" to "msgpack" with +;; release 0.5. Some packages like borg still call it by the old name for now. +;; +(define-public python-msgpack-transitional + (package + (inherit python-msgpack) + (name "python-msgpack-transitional") + (version "0.5.6") + (source (origin + (method url-fetch) + (uri (pypi-uri "msgpack" version)) + (sha256 + (base32 + "1hz2dba1nvvn52afg34liijsm7kn65cmn06dl0xbwld6bb4cis0f")))) + (arguments + (substitute-keyword-arguments (package-arguments python-msgpack) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'configure-transitional + (lambda _ + ;; Keep using the old name. + (substitute* "setup.py" + (("TRANSITIONAL = False") + "TRANSITIONAL = 1")) + ;; This old version is not compatible with Python 3.9 + (substitute* '("test/test_buffer.py" "test/test_extension.py") + ((".tostring\\(") ".tobytes(")) + (substitute* '("test/test_buffer.py" "test/test_extension.py") + ((".fromstring\\(") ".frombytes(")) + #t)))))))) + (define-public python-netaddr (package (name "python-netaddr") @@ -19251,26 +19282,25 @@ (define-public python-cachy (define-public poetry (package (name "poetry") - (version "1.4.2") + (version "1.1.12") (source (origin (method url-fetch) (uri (pypi-uri "poetry" version)) (sha256 (base32 - "0g0vczn6qa4b2bdkq4k7fm1g739vyxp2iiblwwsrcmw24jj81m8b")))) + "0rr54mvcfcv9cv6vw2122y28xvd2pwqpv2x8c8j5ayz3gwsy4rjw")))) (build-system python-build-system) (arguments `(#:tests? #f ;PyPI does not have tests - ;; #:phases - ;; (modify-phases %standard-phases - ;; (add-before 'build 'patch-setup-py - ;; (lambda _ - ;; (substitute* "setup.py" - ;; ;; Relax some of the requirements. - ;; (("(keyring>=21.2.0),<22.0.0" _ keyring) keyring) - ;; (("(packaging>=20.4),<21.0" _ packaging) packaging))))) - )) + #:phases + (modify-phases %standard-phases + (add-before 'build 'patch-setup-py + (lambda _ + (substitute* "setup.py" + ;; Relax some of the requirements. + (("(keyring>=21.2.0),<22.0.0" _ keyring) keyring) + (("(packaging>=20.4),<21.0" _ packaging) packaging))))))) (propagated-inputs (list python-cachecontrol python-cachy @@ -19279,7 +19309,9 @@ (define-public poetry python-entrypoints python-html5lib python-keyring - python-msgpack + ; Use of deprecated version of msgpack reported upstream: + ; https://github.com/python-poetry/poetry/issues/3607 + python-msgpack-transitional python-packaging python-pexpect python-pip -- cgit v1.2.3 From f4a5d4f0b0a814fe8bb19063cb77cbaa45d85032 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 1 Oct 2023 22:01:29 +0200 Subject: gnu: poetry: Fix build. Follow-up to 21d6985a8b3c6e53aab648275dc27b72c7453437. * gnu/packages/python-build.scm (python-poetry-core-1.0): New variable. * gnu/packages/python-xyz.scm (poetry)[propagated-inputs]: Replace python-poetry-core by python-poetry-core-1.0. --- gnu/packages/python-build.scm | 20 ++++++++++++++++++++ gnu/packages/python-xyz.scm | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 154c97e9e4..bb1df3e9aa 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -493,6 +493,26 @@ (define-public python-pypa-build order to make bootstrapping easier.") (license license:expat))) +(define-public python-poetry-core-1.0 + (package + (name "python-poetry-core") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "poetry-core" version)) + (sha256 + (base32 "01n2rbsvks7snrq3m1d08r3xz9q2715ajb62fdb6rvqnb9sirhcq")))) + (build-system python-build-system) + (home-page "https://github.com/python-poetry/poetry-core") + (synopsis "Poetry PEP 517 build back-end") + (description + "The @code{poetry-core} module provides a PEP 517 build back-end +implementation developed for Poetry. This project is intended to be +a light weight, fully compliant, self-contained package allowing PEP 517 +compatible build front-ends to build Poetry managed projects.") + (license license:expat))) + (define-public python-poetry-core (package (name "python-poetry-core") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a40738f5cc..3f2828fe54 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19316,7 +19316,7 @@ (define-public poetry python-pexpect python-pip python-pkginfo - python-poetry-core + python-poetry-core-1.0 python-requests python-requests-toolbelt python-shellingham -- cgit v1.2.3 From 8036852533b26ce48e82272042ee3ac2a9974ec5 Mon Sep 17 00:00:00 2001 From: Attila Lendvai Date: Wed, 27 Sep 2023 17:47:27 +0200 Subject: gnu: Add python-construct-classes. * gnu/packages/python-xyz.scm (python-construct-classes): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3f2828fe54..25027b45fc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -143,6 +143,7 @@ ;;; Copyright © 2023 Foundation Devices, Inc. ;;; Copyright © c4droid ;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2023 Attila Lendvai ;;; ;;; This file is part of GNU Guix. ;;; @@ -834,6 +835,31 @@ (define-public python-colorful as functions or string constants to form colored terminal output.") (license license:expat))) +(define-public python-construct-classes + (package + (name "python-construct-classes") + (version "0.1.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/matejcik/construct-classes") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fmr8nfg543lyqk4164a52jb6lwpq98radicbkhhdfckq9lib2wp")))) + (build-system pyproject-build-system) + (propagated-inputs + (list python-construct)) + (native-inputs + (list python-poetry-core + python-pytest)) + (home-page "https://github.com/matejcik/construct-classes") + (synopsis "Parse binary structs into dataclasses") + (description "This package provides a parser to parse binary structs +into dataclasses.") + (license license:expat))) + (define-public python-yaspin (package (name "python-yaspin") -- cgit v1.2.3 From 0c6198319a61d85cd8925af418466dcdccf3daff Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 29 Sep 2023 19:33:05 +0800 Subject: gnu: Add python-altgraph. * gnu/packages/python-xyz.scm (python-altgraph): New variable. Co-authored-by: jgart --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 25027b45fc..be2d5cf692 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11519,6 +11519,26 @@ (define-public python-toposort algorithm.") (license license:asl2.0))) +(define-public python-altgraph + (package + (name "python-altgraph") + (version "0.17.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "altgraph" version)) + (sha256 + (base32 "01j48np3g50g6insjkszsz0vifwlm6gspria5vdwlkbciywznnhv")))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest)) + (home-page "https://altgraph.readthedocs.io") + (synopsis "Python graph network package") + (description +"This package provides tools for constructing graphs, BFS and DFS +traversals, topological sort, shortest paths, and more with graphviz +output.") + (license license:expat))) + (define-public python-three-merge (package (name "python-three-merge") -- cgit v1.2.3 From ad10bbe563c8019d1dada3dd98e6f12997608df6 Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 6 Oct 2023 14:20:09 -0500 Subject: gnu: python-pudb: Update to 2023.1. * gnu/packages/python-xyz.scm (python-pudb): Update to 2023.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index be2d5cf692..e8613db553 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -31895,13 +31895,13 @@ (define-public dynaconf (define-public python-pudb (package (name "python-pudb") - (version "2022.1.3") + (version "2023.1") (source (origin (method url-fetch) (uri (pypi-uri "pudb" version)) (sha256 (base32 - "0jk61qgacvwy6zkz1f55jawax4ggb1aawy6w3wnfkzqrkvd3ms2q")))) + "00rgx80inpvsbcydp29mrhw44xizyqdqxvv6lqcak1xs79h3rpqm")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 6e63530954cf43c92fe0597f6114e3fe629f65cd Mon Sep 17 00:00:00 2001 From: jgart Date: Sat, 7 Oct 2023 23:13:50 -0500 Subject: gnu: python-glymur: Update to 0.12.8. * gnu/packages/python-xyz.scm (python-glymur): Update to 0.12.8. [native-inputs]: Add python-scikit-image. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e8613db553..94e8db934f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1550,7 +1550,7 @@ (define-public python-pyprind (define-public python-glymur (package (name "python-glymur") - (version "0.12.0") + (version "0.12.8") (source (origin (method git-fetch) ; no tests data in PyPi package @@ -1559,7 +1559,7 @@ (define-public python-glymur (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "03nny8k42yxdyw7sjv43szmg23x3rqplbaf7m0a0lpvwla1dl78i")))) + (base32 "0mfyn9j7h13242d41vg12acw55yl2mv6lmgi265hfp11k7g52b6n")))) (build-system pyproject-build-system) (arguments (list @@ -1588,7 +1588,7 @@ (define-public python-glymur ;; which is patched above. (delete-file "tests/test_config.py")))))) (native-inputs - (list python-pytest)) + (list python-pytest python-scikit-image)) (inputs (list openjpeg ; glymur/lib/openjp2.py libtiff)) ; glymur/lib/tiff.py -- cgit v1.2.3