From ec8c77b8ed4300193f4545b7373679082bee5fb2 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 28 Sep 2022 09:48:01 +0800 Subject: gnu: python-pyvips: Update to 2.2.1. * gnu/packages/python-xyz.scm (python-pyvips): Update to 2.2.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 54ed7fefed3..57942331b2b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7434,13 +7434,13 @@ data, and scientific formats.") (define-public python-pyvips (package (name "python-pyvips") - (version "2.2.0") + (version "2.2.1") (source (origin (method url-fetch) (uri (pypi-uri "pyvips" version)) (sha256 - (base32 "0lq71iiic4pc8qhxr60gi141w25pjnn4vsh05d5l0fjkgjsv137b")))) + (base32 "1dfbwwvnnsk4g2kj1pw654z9jq3mb72l1m8ma29858jpn12vn7dm")))) (build-system python-build-system) (arguments (list #:phases -- cgit v1.3 From b6b09a93fd0d2177e702f43c566bb2b4c2d300c8 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 17 Sep 2022 21:50:41 +0200 Subject: gnu: Add python-timeout-decorator. * gnu/packages/python-xyz.scm (python-timeout-decorator): New variable. --- gnu/packages/python-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 57942331b2b..34d6aa5ea05 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11217,6 +11217,23 @@ checksums. It implement more than a hundred checksum routines.") blocks or callables with two context managers and two decorators.") (license license:expat))) +(define-public python-timeout-decorator + (package + (name "python-timeout-decorator") + (version "0.5.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "timeout-decorator" version)) + (sha256 + (base32 + "1mxk2qyydhzncm93z08kvj5ssxq3fr2n7pkrrji28nqwvdc2ybva")))) + (build-system python-build-system) + (home-page "https://github.com/pnpnpn/timeout-decorator") + (synopsis "Timeout decorator") + (description "This package provides a decorator that raises an error +when an operation takes longer than expected.") + (license license:expat))) + (define-public python-straight-plugin (package (name "python-straight-plugin") -- cgit v1.3 From 7b7562d930648380d03c2ffa06cbd0f145791ce9 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 17 Sep 2022 21:50:48 +0200 Subject: gnu: Add python-readability-lxml. * gnu/packages/python-xyz.scm (python-readability-lxml): New variable. --- gnu/packages/python-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 34d6aa5ea05..74fa826889d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27967,6 +27967,38 @@ characteristics. These measures are basically linear regressions based on the number of words, syllables, and sentences.") (license license:asl2.0))) +(define-public python-readability-lxml + (package + (name "python-readability-lxml") + (version "0.8.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/buriy/python-readability") + (commit (string-append "v" version)))) + (sha256 + (base32 + "13nfy2v0pbbf62jn9qwgi489gg97hbb22q6w3f78mnvjxd2m19rh")) + (snippet + #~(begin (delete-file "readability/compat/two.py"))))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "pytest" "-v" "tests/"))))))) + (propagated-inputs (list python-chardet python-cssselect python-lxml)) + (native-inputs (list python-timeout-decorator python-pytest)) + (home-page "http://github.com/buriy/python-readability") + (synopsis "HTML to text parser") + (description + "This package provides classes and function that strip gratuitous markup +from web pages to make them easier to read.") + (license license:asl2.0))) + (define-public python-listparser (package (name "python-listparser") -- cgit v1.3 From 5440d6be786d70831ae7474cc8da5270252fa923 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 22 Sep 2022 19:44:04 +0000 Subject: gnu: python-networkx: Update to 2.8.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-networkx): Update to 2.8.6. Signed-off-by: Ludovic Courtès --- 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 74fa826889d..754eff6c447 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9498,13 +9498,13 @@ interfaces in an easy and portable manner.") (define-public python-networkx (package (name "python-networkx") - (version "2.6.2") + (version "2.8.6") (source (origin (method url-fetch) (uri (pypi-uri "networkx" version)) (sha256 - (base32 "1fqrq7gc0nn4rd4zqibw96cap75vb5nlixapkajwawp71jaz21i3")))) + (base32 "19h18f5j79l7kmwm5cvm75fadjgmkzw5m3pyvb9cnq0860q7faxx")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.3 From 0669bf64f788a6fe8567f4ae16c022583df1a5f8 Mon Sep 17 00:00:00 2001 From: Zzull Date: Sat, 24 Sep 2022 17:27:25 +0200 Subject: gnu: Add python-property-manager. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-property-manager): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 754eff6c447..9f0275cb68b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -130,6 +130,7 @@ ;;; Copyright © 2022 Tomasz Jeneralczyk ;;; Copyright © 2022 Mathieu Laparie ;;; Copyright © 2022 Garek Dyszel +;;; Copyright © 2022 Baptiste Strazzulla ;;; ;;; This file is part of GNU Guix. ;;; @@ -7297,6 +7298,30 @@ buffer transformation, compression, and decompression functions for use in the tifffile, czifile, and other scientific image input/output modules.") (license license:bsd-3))) +(define-public python-property-manager + (package + (name "python-property-manager") + (version "3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "property-manager" version)) + (sha256 + (base32 "0m3w4spr8f39xnm65naw29ncal4r453kn7ndqb63rwbsmslnvrwk")))) + (build-system python-build-system) + (native-inputs + (list python-pytest-cov)) + (propagated-inputs + (list python-verboselogs + python-humanfriendly + python-coloredlogs)) + (home-page "https://github.com/xolox/python-property-manager") + (synopsis "Useful property variants for Python programming") + (description "The @code{property-manager} package defines several custom +property variants for Python programming including required properties, +writable properties, cached properties, etc.") + (license license:expat))) ; MIT license + (define-public python-executing (package (name "python-executing") -- cgit v1.3 From d7932b731f0a3b396c6b2503a461a21a474098c3 Mon Sep 17 00:00:00 2001 From: Zzull Date: Sat, 24 Sep 2022 17:42:28 +0200 Subject: gnu: Add python-executor. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-executor): New variable. Signed-off-by: Ludovic Courtès --- 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 9f0275cb68b..8575d4a67ee 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7343,6 +7343,32 @@ writable properties, cached properties, etc.") currently doing, particularly the AST node being executed.") (license license:expat))) +(define-public python-executor + (package + (name "python-executor") + (version "23.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "executor" version)) + (sha256 + (base32 "0g83yr54j0vcwhy6h7n0jsd7q0q630kwa6v9kqzlzrm9xj6c3ip1")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ; TODO: tests require root/sudo + (propagated-inputs + (list python-six + python-property-manager + python-fasteners + python-virtualenv)) + (home-page "https://github.com/xolox/python-executor") + (synopsis "Programmer friendly subprocess wrapper") + (description "The @code{executor} package is a simple wrapper for Python’s +subprocess module that makes it very easy to handle subprocesses on UNIX +systems with proper escaping of arguments and error checking currently doing, +particularly the AST node being executed.") + (license license:expat))) ; MIT license + (define-public python-roifile (package (name "python-roifile") -- cgit v1.3 From 96cbfc620263550002a897682e89b8dc0620d933 Mon Sep 17 00:00:00 2001 From: Brian Kubisiak Date: Sun, 25 Sep 2022 05:59:24 -0700 Subject: gnu: Add python-textual. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-textual): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8575d4a67ee..823e5952e42 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16041,6 +16041,50 @@ is made as zipfile like as possible.") syntax highlighting, markdown and more to the terminal.") (license license:expat))) +(define-public python-textual + (package + (name "python-textual") + (version "0.1.18") + (source (origin + (method url-fetch) + (uri (pypi-uri "textual" version)) + (sha256 + (base32 + "08yg5a51hz1axfj5hx28hx31gq5apcj6vpkkmawmiplisa73z25j")))) + (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs tests? #:allow-other-keys) + (when tests? + (copy-recursively (string-append + (assoc-ref inputs "tests") "/tests") + "tests") + (invoke "python" "-m" "pytest" "-vv"))))))) + (propagated-inputs + (list python-rich python-typing-extensions)) + (native-inputs + `(("python-pytest" ,python-pytest) + ("tests" + ;; The release on pypi comes without tests. We can't build from this + ;; checkout, though, because installation requires an invocation of + ;; poetry. + ,(origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Textualize/textual") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0b3ycwqhp21mg9fvmadgxhgbvkwq6fd784l2xcmvy77rravrnnax")))))) + (home-page "https://github.com/Textualize/textual") + (synopsis "Build text user interfaces in Python") + (description "Textual is a @acronym{TUI, Text User Interface} framework +for Python inspired by modern web development.") + (license license:expat))) + (define-public python-magic (package (name "python-magic") -- cgit v1.3 From a0c83aa04bd45ee17ee72df529866ee4ac6041e3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 6 Oct 2022 22:41:15 +0200 Subject: gnu: python-textual: Remove input labels. * gnu/packages/python-xyz.scm (python-textual)[arguments]: Define the 'tests' origin here. [native-inputs]: Remove "tests" input and remove input labels. --- gnu/packages/python-xyz.scm | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 823e5952e42..60870f54476 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16053,32 +16053,31 @@ syntax highlighting, markdown and more to the terminal.") "08yg5a51hz1axfj5hx28hx31gq5apcj6vpkkmawmiplisa73z25j")))) (build-system python-build-system) (arguments - (list #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs tests? #:allow-other-keys) - (when tests? - (copy-recursively (string-append - (assoc-ref inputs "tests") "/tests") - "tests") - (invoke "python" "-m" "pytest" "-vv"))))))) + (let ((tests + ;; The release on pypi comes without tests. We can't build + ;; from this checkout, though, because installation requires + ;; an invocation of poetry. + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Textualize/textual") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0b3ycwqhp21mg9fvmadgxhgbvkwq6fd784l2xcmvy77rravrnnax"))))) + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (copy-recursively #$(file-append tests "/tests") + "tests") + (invoke "python" "-m" "pytest" "-vv")))))))) (propagated-inputs (list python-rich python-typing-extensions)) (native-inputs - `(("python-pytest" ,python-pytest) - ("tests" - ;; The release on pypi comes without tests. We can't build from this - ;; checkout, though, because installation requires an invocation of - ;; poetry. - ,(origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Textualize/textual") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0b3ycwqhp21mg9fvmadgxhgbvkwq6fd784l2xcmvy77rravrnnax")))))) + (list python-pytest)) (home-page "https://github.com/Textualize/textual") (synopsis "Build text user interfaces in Python") (description "Textual is a @acronym{TUI, Text User Interface} framework -- cgit v1.3 From 363b476910f2fe36fcc28d00aaa86ab6d821cf0c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 10 Oct 2022 23:20:42 +0200 Subject: gnu: python-folium: Update to 0.13.0. * gnu/packages/python-xyz.scm (python-folium): Update to 0.13.0. --- 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 60870f54476..c369362dc77 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24367,7 +24367,7 @@ time-or-computationally-expensive properties quick and easy and works in Python (define-public python-folium (package (name "python-folium") - (version "0.12.1") + (version "0.13.0") (source (origin ;; PyPI has a ".whl" file but not a proper source release. @@ -24378,7 +24378,7 @@ time-or-computationally-expensive properties quick and easy and works in Python (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1q05pzca3wfwgnbg03l3bagnhh348yx68w4aa91rg3g8zlviwjz1")))) + (base32 "00adpdi1890zzzg7ffp04hmx59igdcdpyqa129vnmwqh54b5a006")))) (build-system python-build-system) (propagated-inputs (list python-branca python-jinja2 python-numpy python-requests)) -- cgit v1.3 From f40b7ed3762db72d0d1225935bd7ab8432959c84 Mon Sep 17 00:00:00 2001 From: M Date: Sun, 9 Oct 2022 13:20:54 +0200 Subject: gnu: Add python-pylatexenc. * gnu/packages/python-xyz.scm (python-pylatexenc): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c369362dc77..e76073333ff 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1620,6 +1620,25 @@ concepts.") approximate nearest neighbor search with Python bindings.") (license license:asl2.0))) +(define-public python-pylatexenc + (package + (name "python-pylatexenc") + (version "2.10") + (source (origin + (method url-fetch) + (uri (pypi-uri "pylatexenc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ls09z47b5md71gkxcj7fd87ynpvv2walgp2w6z31p26xf2gvn1x")))) + (build-system python-build-system) + (home-page "https://github.com/phfaist/pylatexenc") + (synopsis "LaTeX parser for Unicode/LaTeX conversion") + (description + "@code{python-pylatexenc} is a LaTeX parser providing LaTeX-to-Unicode and +Unicode-to-LaTeX conversion.") + (license license:expat))) + (define-public python-pyls-black (package (name "python-pyls-black") -- cgit v1.3 From fcbe9cf6f8dc0a1bdc120ffe299b0435743bf632 Mon Sep 17 00:00:00 2001 From: M Date: Sun, 9 Oct 2022 13:20:55 +0200 Subject: gnu: Add python-cobib. * gnu/packages/python-xyz.scm (python-cobib): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e76073333ff..7c647bd42fc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -555,6 +555,37 @@ decorators, including variants of the Python standard library's @code{lru_cache} function decorator.") (license license:expat))) +(define-public python-cobib + (package + (name "python-cobib") + (version "3.5.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "cobib" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "16nbrbvascbf6cb7yvn9q793dy8zx703pqrmk3mswib9a19mnx3n")))) + (build-system python-build-system) + (propagated-inputs + (list python-beautifulsoup4 + python-bibtexparser + python-pylatexenc + python-requests + python-requests-oauthlib + python-ruamel.yaml)) + (native-inputs + (list python-future + python-pyte + python-pytest)) + (home-page "https://gitlab.com/mrossinek/cobib") + (synopsis "Terminal-based bibliography management tool") + (description + "@command{cobib} is a command-line based bibliography management tool. +It uses a plain-text database, a location-independent library, and features +git integration, command-line support, and a curses-based TUI.") + (license license:expat))) + (define-public python-colorful (package (name "python-colorful") -- cgit v1.3 From 4dfaddfc44d3a05db7ad9720b8d8942aec3a1d7f Mon Sep 17 00:00:00 2001 From: Brian Kubisiak Date: Fri, 30 Sep 2022 15:22:00 -0700 Subject: gnu: Add python-crossenv. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-crossenv): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7c647bd42fc..c3efddd2589 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4031,6 +4031,28 @@ e.g. filters, callbacks and errbacks can all be promises.") "Virtualenv is a tool to create isolated Python environments.") (license license:expat))) +(define-public python-crossenv + (package + (name "python-crossenv") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "crossenv" version)) + (sha256 + (base32 + "07rv4650n19740ixmnsf4qbxyqlgi7f5m1cy8cq0gl01q3r6hps4")))) + (build-system python-build-system) + (arguments + (list #:tests? #f)) ; tests not distributed on pypi + (home-page "https://github.com/benfogle/virtualenv") + (synopsis "Cross-compiling virtualenv for Python") + (description "This package is a tool for cross-compiling extension +modules. It creates a special virtual environment such that @command{pip} or +@file{setup.py} will cross compile packages for you, usually with no further +work on your part.") + (license license:expat))) + (define-public python-markupsafe (package (name "python-markupsafe") -- cgit v1.3 From cbaf47bb8b7cda6f6bb343d24866db03eb0445f7 Mon Sep 17 00:00:00 2001 From: Ryan Tolboom Date: Wed, 12 Oct 2022 15:44:34 -0400 Subject: gnu: Add python-dotmap * gnu/packages/python-xyz.scm: New variable Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 60ca7d15065..ad9204e4612 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -496,6 +496,25 @@ and variables you'll need already imported and created. (home-page "https://github.com/google/python-fire") (license license:asl2.0))) +(define-public python-dotmap + (package + (name "python-dotmap") + (version "1.3.30") + (source (origin + (method url-fetch) + (uri (pypi-uri "dotmap" version)) + (sha256 + (base32 + "0s5kb2v7jd0narz6m6jcicak3h5pw290wz21cdsv8pq77y9sf8aq")))) + (build-system python-build-system) + (home-page "https://github.com/drgrib/dotmap") + (synopsis "Ordered, dynamically-expandable dot-access dictionary") + (description + "DotMap is a dot-access dictionary subclass that has dynamic +hierarchy creation, can be initialized with keys, can be initialized from a +dictionary, can be convert to a dictionary, and is ordered by insertion.") + (license license:expat))) + (define-public python-twodict (package (name "python-twodict") -- cgit v1.3 From cf19228932eff2ede5f39f4fdc759374e3b89991 Mon Sep 17 00:00:00 2001 From: Matthew James Kraai Date: Fri, 14 Oct 2022 06:37:01 -0700 Subject: gnu: Add s3cmd. * gnu/packages/python-xyz.scm (s3cmd): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ad9204e4612..ebc56bbc118 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -75,7 +75,7 @@ ;;; Copyright © 2020 Josh Marshall ;;; Copyright © 2020 Lars-Dominik Braun ;;; Copyright © 2020 Alex ter Weele -;;; Copyright © 2020 Matthew James Kraai +;;; Copyright © 2020, 2022 Matthew James Kraai ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Josh Holland ;;; Copyright © 2020 Yuval Kogman @@ -16214,6 +16214,33 @@ modules, which are different and were developed separately, both serve the same purpose: to provide Python bindings for libmagic.") (license license:expat))) +(define-public s3cmd + (package + (name "s3cmd") + (version "2.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/s3tools/s3cmd") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rdgwwmmp8mdxc84bxq6k9a7v7z2qgc3df47djzs2b84gw81dglx")))) + (build-system python-build-system) + (inputs + (list python-dateutil + python-magic)) + (home-page "https://s3tools.org/s3cmd") + (synopsis "Command line tool for S3-compatible storage services") + (description + "S3cmd is a command line tool for uploading, retrieving and managing data +in storage services that are compatible with the Amazon Simple Storage +Service (S3) protocol, including S3 itself. It supports rsync-like backup, +GnuPG encryption, and more. It also supports management of Amazon's +CloudFront content delivery network.") + (license license:gpl2+))) + (define-public python-pkgconfig (package (name "python-pkgconfig") -- cgit v1.3 From 190be4921c6dd1646774fc6129a38c3acd566c0f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 15 Oct 2022 09:12:12 -0400 Subject: gnu: python-robotframework: Update to 5.0.1. * gnu/packages/python-xyz.scm (python-robotframework): Update to 5.0.1. [phases] {delete-problematic-tests}: Re-instate the sending_signal.robot tests, fixed upstream. [native-inputs]: Replace python-jsonschema with python-jsonschema-next. --- gnu/packages/python-xyz.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ebc56bbc118..a15043ce454 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4772,7 +4772,7 @@ ecosystem, but can naturally be used also by other projects.") (define-public python-robotframework (package (name "python-robotframework") - (version "5.0") + (version "5.0.1") ;; There are no tests in the PyPI archive. (source (origin @@ -4782,7 +4782,7 @@ ecosystem, but can naturally be used also by other projects.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qcm36c8hachbv3bc05ky7cf63i3sj0y8dw3bwjvcln28i543f81")) + (base32 "0jjr71npzrm5mv16pya3m2dqaqgf6sc45yca5kfmc5lfislig5b8")) (patches (search-patches "python-robotframework-atest.patch" "python-robotframework-source-date-epoch.patch")))) @@ -4803,13 +4803,7 @@ ecosystem, but can naturally be used also by other projects.") ;; directory not being '/', as is the case in the Guix build ;; container. (delete-file "atest/robot/standard_libraries/\ -operating_system/path_expansion.robot") - ;; FIXME: The test 'Process.Sending Signal.By default signal - ;; is not sent to process running in shell' fails for unknown - ;; reason (see: - ;; https://github.com/robotframework/robotframework/issues/4292). - (delete-file "atest/robot/standard_libraries/\ -process/sending_signal.robot"))) +operating_system/path_expansion.robot"))) (add-before 'build 'build-and-install-doc (lambda* (#:key outputs #:allow-other-keys) (let ((doc (string-append (assoc-ref outputs "doc") @@ -4845,7 +4839,7 @@ process/sending_signal.robot"))) (invoke "xvfb-run" "atest/run.py"))))))) (native-inputs (list python-docutils - python-jsonschema + python-jsonschema-next python-invoke python-lxml python-pygments -- cgit v1.3 From e2c55a679ddda09be433fb6c9e73da8f6d1b09ad Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 15 Oct 2022 16:29:41 -0400 Subject: gnu: python-robotframework-datadriver: Update to 1.6.1. * gnu/packages/python-xyz.scm (python-robotframework-datadriver): Update to 1.6.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 a15043ce454..2bf78d6772a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4861,13 +4861,13 @@ process automation (RPA).") (define-public python-robotframework-datadriver (package (name "python-robotframework-datadriver") - (version "1.6.0") + (version "1.6.1") (source (origin (method url-fetch) (uri (pypi-uri "robotframework-datadriver" version)) (sha256 - (base32 "0qa2vry8jr49k5rbrvmkgggzsmis1wv06dp5dvwmp7afm7vjc51k")))) + (base32 "0mcyr3v98nvfnvffy096qp3jqslas7l8hh0j00lpi0mp12cd0qk9")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.3 From 3bb145b6e2a8c84e7739ead9ae76dc4d42bb9850 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 15 Oct 2022 16:29:41 -0400 Subject: gnu: python-robotframework-pabot: Update to 2.7.0. * gnu/packages/python-xyz.scm (python-robotframework-pabot): Update to 2.7.0. --- 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 2bf78d6772a..f215f409150 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4937,7 +4937,7 @@ utility, a static analysis tool (linter) for Robot Framework source files.") (define-public python-robotframework-pabot (package (name "python-robotframework-pabot") - (version "2.5.2") + (version "2.7.0") (source (origin ;; There are no tests in the PyPI archive. @@ -4948,7 +4948,7 @@ utility, a static analysis tool (linter) for Robot Framework source files.") (file-name (git-file-name name version)) (sha256 (base32 - "14a8isq1f4lgfwjb84hhzg6jm7ns18dxa9bg6dy8k2ml8zl0qknk")))) + "0246vvyaxax0nzlrffvp9vg6mh5jmvbbm87azignf0gakjidr7nn")))) (build-system python-build-system) (arguments (list -- cgit v1.3 From fea40a0cebaceec6661a49c8acfbf338852b3af6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Oct 2022 02:00:00 +0200 Subject: gnu: bpython: Update to 0.23. * gnu/packages/python-xyz.scm (bpython): Update to 0.23. --- 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 f215f409150..32bd986a122 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22046,13 +22046,13 @@ Included are implementations of: (define-public bpython (package (name "bpython") - (version "0.21") + (version "0.23") (source (origin (method url-fetch) (uri (pypi-uri "bpython" version)) (sha256 - (base32 "11wlf12nm6ggn9512y4yqs26s8gdgpx0h9ls94k7fsjgjy4rpal8")))) + (base32 "0ah5giynavyh70yc0jqgmjaajv3xg5j2y7k9i3q8mi47r2mph04z")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.3 From 3451b4adb7ea8038fa3ba4dd436654695f9fc38c Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Fri, 21 Oct 2022 00:18:53 +0800 Subject: gnu: python-lief: Update to 0.12.2. * gnu/packages/python-xyz.scm (python-lief): Update to 0.12.2. Signed-off-by: Christopher Baines --- 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 32bd986a122..4223a767556 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -31113,7 +31113,7 @@ platform using the ActivityPub protocol.") (define-public python-lief (package (name "python-lief") - (version "0.12.1") + (version "0.12.2") (source (origin (method git-fetch) (uri (git-reference @@ -31122,7 +31122,7 @@ platform using the ActivityPub protocol.") (file-name (git-file-name name version)) (sha256 (base32 - "1xzbh3bxy4rw1yamnx68da1v5s56ay4g081cyamv67256g0qy2i1")))) + "1xb21jsws8lw93by8r25ibzgiml8n1cp7rpzybc648lk6idw0zg6")))) (build-system python-build-system) (native-inputs (list cmake)) (arguments -- cgit v1.3 From 2edd7cd00c8f7abd073acbe241a6583d4e3a3df9 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Fri, 21 Oct 2022 00:20:52 +0800 Subject: gnu: Add shrinkwrap. * gnu/packages/python-xyz.scm (shrinkwrap): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 48 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4223a767556..706de291c9d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -31142,6 +31142,54 @@ platform using the ActivityPub protocol.") and abstract ELF, PE and MachO formats.") (license license:asl2.0))) +(define-public shrinkwrap + (package + (name "shrinkwrap") + (version "0.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fzakaria/shrinkwrap") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet '(substitute* "pyproject.toml" + (("lief = \"0\\.12\\.0\"") "lief = \"*\""))) + (sha256 + (base32 + "1f3qrygj16y767q2c7pn9j6m95ggcmj9s5cx9v92ygygly4mr3jp")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-v" "tests")))) + ;; XXX: PEP 517 manual build copied from python-isort. + (replace 'build + (lambda _ + (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) + (replace 'install + (lambda _ + (let ((whl (car (find-files "dist" "\\.whl$")))) + (invoke "pip" "--no-cache-dir" "--no-input" + "install" "--no-deps" "--prefix" #$output whl))))))) + (native-inputs + (list python-click + python-poetry-core + python-pypa-build + python-pytest)) + (inputs (list python-lief python-sh)) + (home-page "https://github.com/fzakaria/shrinkwrap") + (synopsis "Emboss needed dependencies on the top level executable") + (description + "@code{shrinkwrap} is a tool which will discover all transitive dynamic +shared objects, and lift them up to the executable referenced by absolute +path.") + (license license:expat))) + (define-public python-pymonad (package (name "python-pymonad") -- cgit v1.3 From add66292debb3048a8b5b7cfbfb5039115b4c4f1 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Fri, 21 Oct 2022 13:14:21 +0000 Subject: gnu: python-yq: Update to 3.1.0. * gnu/packages/python-xyz.scm (python-yq): Update to 3.1.0. [inputs]: Add python-toml. [native-inputs]: Add python-setuptools-scm. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 706de291c9d..e58371eb60b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21580,14 +21580,14 @@ style guide, even if the original code didn't violate the style guide.") (define-public python-yq (package (name "python-yq") - (version "2.11.1") + (version "3.1.0") (source (origin (method url-fetch) (uri (pypi-uri "yq" version)) (sha256 (base32 - "1q4rky0a6n4izmq7slb91a54g8swry1xrbfqxwc8lkd3hhvlxxkl")))) + "1wklgs3d9si475nffw9agq5kgk8bdicbsmlj4sx4kiw64ji4ma1h")))) (build-system python-build-system) (arguments '(#:phases @@ -21602,9 +21602,9 @@ style guide, even if the original code didn't violate the style guide.") "/bin/jq"))) #t))))) (inputs - (list python-argcomplete python-pyyaml python-xmltodict jq)) + (list python-argcomplete python-pyyaml python-xmltodict python-toml jq)) (native-inputs - (list python-coverage python-flake8 python-wheel)) + (list python-coverage python-flake8 python-setuptools-scm python-wheel)) (home-page "https://github.com/kislyuk/yq") (synopsis "Command-line YAML/XML processor") (description -- cgit v1.3 From 2e7ac367346cfbd2f0c4c73d25db6905556bacb7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Oct 2022 02:00:01 +0200 Subject: gnu: ptpython: Update to 3.0.20. * gnu/packages/python-xyz.scm (ptpython): Update to 3.0.20. --- gnu/packages/python-xyz.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e58371eb60b..fe57e604330 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17724,13 +17724,13 @@ as well.") (define-public ptpython (package (name "ptpython") - (version "3.0.17") + (version "3.0.20") (source (origin (method url-fetch) (uri (pypi-uri "ptpython" version)) (sha256 (base32 - "1phk1grcvn456igjg8gwjjg8bf4kszddq5nd5sdlz3hslg62a7ci")))) + "1mjfyr5gwrs1qbizh6nki0nv6hahmg8mhhqxi1qc6pfa4znlrzga")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;there are no tests @@ -17741,9 +17741,9 @@ as well.") (synopsis "Python Read-Eval-Print-Loop with nice IDE-like features") (description "ptpython is a Python read-eval-print loop with IDE-like features. - It supports syntax highlighting, multiline editing, autocompletion, mouse, - color schemes, bracketed paste, Vi and Emacs keybindings, Chinese characters - etc.") +It supports syntax highlighting, multiline editing, autocompletion, mouse, +color schemes, bracketed paste, Vi and Emacs keybindings, Chinese characters +etc.") (license license:bsd-3))) (define-public python-easyprocess -- cgit v1.3 From 591966d2d6a0866cc12f4bd5727de515b1ae898f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Oct 2022 02:00:01 +0200 Subject: gnu: binwalk: Update to 2.3.3. * gnu/packages/python-xyz.scm (binwalk): Update to 2.3.3. [source]: Add snippet. --- gnu/packages/python-xyz.scm | 10 ++++++++-- 1 file changed, 8 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 fe57e604330..51136d8e6e4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18226,7 +18226,7 @@ without requiring an event loop, useful for creative responsive GUIs.") (define-public binwalk (package (name "binwalk") - (version "2.3.2") + (version "2.3.3") (source (origin (method git-fetch) @@ -18235,7 +18235,13 @@ without requiring an event loop, useful for creative responsive GUIs.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "01dalxw07c42ka4fqpixcacvy42h04ya909lzpmsblr9s2xdgwcm")))) + (base32 "0phqyqv34vhh80dgipiggs4n3iq2vfjk9ywx2c5d8g61vzgbd2g8")) + (modules '((guix build utils))) + (snippet + #~(begin + (for-each delete-file + (list "testing/tests/input-vectors/firmware.zip" + "testing/tests/test_firmware_zip.py")))))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.3 From 743e5adf4727c41f110b5bbae3a3558c65fd86be Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 25 Oct 2022 13:53:20 +0200 Subject: gnu: Add python-rtf-tokenize. * gnu/packages/python-xyz.scm (python-rtf-tokenize): New variable. --- gnu/packages/python-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 51136d8e6e4..08a33061a93 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12035,6 +12035,23 @@ independent alignment of columns (left or right justified or centred) and printing of sub-tables by specifying a row range.") (license license:bsd-3))) +(define-public python-rtf-tokenize + (package + (name "python-rtf-tokenize") + (version "1.0.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "rtf_tokenize" version)) + (sha256 + (base32 + "026njb9iwznycda83bln3gfivcnzdz6vy8y86xvbsy84s28g6gaw")))) + (build-system python-build-system) + (native-inputs (list python-pytest)) + (home-page "https://github.com/benoit-pierre/rtf_tokenize") + (synopsis "Simple RTF tokenizer") + (description "This package is a simple RTF tokenizer.") + (license license:gpl2+))) + (define-public python-curio (package (name "python-curio") -- cgit v1.3 From d748d4fd6cdeb3410a6b9dc325e4769bec25fe1a Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 13 Oct 2022 13:40:02 +0200 Subject: gnu: Add python-mdurl. * gnu/packages/python-xyz.scm (python-mdurl): New variable. --- gnu/packages/python-xyz.scm | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 08a33061a93..d352e879f4f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -66,7 +66,7 @@ ;;; Copyright © 2019, 2020, 2021 Giacomo Leidi ;;; Copyright © 2019 Wiktor Żelazny ;;; Copyright © 2019, 2020, 2021, 2022 Tanguy Le Carrour -;;; Copyright © 2019, 2021 Mădălin Ionel Patrașcu +;;; Copyright © 2019, 2021, 2022 Mădălin Ionel Patrașcu ;;; Copyright © 2020 Riku Viitanen ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 sirgazil @@ -675,6 +675,38 @@ It indexes documents and provides a search interface for retrieving documents that best match text queries.") (license license:expat))) +(define-public python-mdurl + (package + (name "python-mdurl") + (version "0.1.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "mdurl" version)) + (sha256 + (base32 + "1fn1hy35h9grggwqax90zcb52inlfxrxsm27vlqqz8zfyllkshdv")))) + (build-system python-build-system) + (arguments + (list + #:tests? #f ;pypi source does not contain tests + #:phases + #~(modify-phases %standard-phases + (replace 'build + (lambda _ (invoke "flit" "build"))) + (replace 'install + (lambda _ + (for-each + (lambda (wheel) + (invoke "python" "-m" "pip" "install" + wheel (string-append "--prefix=" #$output))) + (find-files "dist" "\\.whl$"))))))) + (native-inputs (list python-flit)) + (home-page "https://github.com/executablebooks/mdurl") + (synopsis "Markdown URL utilities") + (description + "This package implements a Python port of the JavaScript @code{mdurl}.") + (license license:expat))) + (define-public python-mrkd (package (name "python-mrkd") -- cgit v1.3 From 447400c85321f2d246c82b861e9f159fe2a84cef Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 13 Oct 2022 13:40:03 +0200 Subject: gnu: Add python-markdown-it-py. * gnu/packages/python-xyz.scm (python-markdown-it-py): New variable. --- gnu/packages/python-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d352e879f4f..d1787c36674 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4097,6 +4097,45 @@ modules. It creates a special virtual environment such that @command{pip} or work on your part.") (license license:expat))) +(define-public python-markdown-it-py + (package + (name "python-markdown-it-py") + (version "2.1.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "markdown-it-py" version)) + (sha256 + (base32 + "1nh75i72584r70alhqc479gys04s5m5g3vq601yf2njbs7z5jzng")))) + (build-system python-build-system) + (arguments + (list + #:tests? #f ;pypi source does not contains tests + #:phases + #~(modify-phases %standard-phases + (replace 'build + (lambda _ (invoke "flit" "build"))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (for-each + (lambda (wheel) + (invoke "python" "-m" "pip" "install" + wheel (string-append "--prefix=" #$output))) + (find-files "dist" "\\.whl$"))))))) + (native-inputs (list python-flit)) + (propagated-inputs + (list python-mdurl + python-typing-extensions)) + (home-page "https://github.com/executablebooks/markdown-it-py") + (synopsis "Python port of markdown-it") + (description + "This is a Python port of @code{markdown-it}, and some of its associated +plugins. The driving design philosophy of the port has been to change as +little of the fundamental code structure (file names, function name, etc) as +possible.") + (license license:expat))) + (define-public python-markupsafe (package (name "python-markupsafe") -- cgit v1.3 From c28598db5bf7590786b25a543d948ad95e6fc0dd Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 13 Oct 2022 13:40:04 +0200 Subject: gnu: Add python-mdit-py-plugins. * gnu/packages/python-xyz.scm (python-mdit-py-plugins): New variable. --- gnu/packages/python-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d1787c36674..8a03b94345d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -675,6 +675,44 @@ It indexes documents and provides a search interface for retrieving documents that best match text queries.") (license license:expat))) +(define-public python-mdit-py-plugins + (package + (name "python-mdit-py-plugins") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mdit-py-plugins" version)) + (sha256 + (base32 + "0l4pwsn2q30j160zjg79qa8v2brc4zl295rgrkpbfspcxr8lzhpc")))) + (build-system python-build-system) + (propagated-inputs (list python-markdown-it-py)) + (native-inputs + (list python-coverage + python-pytest + python-pytest-cov + python-pytest-regressions)) + (home-page "https://github.com/executablebooks/mdit-py-plugins") + (synopsis "Collection of plugins for markdown-it-py") + (description + "This package contains a collection of plugins for @code{markdown-it-py} +like: + +@enumerate +@item amsmath, +@item attrs, +@item container, +@item definition list, +@item dollarmath, +@item field list, +@item footnote, +@item textmath, and +@item wordcount. +@end enumerate +") + (license license:expat))) + (define-public python-mdurl (package (name "python-mdurl") -- cgit v1.3 From 8e6a9b23d07a3f0cf6f7498ed6d054da8a126a8d Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Thu, 13 Oct 2022 13:40:06 +0200 Subject: gnu: Add python-jupytext. * gnu/packages/python-xyz.scm (python-jupytext): New variable. --- gnu/packages/python-xyz.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8a03b94345d..cd03b78e932 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -319,6 +319,71 @@ asynchronous one follows design}.") (license license:asl2.0))) +(define-public python-jupytext + (package + (name "python-jupytext") + (version "1.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mwouts/jupytext") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0gqpvphrp2ja9ggadx0rrk0sqbpz6kqqg62qqmw4k17469lphc8c")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + ;; some tests fail when HOME=/homeless-shelter. + (setenv "HOME" "/tmp") + ;; OSError: [Errno 18] Invalid cross-device link + (setenv "TMPDIR" "/tmp") + (when tests? + (let ((disabled-tests + (list "test_create_header_with_set_formats" + "test_pre_commit_hook" + "test_sync_with_pre_commit_hook"))) + (invoke "pytest" "-vv" "-k" + (string-append "not " + (string-join disabled-tests + " and not ")))))))))) + (native-inputs + (list git-minimal + python-autopep8 + python-black + python-flake8 + python-gitpython + python-isort + python-ipython-genutils + python-jupyter-server + python-pre-commit + python-pytest + python-pyaml)) + (propagated-inputs + (list python-markdown-it-py + python-mdit-py-plugins + python-nbformat)) + (home-page "https://github.com/mwouts/jupytext") + (synopsis + "Jupyter notebooks as Markdown documents, Julia, Python or R scripts") + (description + "Jupytext is a plugin for Jupyter that can save Jupyter notebooks as +either Markdown files or scripts in many languages. Common use cases for +Jupytext are: + +@itemize +@item version control on Jupyter Notebooks +@item editing, merging or refactoring notebooks in your favorite text editor +@item applying Q&A checks on notebooks. +@end itemize +") + (license license:expat))) + (define-public python-logzero (package (name "python-logzero") -- cgit v1.3 From c485a9d8af210425a0435280fff8588563e49684 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 23 Apr 2022 11:07:58 +0200 Subject: gnu: python-setuptools: Move to python-build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-setuptools): Move… * gnu/packages/python-build.scm: …here. * gnu/packages/chemistry.scm, gnu/packages/messaging.scm, gnu/packages/sequoia.scm, tests/lint.scm: Adjust module imports accordingly. Co-authored-by: Marius Bakke --- gnu/packages/chemistry.scm | 1 + gnu/packages/messaging.scm | 1 + gnu/packages/python-build.scm | 39 +++++++++++++++++++++++++++++++++++++++ gnu/packages/python-xyz.scm | 40 ---------------------------------------- gnu/packages/sequoia.scm | 2 +- tests/lint.scm | 2 +- 6 files changed, 43 insertions(+), 42 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index d0582c4b6ff..6549da34532 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -56,6 +56,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages serialization) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index fa889d24a78..86d9914c90d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -116,6 +116,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 9d9b07f7691..7572bc5ce3f 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -41,6 +41,45 @@ ;;; ;;; Code: +(define-public python-setuptools + (package + (name "python-setuptools") + (version "64.0.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "setuptools" version)) + (sha256 + (base32 + "1sllqf0bhsl2yilf1w0xnlz0r4yaksmwaj0ap91zdc6kgbigdjiv")) + (modules '((guix build utils))) + (snippet + ;; TODO: setuptools now bundles the following libraries: + ;; packaging, pyparsing, six and appdirs. How to unbundle? + ;; Remove included binaries which are used to build self-extracting + ;; installers for Windows. + '(for-each delete-file (find-files "setuptools" + "^(cli|gui).*\\.exe$"))))) + (build-system python-build-system) + ;; FIXME: Tests require pytest, which itself relies on setuptools. + ;; One could bootstrap with an internal untested setuptools. + (arguments (list #:tests? #f)) + (home-page "https://pypi.org/project/setuptools/") + (synopsis "Library designed to facilitate packaging Python projects") + (description "Setuptools is a fully-featured, stable library designed to +facilitate packaging Python projects, where packaging includes: +@itemize +@item Python package and module definitions +@item distribution package metadata +@item test hooks +@item project installation +@item platform-specific details. +@end itemize") + (license (list license:psfl ;setuptools itself + license:expat ;six, appdirs, pyparsing + license:asl2.0 ;packaging is dual ASL2/BSD-2 + license:bsd-2)))) + (define-public python-wheel (package (name "python-wheel") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cd03b78e932..27dbbd831d6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2178,46 +2178,6 @@ Because only safe literals are encoded, it is safe to send serpent data to other machines, such as over the network.") (license license:expat))) -(define-public python-setuptools - (package - (name "python-setuptools") - (version "64.0.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "setuptools" version)) - (sha256 - (base32 - "1sllqf0bhsl2yilf1w0xnlz0r4yaksmwaj0ap91zdc6kgbigdjiv")) - (modules '((guix build utils))) - (snippet - ;; Remove included binaries which are used to build self-extracting - ;; installers for Windows. - ;; TODO: Find some way to build them ourself so we can include them. - '(for-each delete-file (find-files "setuptools" - "^(cli|gui).*\\.exe$"))))) - (build-system python-build-system) - ;; FIXME: Tests require pytest, which itself relies on setuptools. - ;; One could bootstrap with an internal untested setuptools. - (arguments (list #:tests? #f)) - (home-page "https://pypi.org/project/setuptools/") - (synopsis "Library designed to facilitate packaging Python projects") - (description "Setuptools is a fully-featured, stable library designed to -facilitate packaging Python projects, where packaging includes: -@itemize -@item Python package and module definitions -@item distribution package metadata -@item test hooks -@item project installation -@item platform-specific details. -@end itemize") - ;; TODO: setuptools now bundles the following libraries: - ;; packaging, pyparsing, six and appdirs. How to unbundle? - (license (list license:psfl ;setuptools itself - license:expat ;six, appdirs, pyparsing - license:asl2.0 ;packaging is dual ASL2/BSD-2 - license:bsd-2)))) - (define-public python-setuptools-declarative-requirements (package (name "python-setuptools-declarative-requirements") diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index a8d21ac1a40..7002f684b8b 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -36,7 +36,7 @@ #:use-module (gnu packages nettle) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz) ;; python-setuptools + #:use-module (gnu packages python-build) ;python-setuptools #:use-module (gnu packages rust) #:use-module (gnu packages tls)) diff --git a/tests/lint.scm b/tests/lint.scm index b848e32aee1..ce22e2355aa 100644 --- a/tests/lint.scm +++ b/tests/lint.scm @@ -50,7 +50,7 @@ #:use-module (gnu packages) #:use-module (gnu packages glib) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages python-xyz) + #:use-module (gnu packages python-build) #:use-module ((gnu packages bash) #:select (bash bash-minimal)) #:use-module (web uri) #:use-module (web server) -- cgit v1.3 From b4e2effb30bdcbab00dbe1af3e2b9d4ad446897e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Oct 2022 21:31:24 +0200 Subject: gnu: python-pip: Move to (gnu packages python-build). * gnu/packages/python-xyz.scm (python-pip): Move from here ... * gnu/packages/python-build.scm (python-pip): ... to here. --- gnu/packages/python-build.scm | 21 +++++++++++++++++++++ gnu/packages/python-xyz.scm | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 7572bc5ce3f..716108df2b0 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -41,6 +41,27 @@ ;;; ;;; Code: +(define-public python-pip + (package + (name "python-pip") + (version "22.2.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pip" version)) + (sha256 + (base32 + "0jwac0bhfp48w4fqibf1ysrs2grksdv92hwqm7bmdw2jn2fr5l9z")))) + (build-system python-build-system) + (arguments + '(#:tests? #f)) ; there are no tests in the pypi archive. + (home-page "https://pip.pypa.io/") + (synopsis "Package manager for Python software") + (description + "Pip is a package manager for Python software, that finds packages on the +Python Package Index (PyPI).") + (license license:expat))) + (define-public python-setuptools (package (name "python-setuptools") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 27dbbd831d6..75b99086d02 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12835,27 +12835,6 @@ fakes, or doubles. Basically, a stub is an object that returns pre-canned responses, rather than doing any computation.") (license license:bsd-3))) -(define-public python-pip - (package - (name "python-pip") - (version "22.2.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pip" version)) - (sha256 - (base32 - "0jwac0bhfp48w4fqibf1ysrs2grksdv92hwqm7bmdw2jn2fr5l9z")))) - (build-system python-build-system) - (arguments - '(#:tests? #f)) ; there are no tests in the pypi archive. - (home-page "https://pip.pypa.io/") - (synopsis "Package manager for Python software") - (description - "Pip is a package manager for Python software, that finds packages on the -Python Package Index (PyPI).") - (license license:expat))) - ;;; Variant used to break a dependency cycle with ;;; python-pytest-perf-bootstrap. (define-public python-pip-run-bootstrap -- cgit v1.3 From ee1f51011c9334dae369435d91f65322408806b9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Oct 2022 20:51:02 +0200 Subject: gnu: python-autopage: Use pyproject-build-system. * gnu/packages/python-xyz.scm (python-autopage)[build-system]: Switch to PYPROJECT-BUILD-SYSTEM. [arguments]: Remove redundant phases. --- gnu/packages/python-xyz.scm | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 75b99086d02..034781c2fde 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -259,6 +259,7 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (srfi srfi-1) @@ -7127,33 +7128,16 @@ run simple @code{argparse} parsers from function signatures.") (sha256 (base32 "169ixll1ncm2a2pcc86665ikjv2lrzs10p6c1w4yj55p3gk3xgh1")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list #:phases #~(modify-phases %standard-phases - ;; Do a manual PEP 517 style build/install procedure until the - ;; python-build-system overhaul is merged. - (replace 'build - (lambda _ - ;; ZIP does not support timestamps before 1980. - (let ((circa-1980 (* 10 366 24 60 60))) - (setenv "SOURCE_DATE_EPOCH" (number->string circa-1980)) - (invoke "python" "-m" "build" "--wheel" "--no-isolation" ".")))) (add-before 'check 'disable-e2e-tests (lambda _ ;; These tests rely on KeyboardInterrupts which do not ;; work in the build container. - (delete-file "autopage/tests/test_end_to_end.py"))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-vv")))) - (replace 'install - (lambda _ - (let ((whl (car (find-files "dist" "\\.whl$")))) - (invoke "pip" "--no-cache-dir" "--no-input" - "install" "--no-deps" "--prefix" #$output whl))))))) + (delete-file "autopage/tests/test_end_to_end.py")))))) (native-inputs (list python-pypa-build python-setuptools -- cgit v1.3 From b8efe89eb4f569d3140e3feb398eb2f78b8987b6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Oct 2022 21:42:15 +0200 Subject: gnu: python-tempora: Switch to pyproject-build-system. * gnu/packages/python-xyz.scm (python-tempora)[build-system]: Switch to PYPROJECT-BUILD-SYSTEM. [arguments]: Add #:test-flags. Remove #:phases. [native-inputs]: Remove PYTHON-PYPA-BUILD. --- gnu/packages/python-xyz.scm | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 034781c2fde..922eacdc515 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21390,30 +21390,13 @@ particularly convenient for use in tests.") (uri (pypi-uri "tempora" version)) (sha256 (base32 "09wirlk5vmxlhl9rnxp7g5qz2nsd6b0gnzk5fczbz0s8lsbz386b")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - (list - #:phases - #~(modify-phases %standard-phases - ;; XXX: PEP 517 manual build copied from python-isort. - (replace 'build - (lambda _ - (setenv "SOURCE_DATE_EPOCH" "315532800") - (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) - (replace 'install - (lambda _ - (let ((whl (car (find-files "dist" "\\.whl$")))) - (invoke "pip" "--no-cache-dir" "--no-input" - "install" "--no-deps" "--prefix" #$output whl)))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; Do not test the myproject.toml build as it tries to pull - ;; dependencies from the Internet. - (invoke "pytest" "-k" "not project"))))))) + ;; Do not test the myproject.toml build as it tries to pull + ;; dependencies from the Internet. + (list #:test-flags #~'("-vv" "-k" "not project"))) (native-inputs - (list python-pypa-build - python-freezegun + (list python-freezegun python-pytest python-pytest-black python-pytest-checkdocs -- cgit v1.3 From d2e88c383b84ef84efcab3a32af013c80a117ccd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Oct 2022 00:32:29 +0200 Subject: gnu: python-path: Use pyproject-build-system. * gnu/packages/python-xyz.scm (python-path-bootstrap)[build-system]: Switch to PYPROJECT-BUILD-SYSTEM. [arguments]: Remove #:phases. [native-inputs]: Remove PYTHON-PYPA-BUILD. (python-path): Remove #:phases. Add #:test-flags. --- gnu/packages/python-xyz.scm | 42 ++++++++++++------------------------------ 1 file changed, 12 insertions(+), 30 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 922eacdc515..7fa8974c74c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12733,25 +12733,10 @@ domains support.") (uri (pypi-uri "path" version)) (sha256 (base32 "0lig13gxnfv98v790db1smvsbd3mnj7y8rwyiwhfi6xiqibygwms")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - (list - #:tests? #f - #:phases - #~(modify-phases %standard-phases - ;; XXX: PEP 517 manual build/install procedures copied from - ;; python-isort. - (replace 'build - (lambda _ - ;; ZIP does not support timestamps before 1980. - (setenv "SOURCE_DATE_EPOCH" "315532800") - (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((whl (car (find-files "dist" "\\.whl$")))) - (invoke "pip" "--no-cache-dir" "--no-input" - "install" "--no-deps" "--prefix" #$output whl))))))) - (native-inputs (list python-pypa-build python-setuptools-scm)) + (list #:tests? #f)) + (native-inputs (list python-setuptools-scm)) (home-page "https://github.com/jaraco/path") (synopsis "Object-oriented file system path manipulation library") (description "@code{path} (formerly @code{path.py}) implements path @@ -12767,18 +12752,15 @@ invoked on those path objects directly.") (package-arguments python-path-bootstrap) ((#:tests? _ #f) (not (%current-target-system))) - ((#:phases phases #~%standard-phases) - #~(modify-phases #$phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; Do not test the myproject.toml build as it tries to pull - ;; dependencies from the Internet. - (invoke "pytest" "-vv" "-k" - (string-append - "not project " - ;; This tests assumes a root user exists. - "and not test_get_owner"))))))))) + ((#:test-flags flags #~'()) + #~(append (list "-vv" "-k" + (string-append + ;; Do not test the myproject.toml build as it tries + ;; to pull dependencies from the Internet. + "not project " + ;; This tests assumes a root user exists. + "and not test_get_owner")) + #$flags)))) (native-inputs (modify-inputs (package-native-inputs python-path-bootstrap) (append python-appdirs -- cgit v1.3 From 9ffbcb8a0661cfb5ce05047c196865c5b81a61b0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Oct 2022 00:37:06 +0200 Subject: gnu: python-cattrs: Use pyproject-build-system. * gnu/packages/python-xyz.scm (python-cattrs)[build-system]: Set to PYPROJECT-BUILD-SYSTEM. [arguments]: Remove obsolete phases. [native-inputs]: Remove PYTHON-PYPA-BUILD. --- gnu/packages/python-xyz.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7fa8974c74c..2a9ee389500 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17213,12 +17213,11 @@ strings require only one extra byte in addition to the strings themselves.") (sha256 (base32 "1n0h25gj6zd02kqyl040xpdvg4hpy1j92716sz0rg019xjqqijqb")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list #:phases #~(modify-phases %standard-phases - ;; XXX: PEP 517 manual build copied from python-isort. (add-after 'unpack 'adjust-for-older-attrs ;; Our older attrs package is using the 'attr' rather than 'attrs' ;; namespace. @@ -17227,14 +17226,6 @@ strings require only one extra byte in addition to the strings themselves.") (substitute* (find-files "." "\\.py$") (("from attrs\\b") "from attr")))) - (replace 'build - (lambda _ - (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) - (replace 'install - (lambda _ - (let ((whl (car (find-files "dist" "\\.whl$")))) - (invoke "pip" "--no-cache-dir" "--no-input" - "install" "--no-deps" "--prefix" #$output whl)))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -17252,7 +17243,6 @@ strings require only one extra byte in addition to the strings themselves.") python-msgpack python-poetry-core python-pymongo ;for the bson module - python-pypa-build python-pytest python-pytest-xdist)) (propagated-inputs -- cgit v1.3 From 7b83b3a77c5f1f74a460cdc712c186f4b2eb1d86 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Oct 2022 00:41:04 +0200 Subject: gnu: python-scikit-build: Switch to pyproject-build-system. * gnu/packages/python-xyz.scm (python-scikit-build)[build-system]: Set to PYPROJECT-BUILD-SYSTEM. [arguments]: Remove obsolete phases. [native-inputs]: Remove PYTHON-PYPA-BUILD and PYTHON-WHEEL. --- gnu/packages/python-xyz.scm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2a9ee389500..368f6a8a780 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28050,7 +28050,7 @@ and frame grabber interface.") (uri (pypi-uri "scikit-build" version)) (sha256 (base32 "1wx1m9vnxnnz59lyaisgyxldp313kciyd4af8lf112vb8vbjy9yk")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list #:phases @@ -28061,11 +28061,6 @@ and frame grabber interface.") (("^(CMAKE_DEFAULT_EXECUTABLE = ).*" _ head) (format #f "~a ~s~%" head (search-input-file inputs "bin/cmake")))))) - ;; XXX: PEP 517 manual build copied from python-isort. - (replace 'build - (lambda _ - (setenv "SOURCE_DATE_EPOCH" "315532800") - (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -28091,12 +28086,7 @@ and frame grabber interface.") ;; nondeterministically (see: ;; https://github.com/scikit-build/scikit-build/issues/711). "and not test_generator_cleanup " - "and not test_generator_selection "))))) - (replace 'install - (lambda _ - (let ((whl (car (find-files "dist" "\\.whl$")))) - (invoke "pip" "--no-cache-dir" "--no-input" - "install" "--no-deps" "--prefix" #$output whl))))))) + "and not test_generator_selection ")))))))) (native-inputs (list cmake-minimal gfortran @@ -28107,15 +28097,13 @@ and frame grabber interface.") python-mock python-packaging python-path - python-pypa-build python-pytest python-pytest-cov python-pytest-mock python-pytest-virtualenv python-pytest-xdist python-requests - python-setuptools-scm - python-wheel)) + python-setuptools-scm)) (propagated-inputs (list python-distro python-packaging python-wheel)) (home-page "https://github.com/scikit-build/scikit-build") -- cgit v1.3 From f928abac369f699f425ddee925d0d0c2dc0a635d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 21 Oct 2022 00:43:00 +0200 Subject: gnu: python-deepmerge: Use pyproject-build-system. * gnu/packages/python-xyz.scm (python-deepmerge)[build-system]: Set to PYPROJECT-BUILD-SYSTEM. [arguments]: Remove obsolete phases. [native-inputs]: Remove PYTHON-PYPA-BUILD and PYTHON-WHEEL. --- gnu/packages/python-xyz.scm | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 368f6a8a780..18089d090e6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -30450,34 +30450,17 @@ object, which can be useful if you want to force your objects into a table.") (uri (pypi-uri "deepmerge" version)) (sha256 (base32 "06hagzg8ccmjzqvszdxb52jgx5il8a1jdz41n4dpkyyjsfg7fi2b")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list #:phases #~(modify-phases %standard-phases (add-before 'build 'set-version (lambda _ - (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version) - ;; ZIP does not support timestamps before 1980. - (setenv "SOURCE_DATE_EPOCH" "315532800"))) - (replace 'build - (lambda _ - (invoke "python" "-m" "build" "--wheel" - "--no-isolation" "."))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest")))) - (replace 'install - (lambda _ - (let ((whl (car (find-files "dist" "\\.whl$")))) - (invoke "pip" "--no-cache-dir" "--no-input" - "install" "--no-deps" "--prefix" #$output whl))))))) + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)))))) (native-inputs - (list python-pypa-build - python-setuptools-scm - python-pytest - python-wheel)) + (list python-setuptools-scm + python-pytest)) (home-page "https://deepmerge.readthedocs.io/en/latest/") (synopsis "Merge nested data structures") (description -- cgit v1.3 From e944734ef9afa1ac9b46579934482b7d909ed24e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 27 Oct 2022 20:31:38 +0200 Subject: build-system/pyproject: Always run tests verbosely for supported backends. * guix/build-system/pyproject.scm (pyproject-build): Default to '() instead of #false for TEST-FLAGS. * guix/build/pyproject-build-system.scm (check): Unconditionally enable verbose test flags. * doc/guix.texi (Build Systems): Document this change. * gnu/packages/fontutils.scm (python-glyphslib)[arguments]: Remove verbosity from #:test-flags. * gnu/packages/pdf.scm (python-pydyf, weasyprint)[arguments]: Likewise. * gnu/packages/python-web.scm (python-openapi-spec-validator)[arguments]: Likewise. * gnu/packages/python-xyz.scm (python-path, python-tempora)[arguments]: Likewise. --- doc/guix.texi | 5 +++-- gnu/packages/fontutils.scm | 3 +-- gnu/packages/pdf.scm | 4 ++-- gnu/packages/python-web.scm | 2 +- gnu/packages/python-xyz.scm | 4 ++-- guix/build-system/pyproject.scm | 2 +- guix/build/pyproject-build-system.scm | 12 +++++++----- 7 files changed, 17 insertions(+), 15 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/doc/guix.texi b/doc/guix.texi index 3bfb89bc33a..80fb3bc47fa 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9332,8 +9332,9 @@ to guess the appropriate backend based on @file{pyproject.toml}. @code{#:test-backend} is added. It defaults to @code{#false} and will guess an appropriate test backend based on what is available in package inputs. @item -@code{#:test-flags} is added. The default is @code{#false}, and varies based -on the detected @code{#:test-backend}. +@code{#:test-flags} is added. The default is @code{'()}. These flags are +passed as arguments to the test command. Note that flags for verbose output +is always enabled on supported backends. @end itemize It is considered ``experimental'' in that the implementation details are diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index df3774e9775..368aad49d64 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -598,8 +598,7 @@ process. FontParts is the successor of RoboFab.") (build-system pyproject-build-system) (arguments (list - #:test-flags #~'("-vv" - ;; These fail because the test data has not yet been + #:test-flags #~'(;; These fail because the test data has not yet been ;; updated for newer FontTools: ;; https://github.com/googlefonts/glyphsLib/issues/787 ;; Re-enable for versions > 6.0.7. diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 95cc3b1e22e..070dc59ac0a 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -739,7 +739,7 @@ extracting content or merging files.") (build-system pyproject-build-system) (arguments (list - #:test-flags #~'("-vv" "-c" "/dev/null"))) + #:test-flags #~'("-c" "/dev/null"))) (propagated-inputs (list python-pillow)) (native-inputs (list ghostscript @@ -1500,7 +1500,7 @@ manipulating PDF documents from the command line. It supports (build-system pyproject-build-system) (arguments (list - #:test-flags #~(list "-vv" "-c" "/dev/null" + #:test-flags #~(list "-c" "/dev/null" "-n" (number->string (parallel-job-count))) #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index cbc515fc647..59d677ca35f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1648,7 +1648,7 @@ JSON Schema Specification Draft 2020-12. (list ;; The example tests attempt to fetch resources from the Internet ;; (see: https://github.com/p1c2u/openapi-spec-validator/issues/151). - #:test-flags #~'("-vv" "-k" "not Example and not Exampe") + #:test-flags #~'("-k" "not Example and not Exampe") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'remove-coverage-pytest-options diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 18089d090e6..1c2f9d7b73c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12753,7 +12753,7 @@ invoked on those path objects directly.") ((#:tests? _ #f) (not (%current-target-system))) ((#:test-flags flags #~'()) - #~(append (list "-vv" "-k" + #~(append (list "-k" (string-append ;; Do not test the myproject.toml build as it tries ;; to pull dependencies from the Internet. @@ -21366,7 +21366,7 @@ particularly convenient for use in tests.") (arguments ;; Do not test the myproject.toml build as it tries to pull ;; dependencies from the Internet. - (list #:test-flags #~'("-vv" "-k" "not project"))) + (list #:test-flags #~'("-k" "not project"))) (native-inputs (list python-freezegun python-pytest diff --git a/guix/build-system/pyproject.scm b/guix/build-system/pyproject.scm index 1e365d4f218..8f3b562ca3e 100644 --- a/guix/build-system/pyproject.scm +++ b/guix/build-system/pyproject.scm @@ -95,7 +95,7 @@ (configure-flags ''()) (build-backend #f) (test-backend #f) - (test-flags #f) + (test-flags ''()) (phases '%standard-phases) (outputs '("out" "wheel")) (search-paths '()) diff --git a/guix/build/pyproject-build-system.scm b/guix/build/pyproject-build-system.scm index b969dd03790..c69ccc9d64b 100644 --- a/guix/build/pyproject-build-system.scm +++ b/guix/build/pyproject-build-system.scm @@ -158,14 +158,16 @@ builder.build_wheel(sys.argv[2], config_settings=config_settings)" (format #t "Using ~a~%" use-test-backend) (match use-test-backend ('pytest - (apply invoke (cons pytest (or test-flags '("-vv"))))) + (apply invoke pytest "-vv" test-flags)) ('nose - (apply invoke (cons nosetests (or test-flags '("-v"))))) + (apply invoke nosetests "-v" test-flags)) ('nose2 - (apply invoke (cons nose2 (or test-flags '("-v" "--pretty-assert"))))) + (apply invoke nose2 "-v" "--pretty-assert" test-flags)) ('setup.py - (apply invoke (append '("python" "setup.py") - (or test-flags '("test" "-v"))))) + (apply invoke "python" "setup.py" + (if (null? test-flags) + '("test" "-v") + test-flags))) ;; The developer should explicitly disable tests in this case. (else (raise (condition (&test-system-not-found)))))) (format #t "test suite not run~%"))) -- cgit v1.3 From c6d94920090da1d4a5533bfa6c4f86baec1e078c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 1 Nov 2022 23:47:14 -0400 Subject: gnu: Add python-autoflake8. * gnu/packages/python-xyz.scm (python-autoflake8): New variable. --- 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 1c2f9d7b73c..42a12705628 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10855,6 +10855,32 @@ file (e.g. @file{PKG-INFO}).") cyclomatic complexity of Python source code.") (license license:expat))) +(define-public python-autoflake8 + (package + (name "python-autoflake8") + (version "0.4.0") + (source (origin + (method git-fetch) ;for tests + (uri (git-reference + (url "https://github.com/fsouza/autoflake8") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jx7bkslbhr24yvq60pl39faz2r6g93f1zm1gygswl0rzr5zmgnh")))) + (build-system pyproject-build-system) + (native-inputs + (list python-aiofiles + python-poetry-core + python-pytest + python-pytest-xdist)) + (propagated-inputs (list python-pyflakes)) + (home-page "https://github.com/fsouza/autoflake8") + (synopsis "Automatically fix issues reported by flake8") + (description "Tool to automatically fix some issues reported by +@command{flake8}.") + (license license:expat))) + (define-public python-flake8 (package (name "python-flake8") -- cgit v1.3 From faa03d1ace931714210b937cefdf8c629b638529 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 1 Nov 2022 16:55:41 -0700 Subject: gnu: Shorten package synopsis. * gnu/packages/crates-io.scm (rust-inflections-1): Shorten synopsis. (rust-clap-conf-0.1): Likewise. * gnu/packages/gtk.scm (volctl): Likewise. * gnu/packages/haskell-xyz.scm (ghc-unliftio): Likewise. * gnu/packages/kde-pim.scm (korganizer): Likewise. * gnu/packages/kde.scm (kuserfeedback): Likewise. * gnu/packages/pascal.scm (p2c): Likewise. * gnu/packages/python-xyz.scm (python-ttystatus): Likewise. * gnu/packages/qt.scm (qtwebplugin): Likewise. --- gnu/packages/crates-io.scm | 4 ++-- gnu/packages/gtk.scm | 2 +- gnu/packages/haskell-xyz.scm | 2 +- gnu/packages/kde-pim.scm | 2 +- gnu/packages/kde.scm | 2 +- gnu/packages/pascal.scm | 3 +-- gnu/packages/python-xyz.scm | 2 +- gnu/packages/qt.scm | 2 +- 8 files changed, 9 insertions(+), 10 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0c15b23b937..89d353cee44 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -68211,7 +68211,7 @@ Rust.") (build-system cargo-build-system) (home-page #f) (synopsis - "High performance inflection transformation library for changing properties of words like the case") + "Inflection transformation library for changing properties of words") (description "High performance inflection transformation library for changing properties of words like the case.") (license license:expat))) @@ -68382,7 +68382,7 @@ Rust.") (home-page "https://github.com/storyfeet/clap_conf") (synopsis - "Library to unify commandline arguments with config files and environment variables. And make it easier for users to tell your program how to behave across the three main input sources") + "Library to unify commandline arguments, config files and environment variables") (description "This package provides a library to unify commandline arguments with config files and environment variables. And make it easier for users to tell your program how to behave across the three main input sources") (license license:expat))) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 972064182de..56104b2124e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2926,7 +2926,7 @@ user interaction (e.g. measuring distances).") (propagated-inputs (list python-click python-pycairo python-pygobject python-pyyaml)) (home-page "https://buzz.github.io/volctl/") - (synopsis "Per-application volume control and on-screen display (OSD) for graphical desktops") + (synopsis "Per-application volume control and on-screen display for graphical desktops") (description "Volctl is a PulseAudio-enabled tray icon volume control and OSD applet for graphical desktops. It's not meant to be an replacement for a full-featured mixer application. If you're looking for that check out the diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index e00d8c5abec..2b926008068 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -13854,7 +13854,7 @@ for Unix time in Haskell.") (native-inputs (list ghc-hspec)) (home-page "https://github.com/fpco/unliftio") (synopsis "Provides MonadUnliftIO typecplass for unlifting monads to -IO (batteries included)") +IO") (description "This Haskell package provides the core @code{MonadUnliftIO} typeclass, a number of common instances, and a collection of common functions working with it.") diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index fc3e7069f10..73edce6c334 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1506,7 +1506,7 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).") (invoke "dbus-launch" "ctest"))))))) (home-page "https://apps.kde.org/korganizer/") (synopsis "Organizational assistant, providing calendars and other similar -functionality to help you organize your life") +functionality") (description "KOrganizer is the calendar and scheduling component of Kontact. It provides management of events and tasks, alarm notification, web export, network transparent handling of data, group scheduling, import and diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 420d2a657e8..12498c38d16 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -1256,7 +1256,7 @@ or Bonjour by other projects).") (arguments `(#:tests? #f)) ;; 4/17 fail (home-page "https://api.kde.org/frameworks/kuserfeedback/html/") - (synopsis "Framework for collecting feedback from application users via + (synopsis "Framework for collecting application feedback via telemetry and targeted surveys") (description "This framework consists of the following components: @itemize diff --git a/gnu/packages/pascal.scm b/gnu/packages/pascal.scm index af7857f0849..90d0ca5b5d7 100644 --- a/gnu/packages/pascal.scm +++ b/gnu/packages/pascal.scm @@ -267,8 +267,7 @@ many useful extensions to the Pascal programming language.") #t))))) (native-inputs (list perl which)) - (synopsis "p2c converts Pascal programs to C programs--which you can then -compile using gcc") + (synopsis "p2c converts Pascal programs to C programs") (description "This package provides @command{p2c}, a program to convert Pascal source code to C source code, and @command{p2cc}, a compiler for Pascal programs.") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 42a12705628..6a792ba73ad 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19667,7 +19667,7 @@ from the header, as well as section details and data available.") (add-before 'build 'check (lambda _ (invoke "make" "check")))))) (home-page "https://liw.fi/ttystatus/") - (synopsis "Python library for showing progress reporting and + (synopsis "Python library for progress reporting and status updates on terminals") (description "@code{ttystatus} is a Python library for showing progress reporting and status updates on terminals, for command line programs. diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 134215ebebb..193ec390c16 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1680,7 +1680,7 @@ application).") (native-inputs '()) (inputs (list mesa qtbase-5 qtdeclarative-5 qtwebsockets-5 zlib)) - (synopsis "QPA plugin for running an application via a browser using + (synopsis "QPA plugin for running applications via a browser using streamed WebGL commands") (description "Qt back end that uses WebGL for rendering. It allows Qt applications (with some limitations) to run in a web browser that supports -- cgit v1.3 From dde299df48cffb487b3378cbbd0fcbd03fcfd0e1 Mon Sep 17 00:00:00 2001 From: jgart Date: Sun, 30 Oct 2022 20:00:48 -0500 Subject: gnu: Add python-jsonalias. * gnu/packages/python-xyz.scm (python-jsonalias): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6a792ba73ad..00cc7fe01e6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2985,6 +2985,25 @@ after Andy Lester’s Perl module WWW::Mechanize.") audio playback capability for Python 3 on OSX, Windows, and Linux.") (license license:expat))) ; MIT license +(define-public python-jsonalias + (package + (name "python-jsonalias") + (version "0.1.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "jsonalias" version)) + (sha256 + (base32 + "0sd7c3vyvfhhpnan77ax4f0x1whjcb5iz7jhjky7kmcpaf9lvw34")))) + (build-system python-build-system) + (arguments (list #:tests? #f)) ; There are no tests. + (home-page "https://github.com/kevinheavey/jsonalias/") + (synopsis "JSON type alias for Python") + (description + "This package provides a microlibrary that defines a JSON type alias for +Python.") + (license license:expat))) + (define-public python-simplejson (package (name "python-simplejson") -- cgit v1.3 From 9560932ce04bfecdfefc5fdb8699fa1f64887286 Mon Sep 17 00:00:00 2001 From: jgart Date: Thu, 3 Nov 2022 12:30:44 -0500 Subject: gnu: Add python-eris. * gnu/packages/python-xyz.scm (python-eris): New variable. --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 00cc7fe01e6..19bbea7d42e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -31233,6 +31233,25 @@ platform using the ActivityPub protocol.") and abstract ELF, PE and MachO formats.") (license license:asl2.0))) +(define-public python-eris + (package + (name "python-eris") + (version "0.0.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "eris" version)) + (sha256 + (base32 + "16wbmahmfzdzrsjbn8jzi79vhghrzvvlcgnym20q0v3p3i4x47pq")))) + (build-system python-build-system) + (propagated-inputs (list python-pycryptodome)) + (home-page "https://codeberg.org/eris/python-eris") + (synopsis "Python implementation of ERIS") + (description +"Python implementation of the @acronym{ERIS, Encoding for Robust Immutable +Storage}.") + (license license:lgpl3+))) + (define-public shrinkwrap (package (name "shrinkwrap") -- cgit v1.3 From 5aa22d6ff98f101e1b64b9ac8dfbc9f452fc5f18 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 5 Nov 2022 08:07:58 +0100 Subject: gnu: python-dateparser: Update to 1.1.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-dateparser): Update to 1.1.3. [build-system]: Use pyproject-build-system. [native-inputs]: Add ‘python-flake8’. Remove ‘python-mock’. [arguments]<#:tests?>: Remove argument. <#:phases>: Add ‘delete-failing-tests’. --- gnu/packages/python-xyz.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 19bbea7d42e..75e1dcc0cb6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27127,31 +27127,37 @@ It adds a simple and readable way to print stuff during development.") (define-public python-dateparser (package (name "python-dateparser") - (version "0.7.6") + (version "1.1.3") (source (origin (method url-fetch) (uri (pypi-uri "dateparser" version)) (sha256 (base32 - "1ypbyqxlk7n6zibk90js3ybz37xmin3kk0i35g8c51bwqpcfyxg8")))) - (build-system python-build-system) + "19fbgq1zrwx10kljmdbs3p0y2m2xsgww20pqzw4kv6161zipsymf")))) + (build-system pyproject-build-system) (propagated-inputs (list python-dateutil python-pytz python-regex python-ruamel.yaml python-tzlocal)) (native-inputs - (list python-mock python-parameterized tzdata-for-tests)) + (list python-flake8 python-pytest python-parameterized tzdata-for-tests)) (arguments - `(;; TODO: Of 23320 tests, 6 fail and 53 error. - #:tests? #f - #:phases + `(#:phases (modify-phases %standard-phases (add-before 'check 'set-check-environment (lambda* (#:key inputs #:allow-other-keys) (setenv "TZ" "UTC") (setenv "TZDIR" (search-input-directory inputs - "share/zoneinfo"))))))) + "share/zoneinfo")))) + (add-before 'check 'delete-failing-tests + (lambda _ + (with-directory-excursion "tests" + (for-each delete-file + '("test_dateparser_data_integrity.py" + "test_hijri.py" + "test_jalali.py" + "test_language_detect.py")))))))) (home-page "https://github.com/scrapinghub/dateparser") (synopsis "Date parsing library designed to parse dates from HTML pages") -- cgit v1.3 From 02a53634806386cd6f0e0de3b2decb451c52225b Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 23 Oct 2022 05:51:00 +0200 Subject: gnu: python-frozendict: Update to 2.3.4. This fixes a potential memory leak with python 3.9: https://github.com/slezica/python-frozendict/issues/38 * gnu/packages/python-xyz.scm (python-frozendict): Update to 2.3.4. [home-page]: Set to new upstream repository. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 75e1dcc0cb6..cd713c565ec 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -79,7 +79,7 @@ ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Josh Holland ;;; Copyright © 2020 Yuval Kogman -;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020, 2022 Michael Rohleder ;;; Copyright © 2020, 2021, 2022 Vinicius Monego ;;; Copyright © 2020 Guy Fleury Iteriteka ;;; Copyright © 2020 Hendursaga @@ -26068,15 +26068,15 @@ library. Only the high-level API is bound.") (define-public python-frozendict (package (name "python-frozendict") - (version "1.2") + (version "2.3.4") (source (origin (method url-fetch) (uri (pypi-uri "frozendict" version)) (sha256 - (base32 "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp")))) + (base32 "0y3zn57i1q5192f7l4w2z2zsy3rrx50g563msaq954r58s1v3d0m")))) (build-system python-build-system) - (home-page "https://github.com/slezica/python-frozendict") + (home-page "https://github.com/Marco-Sulla/python-frozendict") (synopsis "Simple immutable mapping for Python") (description "@dfn{frozendict} is an immutable wrapper around dictionaries that -- cgit v1.3 From b3147b149c8c44f5b4fe20936438165fa449fe20 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 23 Oct 2022 05:51:01 +0200 Subject: gnu: python-canonicaljson: Update to 1.6.3. * gnu/packages/python-xyz.scm (python-canonicaljson): Update to 1.6.3. [arguments]: Add phases build, check and install to build with pep517. Add phase loosen-requirements to build with python-setuptools-scm >3. [native-inputs]: Add python-pypa-build, python-pytest, python-setuptools, python-setuptools-scm. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 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 cd713c565ec..b2e64677cff 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -26157,14 +26157,39 @@ information for your operating system.") (define-public python-canonicaljson (package (name "python-canonicaljson") - (version "1.4.0") + (version "1.6.3") (source (origin (method url-fetch) (uri (pypi-uri "canonicaljson" version)) (sha256 - (base32 "0c86g0vvzdcg3nrcsqnbzlfhpprc2i894p8i14hska56yl27d6w9")))) + (base32 "0j5lq191jkd483q6xzc16c9fahxf15lrv03mvah9ka3lq85pcnfa")))) (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'loosen-requirements + (lambda _ + ;; Permit newer versions of setuptools_scm + (substitute* "pyproject.toml" + ((">= 2.0.0, <3") ">= 2.0.0")))) + (replace 'build + (lambda _ + ;; ZIP does not support timestamps before 1980. + (setenv "SOURCE_DATE_EPOCH" "315532800") + (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest")))) + (replace 'install + (lambda _ + (let ((whl (car (find-files "dist" "\\.whl$")))) + (invoke "pip" "--no-cache-dir" "--no-input" + "install" "--no-deps" "--prefix" #$output whl))))))) + (native-inputs + (list python-pypa-build python-pytest python-setuptools python-setuptools-scm)) (propagated-inputs (list python-six python-frozendict python-simplejson)) (home-page "https://github.com/matrix-org/python-canonicaljson") -- cgit v1.3 From 6fe844fbc58420a63afc9f2b43a573467b9ce4fa Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Wed, 2 Nov 2022 14:12:40 +0800 Subject: gnu: i3-autotiling: Update to 1.8. * gnu/packages/python-xyz.scm (i3-autotiling): Update to 1.8. Signed-off-by: Christopher Baines --- 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 b2e64677cff..866ab5afdda 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -31088,7 +31088,7 @@ window managers.") (define-public i3-autotiling (package (name "i3-autotiling") - (version "1.6.1") + (version "1.8") (source (origin (method git-fetch) (uri (git-reference @@ -31097,7 +31097,7 @@ window managers.") (file-name (git-file-name name version)) (sha256 (base32 - "1m8k3g83n2n1xws89dh20f3sy6753wvip9dzf6bssv2cz9ll7406")))) + "1nsm0gd45ys4ghlzrvjrf0lvcyhvpx58lz8gg325a762wn5a4a72")))) (build-system python-build-system) (arguments (list #:tests? #f)) ;no tests (native-inputs (list python-wheel)) -- cgit v1.3 From 83bfdb409787cb2737e68b093a319b247b7858e6 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Wed, 2 Nov 2022 14:20:10 +0800 Subject: gnu: python-lief: Update to 0.12.3. * gnu/packages/python-xyz.scm (python-lief): Update to 0.12.3. Signed-off-by: Christopher Baines --- 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 866ab5afdda..684fe88740a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -31235,7 +31235,7 @@ platform using the ActivityPub protocol.") (define-public python-lief (package (name "python-lief") - (version "0.12.2") + (version "0.12.3") (source (origin (method git-fetch) (uri (git-reference @@ -31244,7 +31244,7 @@ platform using the ActivityPub protocol.") (file-name (git-file-name name version)) (sha256 (base32 - "1xb21jsws8lw93by8r25ibzgiml8n1cp7rpzybc648lk6idw0zg6")))) + "11i6hqmcjh56y554kqhl61698n9v66j2qk1c1g63mv2w07h2z661")))) (build-system python-build-system) (native-inputs (list cmake)) (arguments -- cgit v1.3 From f91713e71b6bc1222c8f5b218dede3dc7e670a3c Mon Sep 17 00:00:00 2001 From: jgart Date: Wed, 2 Nov 2022 02:03:46 -0500 Subject: gnu: python-funcparserlib: Enable tests. * gnu/packages/python-xyz.scm (python-funcparserlib): Enable tests. [origin]: Use GitHub since it includes the tests unlike PyPi. [build-system]: Use pyproject-build-system. [arguments]: Run tests. [native-inputs]: Add python-poetry-core. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 684fe88740a..5b619c5cfa3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25348,14 +25348,25 @@ scripts to load entry points more quickly.") (name "python-funcparserlib") (version "1.0.0") (source - (origin - (method url-fetch) - (uri (pypi-uri "funcparserlib" version)) - (sha256 - (base32 "0swbqf53x7lfnczvi566s1g3nkf5mfrxz7sbpyymricz57a3vlvx")))) - (build-system python-build-system) + (origin + ;; Source tarball on PyPi lacks tests. + (method git-fetch) + (uri (git-reference + (url "https://github.com/vlasovskikh/funcparserlib") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00pswdys5c4hpqpvfcy5zqv30gyjvjvagi12811jizw57hxrm1cs")))) + (build-system pyproject-build-system) (arguments - `(#:tests? #f)) ; no tests in PyPI and no setup.py in GitHub + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "unittest" "discover" "-v"))))))) + ;; ModuleNotFoundError: No module named 'poetry' + (native-inputs (list python-poetry-core)) (home-page "https://github.com/vlasovskikh/funcparserlib") (synopsis "Recursive descent parsing library based on functional combinators") -- cgit v1.3 From 84d239599a10f31e7d414d962ae25888ab21165c Mon Sep 17 00:00:00 2001 From: jgart Date: Thu, 3 Nov 2022 11:45:39 -0500 Subject: gnu: python-pudb: Update to 2022.1.3. * gnu/packages/python-xyz.scm (python-pudb): Update to 2022.1.3. Signed-off-by: Christopher Baines --- 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 5b619c5cfa3..635a82eaf51 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29543,13 +29543,13 @@ development, testing, production]}; (define-public python-pudb (package (name "python-pudb") - (version "2022.1.2") + (version "2022.1.3") (source (origin (method url-fetch) (uri (pypi-uri "pudb" version)) (sha256 (base32 - "03a7zalgdxfd2z2k6050ng087gwqgqis544n2083gdfxbf0ap0vb")))) + "0jk61qgacvwy6zkz1f55jawax4ggb1aawy6w3wnfkzqrkvd3ms2q")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.3 From a3eebc7731701c1453f2c33b723e9488354aed0b Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 6 Aug 2022 18:18:53 -0300 Subject: gnu: python-hy: Update to 0.24.0. * gnu/packages/python-xyz.scm (python-hy): Update to 0.24.0. [arguments]: Skip more tests and remove old tests in the custom 'check' phase. [native-inputs]: Add python-wheel. Replace python-pytest with python-pytest-7.1. [propagated-inputs]: Remove python-astor, python-rply. --- gnu/packages/python-xyz.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 635a82eaf51..37807cbcdb6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14658,7 +14658,7 @@ with a new public API, and RPython support.") (define-public python-hy (package (name "python-hy") - (version "0.20.0") + (version "0.24.0") (source (origin (method git-fetch) ; no tests in PyPI release @@ -14667,7 +14667,7 @@ with a new public API, and RPython support.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1g7djra9z7b0wyqyfrk2n4z3zamp2xkahv00jwdv35xmwwn09hq4")))) + (base32 "1s458ymd9g3s8k2ccc300jr4w66c7q3vhmhs9z3d3a4qg0xdhs9y")))) (build-system python-build-system) (arguments '(#:phases @@ -14677,13 +14677,14 @@ with a new public API, and RPython support.") (when tests? (invoke "python" "-m" "pytest" "-k" (string-append ; skip some failed tests - "not test_bin_hy_sys_executable" - " and not test_bin_hy_circular_macro_require" - " and not test_macro_from_module")))))))) + "not test_sys_executable" + " and not test_circular_macro_require" + " and not test_macro_require" + " and not test_requires_pollutes_core")))))))) (native-inputs - (list python-pytest)) + (list python-pytest-7.1 python-wheel)) (propagated-inputs - (list python-astor python-colorama python-funcparserlib python-rply)) + (list python-colorama python-funcparserlib)) (home-page "https://docs.hylang.org/en/stable/") (synopsis "Lisp frontend to Python") (description -- cgit v1.3 From db753d642083e3c59a3959c1c408c2d14e29dd27 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 4 Nov 2022 22:24:52 -0400 Subject: gnu: python-mdit-py-plugins: Update to 0.3.1. * gnu/packages/python-xyz.scm (python-mdit-py-plugins): Update to 0.3.1. [source]: Fetch from git. [build-system]: Use pyproject-build-system. [propagated-inputs]: Add python-attrs. [native-inputs]: Add python-flit-core. [description]: Remove extraneous white space. --- gnu/packages/python-xyz.scm | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 37807cbcdb6..3cffe0b74e3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -744,27 +744,30 @@ that best match text queries.") (define-public python-mdit-py-plugins (package (name "python-mdit-py-plugins") - (version "0.3.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "mdit-py-plugins" version)) - (sha256 - (base32 - "0l4pwsn2q30j160zjg79qa8v2brc4zl295rgrkpbfspcxr8lzhpc")))) - (build-system python-build-system) - (propagated-inputs (list python-markdown-it-py)) + (version "0.3.1") + (source (origin + (method git-fetch) ;for tests + (uri (git-reference + (url "https://github.com/executablebooks/mdit-py-plugins") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00ybbfb6dzn9q5qnvnm8bmhd84s215ik7pcdb4r35zhwiv2ikizz")))) + (build-system pyproject-build-system) + (propagated-inputs + (list python-markdown-it-py + python-attrs)) (native-inputs (list python-coverage + python-flit-core python-pytest python-pytest-cov python-pytest-regressions)) (home-page "https://github.com/executablebooks/mdit-py-plugins") (synopsis "Collection of plugins for markdown-it-py") - (description - "This package contains a collection of plugins for @code{markdown-it-py} -like: - + (description "This package contains a collection of plugins for +@code{markdown-it-py} like: @enumerate @item amsmath, @item attrs, @@ -775,8 +778,7 @@ like: @item footnote, @item textmath, and @item wordcount. -@end enumerate -") +@end enumerate") (license license:expat))) (define-public python-mdurl -- cgit v1.3 From b0d9ab3db0cd99ef3223852a0cc8d2035c23709a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 4 Nov 2022 22:26:12 -0400 Subject: gnu: Add python-uc-micro-py. * gnu/packages/python-xyz.scm (python-uc-micro-py): New variable. --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3cffe0b74e3..41d3bedde9e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4182,6 +4182,27 @@ modules. It creates a special virtual environment such that @command{pip} or work on your part.") (license license:expat))) +(define-public python-uc-micro-py + (package + (name "python-uc-micro-py") + (version "1.0.1") + (source (origin + (method git-fetch) ;for tests + (uri (git-reference + (url "https://github.com/tsutsu3/uc.micro-py") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17f55gi55rg47nm88fn3f8851ph03dgykdp011lxr3j6hk18lyfv")))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest)) + (home-page "https://github.com/tsutsu3/uc.micro-py") + (synopsis "Unicode data files for linkify-it-py projects") + (description "This package contains a micro subset of Unicode data files +for linkify-it-py projects.") + (license license:expat))) + (define-public python-markdown-it-py (package (name "python-markdown-it-py") -- cgit v1.3 From f583b14ce87c84e5a44f22c6895a31701e633011 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 4 Nov 2022 22:32:36 -0400 Subject: gnu: Add python-linkify-it-py. * gnu/packages/python-xyz.scm (python-linkify-it-py): New variable. --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 41d3bedde9e..657f1e41e9b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4203,6 +4203,34 @@ work on your part.") for linkify-it-py projects.") (license license:expat))) +(define-public python-linkify-it-py + (package + (name "python-linkify-it-py") + (version "2.0.0") + (source (origin + (method git-fetch) ;for tests + (uri (git-reference + (url "https://github.com/tsutsu3/linkify-it-py") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fg0a1lc8xbb62y9krxcp708ll58dxcwm8i7rrwpkd5sh2229f6x")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-uc-micro-py)) + (native-inputs (list python-pytest)) + (home-page "https://github.com/tsutsu3/linkify-it-py") + (synopsis "Links recognition library with full Unicode support") + (description "This is Python port of +@url{https://github.com/markdown-it/linkify-it, linkify-it}, which is a links +recognition library with full Unicode support. It has features like: +@itemize +@item Full unicode support, with @i{astral} characters +@item International domains support +@item Allows rules extension and custom normalizers. +@end itemize") + (license license:expat))) + (define-public python-markdown-it-py (package (name "python-markdown-it-py") -- cgit v1.3 From 9315fcc21120ddc1343454bd29d0538a1b1287b7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 4 Nov 2022 23:13:37 +0000 Subject: gnu: python-glymur: Update to 0.12.0. * gnu/packages/python-xyz.scm (python-glymur): Update to 0.12.0. [build-system]: python-build-system -> pyproject-build-system. [arguments]: Drop redundant phases. [native-inputs]: Remove python-pypa-build. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 657f1e41e9b..e26656fa328 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1155,7 +1155,7 @@ of a loop structure or other iterative computation.") (define-public python-glymur (package (name "python-glymur") - (version "0.10.1") + (version "0.12.0") (source (origin (method git-fetch) ; no tests data in PyPi package @@ -1164,8 +1164,8 @@ of a loop structure or other iterative computation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1cq9r8vzwvds1kasy5gc2rxw034jh9l43rraps1n739072pfz6qg")))) - (build-system python-build-system) + (base32 "03nny8k42yxdyw7sjv43szmg23x3rqplbaf7m0a0lpvwla1dl78i")))) + (build-system pyproject-build-system) (arguments (list #:phases @@ -1186,29 +1186,14 @@ of a loop structure or other iterative computation.") " elif libname == \"c\":\n" " path = \"" (search-input-file inputs "/lib/libc.so.6") "\"\n"))))) - ;; TODO: implement as a feature of python-build-system (PEP-621, - ;; PEP-631, PEP-660) - (replace 'build + (add-before 'check 'disable-failing-tests (lambda _ - (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version) - ;; ZIP does not support timestamps before 1980. - (setenv "SOURCE_DATE_EPOCH" "315532800") - (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((whl (car (find-files "dist" "\\.whl$")))) - (invoke "pip" "--no-cache-dir" "--no-input" - "install" "--no-deps" "--prefix" #$output whl)))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; Failing test due to inability of - ;; ctypes.util.find_library() to determine library path, - ;; which is patched above. - (delete-file "tests/test_config.py") - (invoke "python" "-m" "pytest" "-vv" "tests"))))))) + ;; Failing test due to inability of + ;; ctypes.util.find_library() to determine library path, + ;; which is patched above. + (delete-file "tests/test_config.py")))))) (native-inputs - (list python-pypa-build python-pytest)) + (list python-pytest)) (inputs (list openjpeg ; glymur/lib/openjp2.py libtiff)) ; glymur/lib/tiff.py -- cgit v1.3 From a2250d17936460e7159fa2d25a585e405b50f2cc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 14 Nov 2022 15:21:42 +0200 Subject: gnu: python-readability-lxml: Add source file-name. * gnu/packages/python-xyz.scm (python-readability-lxml)[source]: Add file-name field. --- gnu/packages/python-xyz.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e26656fa328..7e10682e690 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28350,6 +28350,7 @@ number of words, syllables, and sentences.") (uri (git-reference (url "https://github.com/buriy/python-readability") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "13nfy2v0pbbf62jn9qwgi489gg97hbb22q6w3f78mnvjxd2m19rh")) -- cgit v1.3 From c35b51f002297ffaf2b9021ecb4386956d1e1d2c Mon Sep 17 00:00:00 2001 From: Csepp Date: Sat, 12 Nov 2022 21:45:28 +0100 Subject: gnu: python-qtconsole: Use python-pyqt-without-webkit. * gnu/packages/python-xyz.scm (python-qtconsole)[propagated-inputs]: Use python-pyqt-without-qtwebkit. Signed-off-by: Efraim Flashner --- 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 7e10682e690..7624593647f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13965,8 +13965,8 @@ Jupyter kernels such as IJulia and IRKernel.") (("def test_other_output") "def _test_other_output"))))))) (propagated-inputs (list python-ipykernel python-ipython-genutils python-jupyter-client - python-jupyter-core python-pygments python-pyqt python-pyzmq - python-qtpy python-traitlets)) + python-jupyter-core python-pygments python-pyqt-without-qtwebkit + python-pyzmq python-qtpy python-traitlets)) (native-inputs (list python-flaky python-pytest python-pytest-qt)) (home-page "https://jupyter.org") -- cgit v1.3 From 153e7d895656ad9027083614f945f65cc165c93e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 9 Nov 2022 19:48:31 +0000 Subject: gnu: python-colorful: Enable tests. * gnu/packages/python-xyz.scm (python-colorful): Enable tests. [source]: Use git checkout which has tests. [build-system]: Use pyproject-build-system. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7624593647f..845cc4d4a5a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -677,16 +677,14 @@ git integration, command-line support, and a curses-based TUI.") (version "0.5.4") (source (origin - (method url-fetch) - (uri - (pypi-uri "colorful" version)) + (method git-fetch) ; no tests data in PyPi package + (uri (git-reference + (url "https://github.com/timofurrer/colorful") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1sh7g2cn1fyz2hzmzs933razdxi2bna9i1lxa790r9pdwba8m146")))) - (build-system python-build-system) - ;; FIXME: tests cannot be computed: - ;; "Can't perform this operation for unregistered loader type" - (arguments - `(#:tests? #f)) + (base32 "1fcz5v8b318a3dsdha4c874jsf3wmcw3f25bv2csixclyzacli98")))) + (build-system pyproject-build-system) (native-inputs (list python-coverage python-flake8 python-pytest)) (propagated-inputs -- cgit v1.3 From 3775e997baeda2791694df2333b1ab9a804da204 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 9 Nov 2022 19:59:51 +0000 Subject: gnu: python-mdurl: Enable tests. * gnu/packages/python-xyz.scm (python-mdurl): Enable tests. [source]: Use git checkout with tests. [build-system]: Use pyproject-build-system. [native-inputs]: Add python-pytest. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 845cc4d4a5a..1758450c2fd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -783,28 +783,17 @@ that best match text queries.") (package (name "python-mdurl") (version "0.1.2") - (source (origin - (method url-fetch) - (uri (pypi-uri "mdurl" version)) - (sha256 - (base32 - "1fn1hy35h9grggwqax90zcb52inlfxrxsm27vlqqz8zfyllkshdv")))) - (build-system python-build-system) - (arguments - (list - #:tests? #f ;pypi source does not contain tests - #:phases - #~(modify-phases %standard-phases - (replace 'build - (lambda _ (invoke "flit" "build"))) - (replace 'install - (lambda _ - (for-each - (lambda (wheel) - (invoke "python" "-m" "pip" "install" - wheel (string-append "--prefix=" #$output))) - (find-files "dist" "\\.whl$"))))))) - (native-inputs (list python-flit)) + (source + (origin + (method git-fetch) ; no tests data in PyPi package + (uri (git-reference + (url "https://github.com/executablebooks/mdurl") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0csc777q42jzv4zgdzxmwp8xqlb92ws1jvj09m2smh4klw67q5f3")))) + (build-system pyproject-build-system) + (native-inputs (list python-flit python-pytest)) (home-page "https://github.com/executablebooks/mdurl") (synopsis "Markdown URL utilities") (description -- cgit v1.3 From c8ae11e77557cd20b1c7fc780c20306083ad6405 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 17 Nov 2022 12:38:41 +0200 Subject: gnu: python-mistune-next: Update to 2.0.4. * gnu/packages/python-xyz.scm (python-mistune-next): Update to 2.0.4. [arguments]: Add custom 'check phase. [native-inputs]: Remove python-nose, add python-pytest. --- gnu/packages/python-xyz.scm | 14 +++++++++++--- 1 file changed, 11 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 1758450c2fd..7f0dc8fba0a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11284,14 +11284,22 @@ Python.") (package (inherit python-mistune) (name "python-mistune-next") - (version "2.0.0rc1") + (version "2.0.4") (source (origin (method url-fetch) (uri (pypi-uri "mistune" version)) (sha256 (base32 - "1nd7iav1ixh9hlj4hxn6lmpava88d86ys8rqm30wgvr7gjlxnas5")))) - (native-inputs (list python-nose)))) + "024q9l6mgd37wa25w7dhskv1m3zsj5lf0w9cfyx7l9p2adhadq4y")))) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) + (native-inputs (list python-pytest)))) (define-public python-markdown (package -- cgit v1.3 From bb4d32b655ff216b734adabd8bc6783e01967aae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 17 Nov 2022 19:05:27 +0100 Subject: gnu: Adjust users of deprecated packages. * gnu/packages/databases.scm (apache-arrow-0.16)[inputs]: Change from GOOGLE-BROTLI to BROTLI. * gnu/packages/image.scm (libjxl)[propagated-inputs]: Likewise. * gnu/packages/python-xyz.scm (python-logbook)[native-inputs]: Change from PYTHON-GOOGLE-BROTLI to PYTHON-BROTLI. --- gnu/packages/databases.scm | 2 +- gnu/packages/image.scm | 2 +- gnu/packages/python-xyz.scm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index a511a9ae179..c6f4dd7fba1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -4390,7 +4390,7 @@ algorithm implementations.") "-DARROW_BUILD_STATIC=OFF"))) (inputs `(("boost" ,boost) - ("brotli" ,google-brotli) + ("brotli" ,brotli) ("double-conversion" ,double-conversion) ("snappy" ,snappy) ("gflags" ,gflags) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index bbe03c64da9..9e53b7483ea 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2278,7 +2278,7 @@ Format) file format decoder and encoder.") openexr)) ;; These are in Requires.private of libjxl.pc. (propagated-inputs - (list google-brotli google-highway)) + (list brotli google-highway)) (home-page "https://github.com/libjxl/libjxl") (synopsis "JPEG XL image format reference implementation") (description "This package contains a reference implementation of JPEG XL diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7f0dc8fba0a..e3d1ac05fa7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -439,7 +439,7 @@ easy logging and rotating to a console or a file.") (invoke "pytest" "--cov=logbook" "-r" "s" "tests"))))))) (native-inputs (list python-cython python-mock python-pytest python-pytest-cov - python-google-brotli)) + python-brotli)) (home-page "https://github.com/getlogbook/logbook") (synopsis "Logbook is a logging replacement for Python") (description -- cgit v1.3 From 856b67f3021d1c764ef30b5a166edfb4244d9cad Mon Sep 17 00:00:00 2001 From: Matthew James Kraai Date: Thu, 20 Oct 2022 20:16:00 -0700 Subject: gnu: s3cmd: Fix program name in output. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (s3cmd)[arguments]: Add a new 'hide-wrapping phase. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e3d1ac05fa7..c5ab9280eb2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16395,6 +16395,15 @@ the same purpose: to provide Python bindings for libmagic.") (sha256 (base32 "0rdgwwmmp8mdxc84bxq6k9a7v7z2qgc3df47djzs2b84gw81dglx")))) (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'hide-wrapping + (lambda _ + (substitute* "S3/MultiPart.py" + (("sys\\.argv\\[0\\]") "\"s3cmd\"")) + (substitute* "s3cmd" + (("optparser\\.get_prog_name\\(\\)") "\"s3cmd\""))))))) (inputs (list python-dateutil python-magic)) -- cgit v1.3 From a4ea82b671c7841cdf1e3417723e27fdac26f598 Mon Sep 17 00:00:00 2001 From: Ontje Lünsdorf Date: Fri, 11 Nov 2022 21:09:21 +0100 Subject: gnu: python-check-manifest: Relax git security settings in tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-check-manifest)[arguments]: Allow git submodule commands via file protocol during testing. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c5ab9280eb2..975b6983741 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25584,6 +25584,17 @@ also be usable with other GSSAPI mechanisms.") (build-system python-build-system) (native-inputs (list python-mock git)) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Tests use git submodule commands over the file transport, which + ;; has been disabled in git, see CVE-2022-39253. Enable these + ;; commands to allow checks to succeed. + (add-before 'check 'allow-git-submodule-add + (lambda _ + (setenv "HOME" "/tmp") + (invoke "git" "config" "--global" + "protocol.file.allow" "always")))))) (home-page "https://github.com/mgedmin/check-manifest") (synopsis "Check MANIFEST.in in a Python source package for completeness") (description "Python package can include a MANIFEST.in file to help with -- cgit v1.3 From 67da1426226f591cf4bec95aabf2e8b607e73d10 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Nov 2022 09:13:16 +0100 Subject: gnu: Remove obsolete variable. * gnu/packages/python-xyz.scm (python-packaging-next): Remove variable. * gnu/packages/openstack.scm (python-oslo.utils)[propagated-inputs]: Change from PYTHON-PACKAGING-NEXT to PYTHON-PACKAGING. --- gnu/packages/openstack.scm | 2 +- gnu/packages/python-xyz.scm | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index dd13404c877..169df27f7c7 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -769,7 +769,7 @@ for debugging, and better support for mocking results.") python-netaddr python-netifaces python-pbr - python-packaging-next + python-packaging python-pyparsing python-pytz)) (native-inputs diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 975b6983741..f91662713c0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20252,19 +20252,6 @@ while only declaring the test-specific fields.") ;; licenses. (license (list license:asl2.0 license:bsd-2)))) -;; TODO(staging): merge with python-packaging-bootstrap. -(define-public python-packaging-next - (package - (inherit python-packaging) - (version "21.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "packaging" version)) - (sha256 - (base32 - "1sygirdrqgv4f1ckh9nhpcw1yfidrh3qjl86wq8vk6nq4wlw8iyx")))))) - (define-public python-relatorio (package (name "python-relatorio") -- cgit v1.3 From 273988e94c6f87f554e552c11b09cab65897e081 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 19 Nov 2022 08:26:32 +0100 Subject: gnu: python-check-manifest: Use the 'fixed' git for tests. * gnu/packages/python-xyz.scm (python-check-manifest)[native-inputs]: Change from GIT to GIT-MINIMAL/FIXED. --- 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 f91662713c0..0daeb3c0fa5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25569,8 +25569,6 @@ also be usable with other GSSAPI mechanisms.") (base32 "0lk45ifdv2cpkl6ayfyix7jwmnxa1rha7xvb0ih5999k115wzqs4")))) (build-system python-build-system) - (native-inputs - (list python-mock git)) (arguments `(#:phases (modify-phases %standard-phases @@ -25582,6 +25580,8 @@ also be usable with other GSSAPI mechanisms.") (setenv "HOME" "/tmp") (invoke "git" "config" "--global" "protocol.file.allow" "always")))))) + (native-inputs + (list python-mock git-minimal/fixed)) (home-page "https://github.com/mgedmin/check-manifest") (synopsis "Check MANIFEST.in in a Python source package for completeness") (description "Python package can include a MANIFEST.in file to help with -- cgit v1.3 From a048eeef57e875759b0a8f707ab76356a701b9b8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 19 Nov 2022 08:46:03 +0100 Subject: gnu: python-check-manifest: Update to 0.48.0. * gnu/packages/python-xyz.scm (python-check-manifest): Update to 0.48.0. [build-system]: Change to PYPROJECT-BUILD-SYSTEM. [arguments]: Add #:test-flags. [native-inputs]: Remove PYTHON-MOCK. Add PYTHON-PYTEST. [propagated-inputs]: Add PYTHON-PYPA-BUILD, PYTHON-SETUPTOOLS, and PYTHON-TOMLI. --- gnu/packages/python-xyz.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0daeb3c0fa5..93e17c3f1ac 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25560,17 +25560,20 @@ also be usable with other GSSAPI mechanisms.") (define-public python-check-manifest (package (name "python-check-manifest") - (version "0.37") + (version "0.48") (source (origin (method url-fetch) (uri (pypi-uri "check-manifest" version)) (sha256 (base32 - "0lk45ifdv2cpkl6ayfyix7jwmnxa1rha7xvb0ih5999k115wzqs4")))) - (build-system python-build-system) + "0my6ammldi8mddrbq798qxbl90qr8nlk7gzliq3v7gp7mlfmymrv")))) + (build-system pyproject-build-system) (arguments - `(#:phases + '(;; This test requires setting up a venv which does not work + ;; properly in the build environment. + #:test-flags '("-k" "not test_build_sdist_pep517_isolated") + #:phases (modify-phases %standard-phases ;; Tests use git submodule commands over the file transport, which ;; has been disabled in git, see CVE-2022-39253. Enable these @@ -25581,7 +25584,9 @@ also be usable with other GSSAPI mechanisms.") (invoke "git" "config" "--global" "protocol.file.allow" "always")))))) (native-inputs - (list python-mock git-minimal/fixed)) + (list git-minimal/fixed python-pytest)) + (propagated-inputs + (list python-pypa-build python-setuptools python-tomli)) (home-page "https://github.com/mgedmin/check-manifest") (synopsis "Check MANIFEST.in in a Python source package for completeness") (description "Python package can include a MANIFEST.in file to help with -- cgit v1.3 From bd0ff2d39bc7d3b497d74c3431ef77a1cf2515c4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 19 Nov 2022 18:06:36 +0100 Subject: gnu: Remove coin3D@3. * gnu/packages/graphics.scm (coin3D): Take the body from ... (coin3D-4): ... this now-deprecated variable. * gnu/packages/engineering.scm (freecad)[inputs]: Change from COIN3D-4 to COIN3D. * gnu/packages/python-xyz.scm (python-pivy)[inputs]: Likewise. * gnu/packages/qt.scm (soqt)[inputs]: Likewise. --- gnu/packages/engineering.scm | 2 +- gnu/packages/graphics.scm | 118 ++++++++++++++----------------------------- gnu/packages/python-xyz.scm | 2 +- gnu/packages/qt.scm | 2 +- 4 files changed, 40 insertions(+), 84 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 6388c641017..21569b07c9f 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2463,7 +2463,7 @@ comments."))) swig)) (inputs (list boost - coin3D-4 + coin3D double-conversion eigen fontconfig diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 54637fa55a6..60c6a979c59 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -134,6 +134,7 @@ #:use-module (guix hg-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix deprecation) #:use-module (guix utils)) (define-public mmm @@ -1799,102 +1800,57 @@ or by subtracting one shape from the other.") (license license:gpl2)))) (define-public coin3D - ;; The ‘4.0.0’ zip archive isn't stable, nor in fact a release. See: - ;; https://bitbucket.org/Coin3D/coin/issues/179/coin-400-srczip-has-been-modified - (let ((revision 1) - (changeset "ab8d0e47a4de3230a8137feb39c142d6ba45f97d")) - (package - (name "coin3D") - (version - (simple-format #f "3.1.3-~A-~A" revision (string-take changeset 7))) - (source - (origin - (method hg-fetch) - (uri (hg-reference - (url "https://bitbucket.org/Coin3D/coin") - (changeset changeset))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1ff44jz6lg4rylljvy69n1hcjh9y6achbv9jpn1cv2sf8cxn3r2j")) - (modules '((guix build utils))) - (snippet - '(begin - (for-each delete-file - '("cfg/csubst.exe" - "cfg/wrapmsvc.exe")) - #t)))) - (build-system cmake-build-system) - (native-inputs - (list doxygen graphviz)) - (inputs - (list boost freeglut glew)) - (arguments - `(#:configure-flags - (list - "-DCOIN_BUILD_DOCUMENTATION_MAN=ON" - (string-append "-DBOOST_ROOT=" - (assoc-ref %build-inputs "boost"))))) - (home-page "https://bitbucket.org/Coin3D/coin/wiki/Home") - (synopsis - "High-level 3D visualization library with Open Inventor 2.1 API") - (description - "Coin is a 3D graphics library with an Application Programming Interface -based on the Open Inventor 2.1 API. For those who are not familiar with -Open Inventor, it is a scene-graph based retain-mode rendering and model -interaction library, written in C++, which has become the de facto -standard graphics library for 3D visualization and visual simulation -software in the scientific and engineering community.") - (license license:bsd-3)))) - -(define-public coin3D-4 - (package + (package (name "coin3D") (version "4.0.0") (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/coin3d/coin") - (commit (string-append "Coin-" version)) - (recursive? #t))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1ayg0hl8wanhadahm5xbghghxw1qjwqbrs3dl3ngnff027hsyf8p")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Delete binaries - (for-each delete-file - '("cfg/csubst.exe" - "cfg/wrapmsvc.exe")) - ;; Delete references to packaging tool cpack. Otherwise the build - ;; fails with "add_subdirectory given source "cpack.d" which is not - ;; an existing directory." - (substitute* "CMakeLists.txt" - ((".*cpack.d.*") "")) - #t)))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/coin3d/coin") + (commit (string-append "Coin-" version)) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ayg0hl8wanhadahm5xbghghxw1qjwqbrs3dl3ngnff027hsyf8p")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete binaries + (for-each delete-file + '("cfg/csubst.exe" + "cfg/wrapmsvc.exe")) + ;; Delete references to packaging tool cpack. Otherwise the build + ;; fails with "add_subdirectory given source "cpack.d" which is not + ;; an existing directory." + (substitute* "CMakeLists.txt" + ((".*cpack.d.*") "")) + #t)))) (build-system cmake-build-system) (native-inputs - (list doxygen graphviz)) + (list doxygen graphviz)) (inputs - (list boost freeglut glew)) + (list boost freeglut glew)) (arguments - `(#:configure-flags - (list - "-DCOIN_BUILD_DOCUMENTATION_MAN=ON" - (string-append "-DBOOST_ROOT=" - (assoc-ref %build-inputs "boost"))))) + `(#:configure-flags + (list + "-DCOIN_BUILD_DOCUMENTATION_MAN=ON" + (string-append "-DBOOST_ROOT=" + (assoc-ref %build-inputs "boost"))))) (home-page "https://github.com/coin3d/coin") (synopsis - "High-level 3D visualization library with Open Inventor 2.1 API") + "High-level 3D visualization library with Open Inventor 2.1 API") (description - "Coin is a 3D graphics library with an Application Programming Interface + "Coin is a 3D graphics library with an Application Programming Interface based on the Open Inventor 2.1 API. For those who are not familiar with Open Inventor, it is a scene-graph based retain-mode rendering and model interaction library, written in C++, which has become the de facto standard graphics library for 3D visualization and visual simulation software in the scientific and engineering community.") - (license license:bsd-3))) + (license license:bsd-3))) + +(define-deprecated coin3D-4 coin3D) +(export coin3D-4) (define-public skia ;; Releases follow those of Chromium, about every 6 weeks. The release diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 93e17c3f1ac..b0bf16e3dab 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28118,7 +28118,7 @@ used to retry a function a given number of times.") libice soqt glew - coin3D-4)) + coin3D)) (home-page "https://github.com/coin3d/pivy") (synopsis "Python bindings to Coin3D") (description diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8ad9dd4cc0d..5ed8ec2c8ec 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -4234,7 +4234,7 @@ data.") (native-inputs (list pkg-config cmake)) (inputs - (list qtbase-5 coin3D-4)) + (list qtbase-5 coin3D)) (home-page "https://github.com/coin3d/soqt") (synopsis "Qt GUI component toolkit library for Coin") (description "SoQt is a Qt GUI component toolkit library for Coin. It is -- cgit v1.3 From b8fd2877c9b9512751327e44620a5945736d2dfd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 20 Nov 2022 12:12:50 +0100 Subject: gnu: python-pbkdf2: Don't use python-pycrypto. * gnu/packages/python-xyz.scm (python-pbkdf2)[propagated-inputs]: Remove. --- gnu/packages/python-xyz.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b0bf16e3dab..509d57964fa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19274,8 +19274,6 @@ from the header, as well as section details and data available.") (replace 'check (lambda _ (invoke "python" "test/test_pbkdf2.py")))))) - (propagated-inputs - (list python-pycrypto)) ; optional (home-page "https://www.dlitz.net/software/python-pbkdf2/") (synopsis "Password-based key derivation") (description "This module implements the password-based key derivation -- cgit v1.3 From de3829816d7a49dfa06b6fb080446f1d0be6f657 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 27 Sep 2022 00:17:21 +0200 Subject: gnu: Add python-doxyqml. * gnu/packages/python-xyz.scm (python-doxyqml): New variable. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 509d57964fa..5f736f05aca 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -104,7 +104,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 Hugo Lecomte ;;; Copyright © 2021 Franck Pérignon -;;; Copyright © 2021 Petr Hodina +;;; Copyright © 2021, 2022 Petr Hodina ;;; Copyright © 2021 Simon Streit ;;; Copyright © 2021 Daniel Meißner ;;; Copyright © 2021, 2022 Pradana Aumars @@ -3075,6 +3075,23 @@ applications. dogtail scripts are written in Python and executed like any other Python program.") (license license:gpl2+))) +(define-public python-doxyqml + (package + (name "python-doxyqml") + (version "0.5.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "doxyqml" version)) + (sha256 + (base32 + "1f0jjqvamly4hn7f1palvq27z6yr694rfzyxrb6g0ysbbawxkvq9")))) + (build-system python-build-system) + (home-page "http://agateau.com/projects/doxyqml") + (synopsis "Doxygen input filter for QML files") + (description + "This package provides a Doxygen input filter for QML files.") + (license license:bsd-3))) + (define-public python-empy (package (name "python-empy") -- cgit v1.3 From 2c65a197fc22edf83cc095e5fd766e3234fdba0c Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Tue, 27 Sep 2022 00:19:17 +0200 Subject: gnu: Add python-doxypypy. * gnu/packages/python-xyz.scm (python-doxypypy): New variable. Signed-off-by: Marius Bakke --- gnu/packages/python-xyz.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5f736f05aca..eaad292a7f8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3092,6 +3092,24 @@ other Python program.") "This package provides a Doxygen input filter for QML files.") (license license:bsd-3))) +(define-public python-doxypypy + (package + (name "python-doxypypy") + (version "0.8.8.6") + (source (origin + (method url-fetch) + (uri (pypi-uri "doxypypy" version)) + (sha256 + (base32 + "06z0vbh975g42z5szbfvn9i3bif3xwr5pncqd4fvjzjkbi2p2xb2")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ;no test suite + (home-page "https://github.com/Feneric/doxypypy") + (synopsis "Doxygen filter for Python") + (description + "This package provides a Doxygen filter for Python.") + (license license:gpl2+))) + (define-public python-empy (package (name "python-empy") -- cgit v1.3 From b122a40df41b238e8950efaa4e733425c6ca1576 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 22 Nov 2022 07:44:20 +0100 Subject: gnu: python-socksipychain: Add missing input. * gnu/packages/python-xyz.scm (python-socksipychain)[propagated-inputs]: Add PYTHON-SIX. --- gnu/packages/python-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index eaad292a7f8..2bbb7697b35 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7066,6 +7066,8 @@ as the original project seems to have been abandoned circa 2007.") (build-system python-build-system) (arguments `(#:tests? #f)) ; Tests try to access the network. + (propagated-inputs + (list python-six)) (home-page "http://pagekite.net/wiki/Floss/PySocksipyChain/") (synopsis "Python SOCKS module with chained proxies support") (description -- cgit v1.3 From ff8ac616e729ff79202f1439a49389ab0ec0bbbc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 22 Nov 2022 07:50:36 +0100 Subject: gnu: python-bigfloat: Update to 0.4.0. * gnu/packages/python-xyz.scm (python-bigfloat): Update to 0.4.0. [propagated-inputs]: Add PYTHON-SIX. --- gnu/packages/python-xyz.scm | 6 ++++-- 1 file changed, 4 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 2bbb7697b35..718a0eb79c1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10291,16 +10291,18 @@ more advanced mathematics.") (define-public python-bigfloat (package (name "python-bigfloat") - (version "0.3.0") + (version "0.4.0") (source (origin (method url-fetch) (uri (pypi-uri "bigfloat" version)) (sha256 - (base32 "0xd7q4l7v0f463diznjv4k9wlaks80pn9drdqmfifi7zx8qvybi6")))) + (base32 "1f0c1hdr39bbl5rds5r1waa1papjmjiyp0ixs64mkjiahzg6pfaq")))) (build-system python-build-system) (inputs (list mpfr)) + (propagated-inputs + (list python-six)) (home-page "https://github.com/mdickinson/bigfloat") (synopsis "Arbitrary precision floating-point arithmetic for Python") (description -- cgit v1.3 From 38f80083599caf8c821b56b20e861c62af2eb5d6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 22 Nov 2022 07:52:11 +0100 Subject: gnu: python-rnc2rng: Update to 2.6.6. * gnu/packages/python-xyz.scm (python-rnc2rng): Update to 2.6.6. --- 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 718a0eb79c1..1a50100f5ea 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27410,14 +27410,14 @@ and pandoc-citeproc.") (define-public python-rnc2rng (package (name "python-rnc2rng") - (version "2.6.4") + (version "2.6.6") (source (origin (method url-fetch) (uri (pypi-uri "rnc2rng" version)) (sha256 (base32 - "1kmp3iwxxyzjsd47j2sprd47ihhkwhb3yydih3af5bbfq0ibh1w8")))) + "1wbqvz2bhq2f5kqi7q2q3m9y5vs9rj970zhnjh502pvvhmbx20as")))) (build-system python-build-system) (propagated-inputs (list python-rply)) -- cgit v1.3 From 868325560eeb622839fcaa0e1ef28ea64b8fe0e2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 22 Nov 2022 07:53:14 +0100 Subject: gnu: Remove python-enum34. This compatibility package fails to build and has no users in Guix. * gnu/packages/python-xyz.scm (python-enum34): Remove variable. --- gnu/packages/python-xyz.scm | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1a50100f5ea..4f20396a759 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3140,25 +3140,6 @@ system is highly configurable via command line options and embedded commands.") (license license:lgpl2.1+))) -(define-public python-enum34 - (package - (name "python-enum34") - (version "1.1.6") - (source - (origin - (method url-fetch) - (uri (pypi-uri "enum34" version)) - (sha256 - (base32 - "1cgm5ng2gcfrkrm3hc22brl6chdmv67b9zvva9sfs7gn7dwc9n4a")))) - (build-system python-build-system) - (home-page "https://pypi.org/project/enum34/") - (synopsis "Backported Python 3.4 Enum") - (description - "Enum34 is the new Python stdlib enum module available in Python 3.4 -backported for previous versions of Python from 2.4 to 3.3.") - (license license:bsd-3))) - (define-public python-parse-type (package (name "python-parse-type") -- cgit v1.3 From 1d7f0a96f47c271f4efd37c23cee827b4cfb9d60 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 22 Nov 2022 07:55:37 +0100 Subject: gnu: python-parallel: Add missing input. * gnu/packages/python-xyz.scm (python-parallel)[propagated-inputs]: Add PYTHON-SIX. --- gnu/packages/python-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4f20396a759..7e667ef7e1f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27595,6 +27595,8 @@ module patches @code{asyncio} to allow nested use of @code{asyncio.run} and "1mzk4yabxj6r149fswhis18hd8dnag5sj8i4wb06450zq3pi8dh7")))) (native-inputs (list unzip)) + (propagated-inputs + (list python-six)) (build-system python-build-system) (arguments '(#:tests? #f)) ; No test suite. (home-page "https://www.parallelpython.com") -- cgit v1.3 From 4147c43a9c10079bdeacedb5ae259990fc0b2f50 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 22 Nov 2022 07:58:25 +0100 Subject: gnu: python-py3dns: Fix build failure. * gnu/packages/python-xyz.scm (python-py3dns)[arguments]: Remove sanity check. --- gnu/packages/python-xyz.scm | 6 ++++-- 1 file changed, 4 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 7e667ef7e1f..4ee572096f5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17633,8 +17633,10 @@ It supports TSIG authenticated messages and EDNS0.") (lambda _ (substitute* "setup.py" (("import DNS") "") - (("DNS.__version__") (string-append "\"" ,version "\""))) - #t))) + (("DNS.__version__") (string-append "\"" ,version "\""))))) + ;; For the same reason, drop the sanity check because the library + ;; fails to load without /etc/resolv.conf. + (delete 'sanity-check)) #:tests? #f)) ; Also skip the tests. (home-page "https://launchpad.net/py3dns") (synopsis "Python 3 DNS library") -- cgit v1.3 From eda5e9aaafeacc0e21dbf43200d79b91fc1e38ed Mon Sep 17 00:00:00 2001 From: jgart Date: Wed, 16 Nov 2022 19:48:33 -0600 Subject: gnu: python-pudb: Add python-numpy native-input. This is an optional test dependency. * gnu/packages/python-xyz.scm (python-pudb)[native-inputs]: Add python-numpy. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4ee572096f5..a88075cefaf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29627,7 +29627,7 @@ development, testing, production]}; (lambda* (#:key tests? #:allow-other-keys) (when tests? (invoke "pytest" "-vv"))))))) - (native-inputs (list python-pytest python-pytest-mock)) + (native-inputs (list python-pytest python-pytest-mock python-numpy)) (propagated-inputs (list python-jedi python-pygments python-urwid python-urwid-readline)) (home-page "https://documen.tician.de/pudb/") -- cgit v1.3 From 3ab9adba57c529f524e63ffbc663f5ddf8770752 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 23 Nov 2022 00:22:52 +0100 Subject: gnu: python-munkres: Conditionally disable failing test. * gnu/packages/python-xyz.scm (python-munkres)[arguments]: Add phase "disable-test" to patch test suite. --- gnu/packages/python-xyz.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a88075cefaf..7fefbc5bff4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16045,6 +16045,20 @@ way.") (sha256 (base32 "00yvj8bxmhhhhd74v7j0x673is7vizmxwgb3dd5xmnkr74ybyi7w")))) + (arguments + (list + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'disable-test + (lambda _ + ;; See https://github.com/bmc/munkres/issues/40 + (substitute* "test/test_munkres.py" + (("^def test_profit_float" m) + (string-append "\ +import platform +@pytest.mark.skipif(platform.architecture()[0] == \"32bit\", + reason=\"Fails on 32 bit architectures\") +" m)))))))) (build-system python-build-system) (native-inputs (list python-pytest-6)) (home-page "https://software.clapper.org/munkres/") -- cgit v1.3 From a9956536f37f6467389941aaac57b503eeeda665 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 27 Nov 2022 16:38:33 +0100 Subject: gnu: Add python-attrdict. * gnu/packages/python-xyz.scm (python-attrdict): New variable. --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7fefbc5bff4..87963f9f198 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19665,6 +19665,27 @@ from the header, as well as section details and data available.") and bit flag values.") (license license:expat))) +(define-public python-attrdict + (package + (name "python-attrdict") + (version "2.0.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "attrdict" version)) + (sha256 + (base32 + "0w3vsz64j9npxfgh83hghsh161wwkrx1fxqi1533js2wnnc0dj9m")))) + (build-system python-build-system) + ;; The package is no longer maintained and tests need some work. + (arguments '(#:tests? #f)) + (propagated-inputs (list python-six)) + (home-page "https://github.com/bcj/AttrDict") + (synopsis "Attribute-style access dictionaries") + (description + "This package provides mapping objects whose elements can be accessed +both as keys and as attributes.") + (license license:expat))) + (define-public python-attrs (package (name "python-attrs") -- cgit v1.3 From 42eccda8277d43446a3381835f8c0a95ae643973 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 14 Nov 2022 13:44:22 +0800 Subject: gnu: Add python-pynixutil. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-pynixutil): New variable. Signed-off-by: Ludovic Courtès --- 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 87963f9f198..e87c6bc0b4a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23082,6 +23082,32 @@ environments.") "PyNamecheap is a Namecheap API client in Python.") (license license:expat))) +(define-public python-pynixutil + (package + (name "python-pynixutil") + (version "0.5.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nix-community/pynixutil") + (commit version))) + (file-name (git-file-name name version)) + ;; Derivation test uses nix. + (modules '((guix build utils))) + (snippet '(delete-file "tests/test_drv.py")) + (sha256 + (base32 + "1lnspcai7mqpv73bbd8kgyw63fxwgkwvfkl09b2bl5y2g2v7np6m")))) + (build-system pyproject-build-system) + (native-inputs (list poetry python-pytest)) + (home-page "https://github.com/nix-community/pynixutil") + (synopsis "Utility functions for working with data from Nix in Python") + (description + "@code{pynixutil} provides functions for base32 encoding/decoding and +derivation parsing, namingly @code{b32decode()}, @code{b32encode()} and +@code{drvparse()}.") + (license license:expat))) + (define-public python-dns-lexicon (package (name "python-dns-lexicon") -- cgit v1.3 From c1b71a443210b9688a116a43fef2d284fc99e953 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 15 Nov 2022 21:03:05 +0100 Subject: gnu: Add python-dm-tree. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-dm-tree): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 69 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e87c6bc0b4a..17fbd9de9e9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -131,6 +131,7 @@ ;;; Copyright © 2022 Mathieu Laparie ;;; Copyright © 2022 Garek Dyszel ;;; Copyright © 2022 Baptiste Strazzulla +;;; Copyright © 2022 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -159,6 +160,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) #:use-module (gnu packages databases) #:use-module (gnu packages dbm) @@ -4634,6 +4636,73 @@ accessible for novices, as well as a scripting interface offering the full flexibility and power of the Python language.") (license license:gpl3+))) +(define-public python-dm-tree + (package + (name "python-dm-tree") + (version "0.1.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "dm-tree" version)) + (sha256 + (base32 "0apxfxgmqh22qpk92zmmf3acqkavhwxz78lnwz026a5rlnncizih")))) + (build-system python-build-system) + (inputs (list pybind11 abseil-cpp python)) + (propagated-inputs (list python-wheel + python-absl-py + python-attrs + python-numpy + python-wrapt)) + (arguments + (list #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'build-shared-lib + (lambda _ + (let* ((pybind11 #$(this-package-input "pybind11")) + (python #$(this-package-input "python")) + (version (python-version python)) + (abseil-cpp #$(this-package-input "abseil-cpp"))) + ;; Delete default cmake build. + (substitute* "setup.py" + (("ext_modules.*") "") + (("cmdclass.*") "")) + ;; Actual build phase. + (mkdir-p "build/temp/tree/") + (invoke + "gcc" "-pthread" "-Wno-unused-result" "-Wsign-compare" + "-DNDEBUG" "-g" "-fwrapv" "-O3" "-Wall" + "-fno-semantic-interposition" "-fPIC" + "-I" (string-append pybind11 + "/lib/python" version + "/site-packages/pybind11/include") + "-I" (string-append python "/include/python" + version) + "-I" (string-append abseil-cpp "/include") + "-c" "tree/tree.cc" + "-o" "build/temp/tree/tree.o" + "-fvisibility=hidden" "-g0") + (mkdir-p "build/lib/tree") + (invoke + "g++" "-pthread" "-shared" + (string-append "-Wl," "-rpath=" python "/lib") + "-fno-semantic-interposition" + "build/temp/tree/tree.o" + "-L" (string-append python "/lib") + "-L" (string-append abseil-cpp "/lib") + "-l" "absl_int128" + "-l" "absl_raw_hash_set" + "-l" "absl_raw_logging_internal" + "-l" "absl_strings" + "-l" "absl_throw_delegate" + "-o" "build/lib/tree/_tree.so"))))))) + (home-page "https://github.com/deepmind/tree") + (synopsis "Work with nested data structures in Python") + (description "Tree is a python library for working with nested data +structures. In a way, @code{tree} generalizes the builtin @code{map} function +which only supports flat sequences, and allows you to apply a function to each +leaf preserving the overall structure.") + (license license:asl2.0))) + (define-public python-docutils (package (name "python-docutils") -- cgit v1.3 From 0c2dad9951cb386c2a6698d465500536808fe354 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 2 Dec 2022 15:02:12 +0100 Subject: gnu: Add python-pybloom-live. * gnu/packages/python-xyz.scm (python-pybloom-live): New variable. --- 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 17fbd9de9e9..40c3f9c99c4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -164,6 +164,7 @@ #:use-module (gnu packages crypto) #:use-module (gnu packages databases) #:use-module (gnu packages dbm) + #:use-module (gnu packages digest) #:use-module (gnu packages django) #:use-module (gnu packages djvu) #:use-module (gnu packages docker) @@ -22433,6 +22434,25 @@ working with iterables.") (description "Lexer and codec to work with LaTeX code in Python.") (license license:expat))) +(define-public python-pybloom-live + (package + (name "python-pybloom-live") + (version "4.0.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "pybloom_live" version)) + (sha256 + (base32 + "040i6bjqvl33j30v865shsk30s3h7f16pqwiaj5kig857dfmqm4r")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-bitarray python-xxhash)) + (native-inputs (list python-pytest)) + (home-page "https://github.com/joseph-fox/python-bloomfilter") + (synopsis "Bloom filter") + (description "This package provides a scalable Bloom filter implemented in +Python.") + (license license:expat))) + (define-public python-pybtex (package (name "python-pybtex") -- cgit v1.3 From 00c1d79a4ce31260315afcb60cbef7edd05edf51 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 3 Dec 2022 12:59:50 -0300 Subject: gnu: python-funcpaserlib: Update to 1.0.1. * gnu/packages/python-xyz.scm (python-funcpaserlib): Update to 1.0.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 40c3f9c99c4..2292df60378 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25544,7 +25544,7 @@ scripts to load entry points more quickly.") (define-public python-funcparserlib (package (name "python-funcparserlib") - (version "1.0.0") + (version "1.0.1") (source (origin ;; Source tarball on PyPi lacks tests. @@ -25554,7 +25554,7 @@ scripts to load entry points more quickly.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "00pswdys5c4hpqpvfcy5zqv30gyjvjvagi12811jizw57hxrm1cs")))) + (base32 "0dw3i4fyf3j9h1l7xfgs99fc2w2axk6xqk0sdag43k444ss4hkrc")))) (build-system pyproject-build-system) (arguments '(#:phases -- cgit v1.3 From 0f89d91411f68fbac0e020fbfe92a6bf880065ac Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 14 Nov 2022 11:53:06 -0300 Subject: gnu: python-hy: Update to 0.25.0. * gnu/packages/python-xyz.scm (python-hy): Update to 0.25.0. --- 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 2292df60378..0f47e3be4f6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14779,7 +14779,7 @@ with a new public API, and RPython support.") (define-public python-hy (package (name "python-hy") - (version "0.24.0") + (version "0.25.0") (source (origin (method git-fetch) ; no tests in PyPI release @@ -14788,7 +14788,7 @@ with a new public API, and RPython support.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1s458ymd9g3s8k2ccc300jr4w66c7q3vhmhs9z3d3a4qg0xdhs9y")))) + (base32 "1am6z9m0s9svysj0wrfz069rpvbqqimphqll3912q4bvdlz6vrjp")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.3 From f635f725778f86abaa77f674f8f670f74bffd7be Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 6 Dec 2022 11:12:15 +0200 Subject: gnu: vdirsyncer: Update to 0.19.0. * gnu/packages/dav.scm (vdirsyncer): Update to 0.19.0. [arguments]: Remove trailing #t in phases. Remove phase generating the manpage. [native-inputs]: Add python-aioresponses, python-click, python-trustme, python-pytest-asyncio, python-pytest-cov, python-pytest-httpserver. Remove python-pytest-localserver, python-pytest-subtesthack, python-urllib3, python-wsgi-interpreter. [inputs]: Remove field. [propagated-inputs]: Add python-aiohttp, python-aiostream. Remove python-click-threading. * gnu/packages/python-xyz.scm (python-click-5): Remove variable. --- gnu/packages/dav.scm | 39 +++++++++++++++------------------------ gnu/packages/python-xyz.scm | 12 ------------ 2 files changed, 15 insertions(+), 36 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm index 9a336b381e2..775a3d9bed8 100644 --- a/gnu/packages/dav.scm +++ b/gnu/packages/dav.scm @@ -122,14 +122,13 @@ efficient syncing (define-public vdirsyncer (package (name "vdirsyncer") - ;; When updating, check whether python-click-5 can be removed entirely. - (version "0.18.0") + (version "0.19.0") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 (base32 - "00f2bw1a2jbbd1sbci0swnd67kylr341aa9rpbxkajbp3zakxg17")))) + "0995bavlv8s9j0127ncq3yzy5p72lam9qgpswyjfanc6l01q87lf")))) (build-system python-build-system) (arguments `(#:tests? #f ; The test suite is very flakey. @@ -141,38 +140,30 @@ efficient syncing (setenv "DAV_SERVER" "radicale") (setenv "REMOTESTORAGE_SERVER" "skip") (if tests? - (invoke "make" "test") - #t))) + (invoke "make" "test")))) (add-after 'unpack 'patch-version-call (lambda _ (substitute* "docs/conf.py" - (("^release.*") (string-append "release = '" ,version "'\n"))) - #t)) - (add-after 'install 'manpage - (lambda* (#:key inputs outputs #:allow-other-keys) - (invoke "make" "--directory=docs/" "man") - (install-file - "docs/_build/man/vdirsyncer.1" - (string-append - (assoc-ref outputs "out") - "/share/man/man1")) - #t))))) + (("^release.*") (string-append "release = '" ,version "'\n")))))))) (native-inputs (list python-setuptools-scm python-sphinx ;; Required for testing + python-aioresponses python-hypothesis + python-trustme python-pytest - python-pytest-localserver - python-pytest-subtesthack - python-urllib3 - python-wsgi-intercept + python-pytest-asyncio + python-pytest-cov + python-pytest-httpserver radicale)) - (inputs - (list ;; XXX https://github.com/mitsuhiko/click/issues/200 - python-click-5)) (propagated-inputs - (list python-atomicwrites python-click-log python-click-threading + (list python-aiohttp + python-aiostream + python-atomicwrites + python-click + python-click-log + python-requests python-requests-toolbelt)) (synopsis "Synchronize calendars and contacts") (description "Vdirsyncer synchronizes your calendars and addressbooks diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0f47e3be4f6..b74b1205103 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3671,18 +3671,6 @@ with sensible defaults out of the box.") (base32 "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj")))) (arguments `()))) -(define-public python-click-5 - (package (inherit python-click) - (name "python-click") - (version "5.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "click" version)) - (sha256 - (base32 "0njsm0wn31l21bi118g5825ma5sa3rwn7v2x4wjd7yiiahkri337")))) - (arguments `()))) - (define-public python-cligj (package (name "python-cligj") -- cgit v1.3 From db1c357a788fe38de033ef4f7ad4497d72557898 Mon Sep 17 00:00:00 2001 From: Attila Lendvai Date: Tue, 11 Oct 2022 15:10:00 +0200 Subject: gnu: Add python-simple-rlp. * gnu/packages/python-xyz.scm (python-simple-rlp): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b74b1205103..b0202853d8c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3011,6 +3011,29 @@ the optional C extension for speedups. Simplejson is also supported on Python 3.3+.") (license license:x11))) +(define-public python-simple-rlp + (package + (name "python-simple-rlp") + (version "0.1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/SamuelHaidu/simple-rlp") + ;; Upstream doesn't tag the git repo. + (commit "342ea269d84da1ddc4a7630cdebc90159261391c"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1nv92sphpkyrncak4qgj50qmgkmj4ycl2szbnv9c7ihgl5df4div")))) + (build-system python-build-system) + (home-page "https://github.com/SamuelHaidu/simple-rlp") + (synopsis + "Python implementation of RLP (Recursive Length Prefix) encoding") + (description + "@code{simple-rlp} is a python implementation of RLP (Recursive Length \ +Prefix) - Encode and decode data structures.") + (license license:expat))) (define-public python-pyicu (package -- cgit v1.3 From 6219491c47f20aef6bc8523110936924e4d3d785 Mon Sep 17 00:00:00 2001 From: Peter Polidoro Date: Thu, 13 Oct 2022 15:42:53 -0400 Subject: gnu: Add python-pint. * gnu/packages/python-xyz.scm (python-pint): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b0202853d8c..b830ade9caa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -924,6 +924,36 @@ variables into the markdown template") Markdown. All extensions are found under the module namespace of pymdownx.") (license license:expat))) +(define-public python-pint + (package + (name "python-pint") + (version "0.19.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "Pint" version)) + (sha256 + (base32 + "1bsbiikm9i4saqc6mc3minkmrgnsgcg734agsvd7icqhyngrim71")))) + (build-system python-build-system) + (native-inputs + (list python-pytest + python-pytest-cov + python-pytest-mpl + python-pytest-subtests + python-setuptools-scm + python-sparse + python-dask + python-xarray + python-distributed)) + (home-page "https://github.com/hgrecco/pint") + (synopsis "Physical quantities module") + (description + "Pint is a Python package to define, operate and manipulate physical +quantities: the product of a numerical value and a unit of measurement. It +allows arithmetic operations between them and conversions from and to +different units.") + (license license:bsd-3))) + (define-public python-plotille (package (name "python-plotille") -- cgit v1.3 From 2d989ad59793e10c6fef94d9eaa51be91469318a Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 12 Oct 2022 16:49:17 +0530 Subject: gnu: python-seaborn: Update to 0.12.0. * gnu/packages/python-xyz.scm (python-seaborn): Update to 0.12.0. [source]: Remove patches. [arguments]: Import (ice-9 match) module. Remove patch-more-tests and start-xserver phases. Replace build and install phases. Fix pytest command in check phase. [native-inputs]: Add python-flit-core and python-pypa-build. Remove xorg-server-for-tests. * gnu/packages/patches/python-seaborn-2690.patch, gnu/packages/patches/python-seaborn-kde-test.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Unregister them. --- gnu/local.mk | 2 - gnu/packages/patches/python-seaborn-2690.patch | 268 --------------------- gnu/packages/patches/python-seaborn-kde-test.patch | 36 --- gnu/packages/python-xyz.scm | 51 ++-- 4 files changed, 24 insertions(+), 333 deletions(-) delete mode 100644 gnu/packages/patches/python-seaborn-2690.patch delete mode 100644 gnu/packages/patches/python-seaborn-kde-test.patch (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/local.mk b/gnu/local.mk index af570125bdb..6e12f9cdb19 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1759,8 +1759,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-robotframework-atest.patch \ %D%/packages/patches/python-robotframework-source-date-epoch.patch \ %D%/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch \ - %D%/packages/patches/python-seaborn-kde-test.patch \ - %D%/packages/patches/python-seaborn-2690.patch \ %D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/python-versioneer-guix-support.patch \ diff --git a/gnu/packages/patches/python-seaborn-2690.patch b/gnu/packages/patches/python-seaborn-2690.patch deleted file mode 100644 index 4662d19c2de..00000000000 --- a/gnu/packages/patches/python-seaborn-2690.patch +++ /dev/null @@ -1,268 +0,0 @@ -This patch was adapted from the upstream pull request 2690. - -From ebd6812d48f5b8ed1ebb7d79bda0b2a7b9ae2812 Mon Sep 17 00:00:00 2001 -From: Michael Waskom -Date: Sun, 31 Oct 2021 15:09:27 -0400 -Subject: [PATCH 1/4] Update boxplot tests for mpl3.5 compatability - ---- - seaborn/tests/test_categorical.py | 30 +++++++++++++++++++----------- - 1 file changed, 19 insertions(+), 11 deletions(-) - -diff --git a/seaborn/tests/test_categorical.py b/seaborn/tests/test_categorical.py -index d4e09b703..488fad2d6 100644 ---- a/seaborn/tests/test_categorical.py -+++ b/seaborn/tests/test_categorical.py -@@ -110,6 +110,11 @@ class CategoricalFixture: - df = pd.DataFrame(dict(y=y, g=g, h=h, u=u)) - x_df["W"] = g - -+ def get_box_artists(self, ax): -+ -+ # Exclude labeled patches, which are for the legend -+ return [p for p in ax.patches if not p.get_label()] -+ - - class TestCategoricalPlotter(CategoricalFixture): - -@@ -855,12 +863,12 @@ def test_hue_offsets(self): - def test_axes_data(self): - - ax = cat.boxplot(x="g", y="y", data=self.df) -- assert len(ax.artists) == 3 -+ assert len(self.get_box_artists(ax)) == 3 - - plt.close("all") - - ax = cat.boxplot(x="g", y="y", hue="h", data=self.df) -- assert len(ax.artists) == 6 -+ assert len(self.get_box_artists(ax)) == 6 - - plt.close("all") - -@@ -868,14 +876,14 @@ def test_box_colors(self): - - ax = cat.boxplot(x="g", y="y", data=self.df, saturation=1) - pal = palettes.color_palette(n_colors=3) -- for patch, color in zip(ax.artists, pal): -+ for patch, color in zip(self.get_box_artists(ax), pal): - assert patch.get_facecolor()[:3] == color - - plt.close("all") - - ax = cat.boxplot(x="g", y="y", hue="h", data=self.df, saturation=1) - pal = palettes.color_palette(n_colors=2) -- for patch, color in zip(ax.artists, pal * 2): -+ for patch, color in zip(self.get_box_artists(ax), pal * 2): - assert patch.get_facecolor()[:3] == color - - plt.close("all") -@@ -884,7 +892,7 @@ def test_draw_missing_boxes(self): - - ax = cat.boxplot(x="g", y="y", data=self.df, - order=["a", "b", "c", "d"]) -- assert len(ax.artists) == 3 -+ assert len(self.get_box_artists(ax)) == 3 - - def test_missing_data(self): - -@@ -894,13 +902,13 @@ def test_missing_data(self): - y[-2:] = np.nan - - ax = cat.boxplot(x=x, y=y) -- assert len(ax.artists) == 3 -+ assert len(self.get_box_artists(ax)) == 3 - - plt.close("all") - - y[-1] = 0 - ax = cat.boxplot(x=x, y=y, hue=h) -- assert len(ax.artists) == 7 -+ assert len(self.get_box_artists(ax)) == 7 - - plt.close("all") - -@@ -2766,11 +2774,11 @@ def test_plot_elements(self): - - g = cat.catplot(x="g", y="y", data=self.df, kind="box") - want_artists = self.g.unique().size -- assert len(g.ax.artists) == want_artists -+ assert len(self.get_box_artists(g.ax)) == want_artists - - g = cat.catplot(x="g", y="y", hue="h", data=self.df, kind="box") - want_artists = self.g.unique().size * self.h.unique().size -- assert len(g.ax.artists) == want_artists -+ assert len(self.get_box_artists(g.ax)) == want_artists - - g = cat.catplot(x="g", y="y", data=self.df, - kind="violin", inner=None) -@@ -3137,14 +3145,14 @@ def test_box_colors(self): - - ax = cat.boxenplot(x="g", y="y", data=self.df, saturation=1) - pal = palettes.color_palette(n_colors=3) -- for patch, color in zip(ax.artists, pal): -+ for patch, color in zip(self.get_box_artists(ax), pal): - assert patch.get_facecolor()[:3] == color - - plt.close("all") - - ax = cat.boxenplot(x="g", y="y", hue="h", data=self.df, saturation=1) - pal = palettes.color_palette(n_colors=2) -- for patch, color in zip(ax.artists, pal * 2): -+ for patch, color in zip(self.get_box_artists(ax), pal * 2): - assert patch.get_facecolor()[:3] == color - - plt.close("all") - -From ff78ed38817a346e760194ab3b03b28d7ea3ba1b Mon Sep 17 00:00:00 2001 -From: Michael Waskom -Date: Sun, 31 Oct 2021 15:50:54 -0400 -Subject: [PATCH 2/4] Update kdeplot tests for mpl3.5 compatability - ---- - seaborn/tests/test_distributions.py | 53 ++++++++++++++++++++--------- - 1 file changed, 37 insertions(+), 16 deletions(-) - -diff --git a/seaborn/tests/test_distributions.py b/seaborn/tests/test_distributions.py -index d241fd978..466efb69e 100644 ---- a/seaborn/tests/test_distributions.py -+++ b/seaborn/tests/test_distributions.py -@@ -39,6 +39,27 @@ - ) - - -+def get_contour_coords(c): -+ """Provide compatability for change in contour artist type in mpl3.5.""" -+ # See https://github.com/matplotlib/matplotlib/issues/20906 -+ if isinstance(c, mpl.collections.LineCollection): -+ return c.get_segments() -+ elif isinstance(c, mpl.collections.PathCollection): -+ return [p.vertices[:np.argmax(p.codes) + 1] for p in c.get_paths()] -+ -+ -+def get_contour_color(c): -+ """Provide compatability for change in contour artist type in mpl3.5.""" -+ # See https://github.com/matplotlib/matplotlib/issues/20906 -+ if isinstance(c, mpl.collections.LineCollection): -+ return c.get_color() -+ elif isinstance(c, mpl.collections.PathCollection): -+ if c.get_facecolor().size: -+ return c.get_facecolor() -+ else: -+ return c.get_edgecolor() -+ -+ - class TestDistPlot(object): - - rs = np.random.RandomState(0) -@@ -902,7 +923,7 @@ def test_fill_artists(self, long_df): - f, ax = plt.subplots() - kdeplot(data=long_df, x="x", y="y", hue="c", fill=fill) - for c in ax.collections: -- if fill: -+ if fill or Version(mpl.__version__) >= Version("3.5.0b0"): - assert isinstance(c, mpl.collections.PathCollection) - else: - assert isinstance(c, mpl.collections.LineCollection) -@@ -918,8 +939,8 @@ def test_common_norm(self, rng): - kdeplot(x=x, y=y, hue=hue, common_norm=True, ax=ax1) - kdeplot(x=x, y=y, hue=hue, common_norm=False, ax=ax2) - -- n_seg_1 = sum([len(c.get_segments()) > 0 for c in ax1.collections]) -- n_seg_2 = sum([len(c.get_segments()) > 0 for c in ax2.collections]) -+ n_seg_1 = sum([len(get_contour_coords(c)) > 0 for c in ax1.collections]) -+ n_seg_2 = sum([len(get_contour_coords(c)) > 0 for c in ax2.collections]) - assert n_seg_2 > n_seg_1 - - def test_log_scale(self, rng): -@@ -946,7 +967,7 @@ def test_log_scale(self, rng): - ax2.contour(10 ** xx, yy, density, levels=levels) - - for c1, c2 in zip(ax1.collections, ax2.collections): -- assert_array_equal(c1.get_segments(), c2.get_segments()) -+ assert_array_equal(get_contour_coords(c1), get_contour_coords(c2)) - - def test_bandwidth(self, rng): - -@@ -959,7 +980,7 @@ def test_bandwidth(self, rng): - kdeplot(x=x, y=y, bw_adjust=2, ax=ax2) - - for c1, c2 in zip(ax1.collections, ax2.collections): -- seg1, seg2 = c1.get_segments(), c2.get_segments() -+ seg1, seg2 = get_contour_coords(c1), get_contour_coords(c2) - if seg1 + seg2: - x1 = seg1[0][:, 0] - x2 = seg2[0][:, 0] -@@ -980,9 +1001,9 @@ def test_weights(self, rng): - kdeplot(x=x, y=y, hue=hue, weights=weights, ax=ax2) - - for c1, c2 in zip(ax1.collections, ax2.collections): -- if c1.get_segments() and c2.get_segments(): -- seg1 = np.concatenate(c1.get_segments(), axis=0) -- seg2 = np.concatenate(c2.get_segments(), axis=0) -+ if get_contour_coords(c1) and get_contour_coords(c2): -+ seg1 = np.concatenate(get_contour_coords(c1), axis=0) -+ seg2 = np.concatenate(get_contour_coords(c2), axis=0) - assert not np.array_equal(seg1, seg2) - - def test_hue_ignores_cmap(self, long_df): -@@ -1030,7 +1051,7 @@ def test_levels_and_thresh(self, long_df): - kdeplot(**plot_kws, levels=np.linspace(thresh, 1, n), ax=ax2) - - for c1, c2 in zip(ax1.collections, ax2.collections): -- assert_array_equal(c1.get_segments(), c2.get_segments()) -+ assert_array_equal(get_contour_coords(c1), get_contour_coords(c2)) - - with pytest.raises(ValueError): - kdeplot(**plot_kws, levels=[0, 1, 2]) -@@ -1042,7 +1063,7 @@ def test_levels_and_thresh(self, long_df): - kdeplot(**plot_kws, levels=n, thresh=0, ax=ax2) - - for c1, c2 in zip(ax1.collections, ax2.collections): -- assert_array_equal(c1.get_segments(), c2.get_segments()) -+ assert_array_equal(get_contour_coords(c1), get_contour_coords(c2)) - for c1, c2 in zip(ax1.collections, ax2.collections): - assert_array_equal(c1.get_facecolors(), c2.get_facecolors()) - -@@ -2322,13 +2343,13 @@ def test_bivariate_kde_norm(self, rng): - z = [0] * 80 + [1] * 20 - - g = displot(x=x, y=y, col=z, kind="kde", levels=10) -- l1 = sum(bool(c.get_segments()) for c in g.axes.flat[0].collections) -- l2 = sum(bool(c.get_segments()) for c in g.axes.flat[1].collections) -+ l1 = sum(bool(get_contour_coords(c)) for c in g.axes.flat[0].collections) -+ l2 = sum(bool(get_contour_coords(c)) for c in g.axes.flat[1].collections) - assert l1 > l2 - - g = displot(x=x, y=y, col=z, kind="kde", levels=10, common_norm=False) -- l1 = sum(bool(c.get_segments()) for c in g.axes.flat[0].collections) -- l2 = sum(bool(c.get_segments()) for c in g.axes.flat[1].collections) -+ l1 = sum(bool(get_contour_coords(c)) for c in g.axes.flat[0].collections) -+ l2 = sum(bool(get_contour_coords(c)) for c in g.axes.flat[1].collections) - assert l1 == l2 - - def test_bivariate_hist_norm(self, rng): - -From a20ce3fabeb23c97b5827d9fb0c6a96ac109ea64 Mon Sep 17 00:00:00 2001 -From: Michael Waskom -Date: Sun, 31 Oct 2021 16:10:47 -0400 -Subject: [PATCH 3/4] Update legend tests for mpl3.5 compatability - ---- - seaborn/tests/test_distributions.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/seaborn/tests/test_distributions.py b/seaborn/tests/test_distributions.py -index 466efb69e..024fe7541 100644 ---- a/seaborn/tests/test_distributions.py -+++ b/seaborn/tests/test_distributions.py -@@ -872,7 +872,7 @@ def test_legend(self, long_df): - for label, level in zip(legend_labels, order): - assert label.get_text() == level - -- legend_artists = ax.legend_.findobj(mpl.lines.Line2D)[::2] -+ legend_artists = ax.legend_.findobj(mpl.lines.Line2D) - palette = color_palette() - for artist, color in zip(legend_artists, palette): - assert_colors_equal(artist.get_color(), color) - diff --git a/gnu/packages/patches/python-seaborn-kde-test.patch b/gnu/packages/patches/python-seaborn-kde-test.patch deleted file mode 100644 index f300dffc6ff..00000000000 --- a/gnu/packages/patches/python-seaborn-kde-test.patch +++ /dev/null @@ -1,36 +0,0 @@ -This patch is an excerpt of this upstream commit: - - commit 0a24478a550132f1882e5be5f5dbc0fc446a8a6c - Author: Michael Waskom - Date: Mon Dec 21 18:44:58 2020 -0500 - - Raise minimal supported Python to 3.7 and bump requirements (#2396) - -It fixes the failure of 'test_weights'. - ---- a/seaborn/tests/test_distributions.py -+++ b/seaborn/tests/test_distributions.py -@@ -709,21 +708,17 @@ class TestKDEPlotUnivariate: - integral = integrate.trapz(ydata, np.log10(xdata)) - assert integral == pytest.approx(1) - -- @pytest.mark.skipif( -- LooseVersion(scipy.__version__) < "1.2.0", -- reason="Weights require scipy >= 1.2.0" -- ) - def test_weights(self): - - x = [1, 2] - weights = [2, 1] - -- ax = kdeplot(x=x, weights=weights) -+ ax = kdeplot(x=x, weights=weights, bw_method=.1) - - xdata, ydata = ax.lines[0].get_xydata().T - -- y1 = ydata[np.argwhere(np.abs(xdata - 1).min())] -- y2 = ydata[np.argwhere(np.abs(xdata - 2).min())] -+ y1 = ydata[np.abs(xdata - 1).argmin()] -+ y2 = ydata[np.abs(xdata - 2).argmin()] - - assert y1 == pytest.approx(2 * y2) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b830ade9caa..a9b123d4c2a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10280,40 +10280,37 @@ SVG, EPS, PNG and terminal output.") (define-public python-seaborn (package (name "python-seaborn") - (version "0.11.2") + (version "0.12.0") (source (origin (method url-fetch) (uri (pypi-uri "seaborn" version)) (sha256 (base32 - "1xpl3zb945sihsiwm9q1yyx84sakk1phcg0fprj6i0j0dllfjifg")) - (patches (search-patches "python-seaborn-kde-test.patch" - "python-seaborn-2690.patch")))) - (build-system python-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-more-tests - (lambda _ - (substitute* "seaborn/tests/test_distributions.py" - (("get_contour_color\\(ax\\.collections\\[0\\]\\)") - "get_contour_color(ax.collections[0])") - (("c\\.get_color\\(\\)") "get_contour_color(c)") - (("def test_hue_ignores_cmap") - "def skip_test_hue_ignores_cmap") - (("def test_fill_artists") - "def skip_test_fill_artists") - (("def test_with_rug") "def skip_test_with_rug")))) - (add-before 'check 'start-xserver - (lambda _ - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1"))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "seaborn"))))))) + "08vvnp4ps86857imxz2l5xi2vir5xdcdp3apq4badb4b5llifgw9")))) + (build-system python-build-system) + (arguments + (list #:modules '((guix build python-build-system) + (guix build utils) + (ice-9 match)) + #:phases #~(modify-phases %standard-phases + (replace 'build + (lambda _ + (invoke "python" "-m" "build" "--wheel" + "--no-isolation" "."))) + (replace 'install + (lambda _ + (match (find-files "dist" "\\.whl$") + ((wheel _ ...) + (invoke "python" "-m" "pip" "install" + (string-append "--prefix=" #$output) + wheel))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) (propagated-inputs (list python-pandas python-matplotlib python-numpy python-scipy)) - (native-inputs (list python-pytest xorg-server-for-tests)) + (native-inputs (list python-flit-core python-pypa-build python-pytest)) (home-page "https://seaborn.pydata.org/") (synopsis "Statistical data visualization") (description -- cgit v1.3 From 97cfa1cd7803452977369bc84dc3fc8002ae6541 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Dec 2022 15:13:39 +0100 Subject: gnu: Add python-py4j. * gnu/packages/python-xyz.scm (python-py4j): New variable. --- gnu/packages/python-xyz.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a9b123d4c2a..a897bf19f98 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -901,6 +901,24 @@ template") variables into the markdown template") (license license:expat))) +(define-public python-py4j + (package + (name "python-py4j") + (version "0.10.9.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "py4j" version)) + (sha256 + (base32 + "1fwdx92cdaiviradksfyygg05g1fpc3x2lf65bv5rnispcam6vhb")))) + (build-system python-build-system) + (home-page "https://www.py4j.org/") + (synopsis "Dynamically access arbitrary Java objects from Python") + (description + "This package enables Python programs to dynamically access arbitrary +Java objects.") + (license license:bsd-3))) + (define-public python-pymdown-extensions (package (name "python-pymdown-extensions") -- cgit v1.3 From a88fa1ced73ff320040e3dba58947f91aab6fa02 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Dec 2022 18:20:40 +0100 Subject: gnu: Add python-fit-nbinom. * gnu/packages/python-xyz.scm (python-fit-nbinom): New variable. --- gnu/packages/python-xyz.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a897bf19f98..0f0a7ef49f5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -565,6 +565,24 @@ and variables you'll need already imported and created. (home-page "https://github.com/google/python-fire") (license license:asl2.0))) +(define-public python-fit-nbinom + (package + (name "python-fit-nbinom") + (version "1.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "fit_nbinom" version)) + (sha256 + (base32 + "12v8l5i35vjbpvh5i4lw29ys6vpr3z7pysyrx33hxaq09zr015mx")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-numpy python-scipy)) + (home-page "https://github.com/joachimwolff/fit_nbinom") + (synopsis "Negative binomial maximum likelihood estimator") + (description "This package provides an implementation in Python using +scipy and numpy of negative binomial maximum likelihood estimation.") + (license license:gpl3+))) + (define-public python-dotmap (package (name "python-dotmap") -- cgit v1.3 From be9e8c3963b45c674a529c7461a4e7933c3efd93 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Dec 2022 13:50:25 +0100 Subject: gnu: Add python-apispec-webframeworks. * gnu/packages/python-xyz.scm (python-apispec-webframeworks): New variable. --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0f0a7ef49f5..d429a4a734b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20975,6 +20975,34 @@ while only declaring the test-specific fields.") as Swagger.") (license license:expat))) +(define-public python-apispec-webframeworks + (package + (name "python-apispec-webframeworks") + (version "0.5.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "apispec-webframeworks" version)) + (sha256 + (base32 + "1wyw30402xq2a8icrsjmy9v43jyvawcjd85ccb2zicqlg4k5pcqd")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-apispec)) + (native-inputs + (list python-bottle + python-flake8 + python-flake8-bugbear + python-flask + python-mock + python-pre-commit + python-pytest + python-tornado + python-tox)) + (home-page "https://github.com/marshmallow-code/apispec-webframeworks") + (synopsis "Web framework plugins for apispec") + (description "This package provides plugins for using @code{apispec} with +web frameworks.") + (license license:expat))) + (define-public python-flasgger (package (name "python-flasgger") -- cgit v1.3 From bc47a1bf02e9071743d56243ba5aabf4b764afc5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Dec 2022 15:47:18 +0100 Subject: gnu: Add python-pygtrie. * gnu/packages/python-xyz.scm (python-pygtrie): New variable. --- gnu/packages/python-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d429a4a734b..4298fd4c402 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4978,6 +4978,23 @@ text styles of documentation.") (description "This package installs Github custom lexers to Pygments.") (license license:bsd-3))) +(define-public python-pygtrie + (package + (name "python-pygtrie") + (version "2.5.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "pygtrie" version)) + (sha256 + (base32 + "1qm4xdmzd4q5pc9h5gjdpr5m7lg06k8dvqnjn7d07d3fhani8d90")))) + (build-system pyproject-build-system) + (home-page "https://github.com/mina86/pygtrie") + (synopsis "Pure Python trie data structure implementation") + (description + "This package provides a pure Python trie data structure implementation.") + (license license:asl2.0))) + (define-public python-bump2version (package (name "python-bump2version") -- cgit v1.3 From 94e9651241b3e827531779717952d386535801f3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 12 Dec 2022 11:12:27 +0100 Subject: gnu: Add python-pomegranate. * gnu/packages/python-xyz.scm (python-pomegranate): New variable. --- gnu/packages/python-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4298fd4c402..85914231167 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3320,6 +3320,46 @@ existing ones.") a certain expected condition.") (license license:expat))) +(define-public python-pomegranate + (package + (name "python-pomegranate") + (version "0.14.8") + (source (origin + (method url-fetch) + (uri (pypi-uri "pomegranate" version)) + (sha256 + (base32 + "0gb9srkbxzlkjyfizvxkw5y0bvnfcyiaxapz0hrdaba8j096b5i2")) + (modules '((guix build utils))) + ;; Delete generated Cython C files. + (snippet + '(for-each delete-file (find-files "." "\\.c$"))))) + (build-system python-build-system) + (arguments + (list + #:phases + '(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "setup.py" "test"))))))) + (propagated-inputs + (list python-joblib + python-networkx + python-numpy + python-pyyaml + python-scipy)) + (native-inputs + (list python-cython + python-nose + python-pandas)) + (home-page "https://pypi.python.org/pypi/pomegranate/") + (synopsis "Graphical models library for Python") + (description + "Pomegranate is a graphical models library for Python, implemented in +Cython for speed.") + (license license:expat))) + (define-public python-poyo (package (name "python-poyo") -- cgit v1.3 From 8fe6d3e8446944294856950ef192cac83e03e58b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 4 Dec 2022 01:00:52 +0100 Subject: gnu: yajl: Drop custom ‘lib-’ prefix. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/web.scm (yajl): New variable, renamed from… (libyajl): …this one, which is now a DEPRECATED-PACKAGE alias of yajl. Adjust all users. --- gnu/packages/containers.scm | 2 +- gnu/packages/monitoring.scm | 2 +- gnu/packages/mpd.scm | 2 +- gnu/packages/python-xyz.scm | 4 ++-- gnu/packages/virtualization.scm | 6 +++--- gnu/packages/web.scm | 7 +++++-- gnu/packages/wm.scm | 4 ++-- 7 files changed, 15 insertions(+), 12 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 59eea423a19..e2d698dcc23 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -91,7 +91,7 @@ (inputs (list libcap libseccomp - libyajl)) + yajl)) (native-inputs (list automake autoconf diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 37b9335ac8a..74ec7b6cdfe 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -636,7 +636,7 @@ devices.") ;; Required because of patched sources. (invoke "autoreconf" "-vfi")))))) (inputs - (list rrdtool curl libyajl)) + (list rrdtool curl yajl)) (native-inputs (list autoconf automake libtool pkg-config)) (home-page "https://collectd.org/") diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index e0bd7633bcc..5439d89f4af 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -170,7 +170,7 @@ interfacing MPD in the C, C++ & Objective C languages.") zlib)) (native-inputs (list cmake pkg-config python-sphinx)) ;; Missing optional inputs: - ;; libyajl + ;; yajl ;; libcdio_paranoia ;; libmms ;; libadplug diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 85914231167..9629012a806 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29784,9 +29784,9 @@ simple mock/record and a complete capture/replay framework.") (when tests? (invoke "pytest" "-vv"))))))) (inputs - ;; libyajl is optional, but compiling with it makes faster + ;; yajl is optional, but compiling with it makes faster ;; backends available to ijson: - (list libyajl)) + (list yajl)) (native-inputs (list python-pytest)) (build-system python-build-system) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index c0334f1760c..1218112a202 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1363,7 +1363,7 @@ pretty simple, REST API.") openssl readline cyrus-sasl - libyajl + yajl audit dmidecode dnsmasq @@ -1403,7 +1403,7 @@ to integrate other virtualization mechanisms if needed.") (build-system meson-build-system) (inputs (list openssl cyrus-sasl lvm2 ; for libdevmapper - libyajl)) + yajl)) (native-inputs (list pkg-config intltool `(,glib "bin") vala)) @@ -2269,7 +2269,7 @@ override CC = " (assoc-ref inputs "cross-gcc") "/bin/i686-linux-gnu-gcc")) ("iproute" ,iproute) ; TODO: patch invocations. ("libaio" ,libaio) ("libx11" ,libx11) - ("libyajl" ,libyajl) + ("yajl" ,yajl) ("ncurses" ,ncurses) ("openssl" ,openssl) ("ovmf" ,ovmf) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index c1e9e943c01..efb0313f054 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1395,9 +1395,9 @@ current version of any major web browser.") style API.") (license license:expat))) -(define-public libyajl +(define-public yajl (package - (name "libyajl") + (name "yajl") (version "2.1.0") (source (origin (method git-fetch) @@ -1424,6 +1424,9 @@ style API.") parser written in ANSI C and a small validating JSON generator.") (license license:isc))) +(define-public libyajl + (deprecated-package "libyajl" yajl)) + (define-public libwebsockets (package (name "libwebsockets") diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index d3a7716c235..18fe606c7b1 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -287,7 +287,7 @@ or musca). (list alsa-lib libconfuse libnl - libyajl + yajl pulseaudio)) (native-inputs (list asciidoc @@ -342,7 +342,7 @@ commands would.") xcb-util-xrm libxkbcommon libev - libyajl + yajl xmlto perl-pod-simple libx11 -- cgit v1.3 From c4bcb5db49b210097c5452b678e57a0774014814 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 12 Dec 2022 21:40:53 +0100 Subject: gnu: python-typer: Simplify by using pyproject-build-system. * gnu/packages/python-xyz.scm (python-typer)[build-system]: Use pyproject-build-system. [arguments]: Remove extra quoting; remove custom 'build phase; remove custom 'install phase; remove custom 'check phase; add 'pre-check phase. [synopsis]: Pull onto the same line. [description]: Reformat. --- gnu/packages/python-xyz.scm | 74 +++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 46 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9629012a806..bb25c35cafa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22311,60 +22311,42 @@ based on the CPython 2.7 and 3.7 parsers.") (file-name (git-file-name name version)) (sha256 (base32 "1knv353qhkl2imav3jfp6bgq47m8wkkqhq1dzmqg2sv8rsy7zgl7")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - `(#:phases - ,#~(modify-phases %standard-phases - ;; Unfortunately, this doesn't seem to be enough to fix these two - ;; tests, but we'll patch this anyway. - (add-after 'unpack 'patch-shell-reference - (lambda _ - (substitute* "tests/test_completion/test_completion.py" - (("\"bash\"") (string-append "\"" (which "bash") "\"")) - (("\"/bin/bash\"") - (string-append "\"" (which "bash") "\""))))) - (replace 'build - (lambda _ - (invoke "flit" "build"))) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (for-each - (lambda (wheel) - (format #true wheel) - (invoke "python" "-m" "pip" "install" - wheel (string-append "--prefix=" #$output))) - (find-files "dist" "\\.whl$")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" "/tmp") ; some tests need it - - ;; This is for completion tests - (with-output-to-file "/tmp/.bashrc" - (lambda _ (display "# dummy"))) - - (setenv "GUIX_PYTHONPATH" - (string-append (getcwd) ":" - (getenv "GUIX_PYTHONPATH"))) - (let ((disabled-tests (list "test_show_completion" - "test_install_completion"))) - (invoke "python" "-m" "pytest" "tests/" - "-k" - (string-append "not " - (string-join disabled-tests - " and not ")))))))))) + (list + #:test-flags + '(let ((disabled-tests (list "test_show_completion" + "test_install_completion"))) + (list "-k" (string-append "not " + (string-join disabled-tests + " and not ")))) + #:phases + #~(modify-phases %standard-phases + ;; Unfortunately, this doesn't seem to be enough to fix these two + ;; tests, but we'll patch this anyway. + (add-after 'unpack 'patch-shell-reference + (lambda _ + (substitute* "tests/test_completion/test_completion.py" + (("\"bash\"") (string-append "\"" (which "bash") "\"")) + (("\"/bin/bash\"") + (string-append "\"" (which "bash") "\""))))) + (add-before 'check 'pre-check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" "/tmp") ; some tests need it + ;; This is for completion tests + (with-output-to-file "/tmp/.bashrc" + (lambda _ (display "# dummy"))))))))) (propagated-inputs (list python-click)) (native-inputs (list python-coverage python-flit python-pytest python-rich python-shellingham)) (home-page "https://github.com/tiangolo/typer") - (synopsis - "Typer builds CLI based on Python type hints") + (synopsis "Typer builds CLI based on Python type hints") (description - "Typer is a library for building CLI applications. It's based on -Python 3.6+ type hints.") + "Typer is a library for building CLI applications. It's based on Python +3.6+ type hints.") ;; MIT license (license license:expat))) -- cgit v1.3 From 8b9c9051ba798572577cef474085cc88adb73ae4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 12 Dec 2022 23:45:52 +0100 Subject: gnu: python-numcodecs: Update to 0.10.2. * gnu/packages/python-xyz.scm (python-numcodecs): Update to 0.10.2. [build-system]: Use pyproject-build-system. [arguments]: Enable tests; add phase 'build-extensions; remove custom 'check phase. [propagated-inputs]: Add python-entrypoints and python-typing-extensions-next. --- gnu/packages/python-xyz.scm | 26 ++++++++++++++------------ 1 file changed, 14 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 bb25c35cafa..ef3043f09ca 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23473,14 +23473,14 @@ tool).") (define-public python-numcodecs (package (name "python-numcodecs") - (version "0.6.4") + (version "0.10.2") (source (origin (method url-fetch) (uri (pypi-uri "numcodecs" version)) (sha256 (base32 - "0kbfr8pl3x9glsypbq8hzim003f16ml1b1cvgrh4w1sdvgal6j7g")) + "1i2rvm1f23dapcf6w3mj4877jzq5f24bhfa0fafbv1nr7xmqr0r2")) (modules '((guix build utils))) (snippet '(begin @@ -23490,11 +23490,11 @@ tool).") "numcodecs/lz4.c" "numcodecs/vlen.c" "numcodecs/zstd.c")))))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - `(#:tests? #false ; TODO: unclear why numcodecs.* are not found - #:phases - (modify-phases %standard-phases + (list + #:phases + '(modify-phases %standard-phases (add-after 'unpack 'disable-avx2 (lambda _ (setenv "DISABLE_NUMCODECS_AVX2" "1"))) @@ -23511,16 +23511,18 @@ tool).") "'numcodecs.lz4', libraries=['lz4'], ") (("'numcodecs.blosc',") "'numcodecs.blosc', libraries=['blosc'], ")))) - (replace 'check - (lambda* (#:key tests? inputs outputs #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-vv"))))))) + (add-before 'check 'build-extensions + (lambda _ + ;; Cython extensions have to be built before running the tests. + (invoke "python" "setup.py" "build_ext" "--inplace")))))) (inputs (list c-blosc lz4 zlib `(,zstd "lib"))) (propagated-inputs - (list python-numpy python-msgpack)) + (list python-entrypoints + python-numpy + python-msgpack + python-typing-extensions-next)) (native-inputs (list python-cython python-pytest python-setuptools-scm)) (home-page "https://github.com/zarr-developers/numcodecs") -- cgit v1.3 From 2c65106cf5bc591ecf8d2303fdfd48d578f47b62 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 12 Dec 2022 23:47:19 +0100 Subject: gnu: python-zarr: Update to 2.13.3. * gnu/packages/python-xyz.scm (python-zarr): Update to 2.13.3. --- 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 ef3043f09ca..579105e263f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23552,14 +23552,14 @@ codecs for use in data storage and communication applications.") (define-public python-zarr (package (name "python-zarr") - (version "2.4.0") + (version "2.13.3") (source (origin (method url-fetch) (uri (pypi-uri "zarr" version)) (sha256 (base32 - "026n3sjzjv2gmwx6y72b8ij0hk42bc8zdbvfj5gdqzd4i6wj3ajk")))) + "135ls2q7zc98pk61a5cnh88j4hnnavcwasrswdjqyqvcc68b096v")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.3 From 75331dc6e690e790cccfa7ec0b936ff60e7f517d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 12 Dec 2022 23:47:27 +0100 Subject: gnu: python-anndata: Use pyproject-build-system. * gnu/packages/python-xyz.scm (python-anndata)[build-system]: Use pyproject-build-system. [arguments]: Replace custom 'build phase with 'set-version phase; remove custom 'install phase; disable doctest via build phase 'disable-doctests and the #:test-flags property. [propagated-inputs]: Add python-scikit-learn. [native-inputs]: Add python-boltons. --- gnu/packages/python-xyz.scm | 49 ++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 23 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 579105e263f..f5c4e3e9f7f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -201,6 +201,7 @@ #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) + #:use-module (gnu packages machine-learning) #:use-module (gnu packages man) #:use-module (gnu packages markup) #:use-module (gnu packages maths) @@ -23601,29 +23602,26 @@ N-dimensional arrays for Python.") (sha256 (base32 "0v7npqrg1rdm8jzw22a45c0mqrmsv05r3k88i3lhzi0pzzxca1i1")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'check) - (replace 'build - (lambda _ - (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" ,version) - (substitute* "anndata/_metadata.py" - (("__version__ =.*") - (string-append "__version__ = \"" ,version "\"\n"))) - ;; ZIP does not support timestamps before 1980. - (setenv "SOURCE_DATE_EPOCH" "315532800") - (invoke "flit" "build"))) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (let ((out (assoc-ref outputs "out"))) - (for-each (lambda (wheel) - (format #true wheel) - (invoke "python" "-m" "pip" "install" - wheel (string-append "--prefix=" out))) - (find-files "dist" "\\.whl$")))))))) + (list + #:test-flags + '(list "-k" "not concatenation.rst") + #:phases + #~(modify-phases %standard-phases + ;; Doctests require scanpy from (gnu packages bioinformatics) + (add-after 'unpack 'disable-doctests + (lambda _ + (substitute* "pyproject.toml" + (("--doctest-modules") "")))) + (add-before 'build 'set-version + (lambda _ + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version) + (substitute* "anndata/_metadata.py" + (("__version__ =.*") + (string-append "__version__ = \"" #$version "\"\n"))) + ;; ZIP does not support timestamps before 1980. + (setenv "SOURCE_DATE_EPOCH" "315532800")))))) (propagated-inputs (list python-h5py python-importlib-metadata @@ -23632,9 +23630,14 @@ N-dimensional arrays for Python.") python-packaging python-pandas python-scipy + python-scikit-learn python-zarr)) (native-inputs - (list python-joblib python-pytest python-toml python-flit + (list python-boltons + python-joblib + python-pytest + python-toml + python-flit python-setuptools-scm)) (home-page "https://github.com/theislab/anndata") (synopsis "Annotated data for data analysis pipelines") -- cgit v1.3 From 08b9e29d4672d2209026f4b7fa592abb958cbd34 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 10 Dec 2022 22:03:45 +0100 Subject: gnu: python-bokeh: Skip failing PIL test. The test compares base64-encoded gifs; the gifs look identical but the base64-encoded data differs. Since the result seems fine, disabling this PIL test is probably okay. * gnu/packages/python-xyz.scm (python-bokeh)[arguments]: Ignore failing test_transform_PIL test. --- gnu/packages/python-xyz.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f5c4e3e9f7f..2acba1fa399 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15466,7 +15466,10 @@ enhancements to optimization and data fitting problems.") (delete-file "tests/unit/bokeh/models/test_sources.py") (delete-file "tests/unit/bokeh/embed/test_bundle.py") - (invoke "pytest" "-v"))))))) + ;; XXX: This one test transforms a gif of a red box. It + ;; transforms it all right but the base64 doesn't look as + ;; expected, probably because of a change in pillow. + (invoke "pytest" "-v" "-k" "not test_transform_PIL"))))))) (propagated-inputs (list node-lts python-jinja2 -- cgit v1.3 From 0fcba8b01c23af756dba5f863db8712d6f840f36 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Dec 2022 13:44:29 +0100 Subject: gnu: python-marshmallow: Update to 3.19.0. * gnu/packages/python-xyz.scm (python-marshmallow): Update to 3.19.0. [build-system]: Use pyproject-build-system. [propagated-inputs]: Remove python-dateutil and python-simplejson; add python-packaging. [native-inputs]: Add python-flake8, python-flake8-bugbear, python-mypy, python-pre-commit, and python-simplejson. --- gnu/packages/python-xyz.scm | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2acba1fa399..2d013054eca 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20954,24 +20954,29 @@ while only declaring the test-specific fields.") (define-public python-marshmallow (package (name "python-marshmallow") - (version "3.9.1") + (version "3.19.0") (source (origin - (method url-fetch) - (uri (pypi-uri "marshmallow" version)) - (sha256 - (base32 - "0kizhh3mnhpa08wfnsv1gagy22bpxzxszgbiylkhpz1d8qvwrykk")))) - (build-system python-build-system) + (method url-fetch) + (uri (pypi-uri "marshmallow" version)) + (sha256 + (base32 + "0y6vpq2p5841kcw2qil68la0rx9z1vmxzj3dxjv99kjhsq7jq0wh")))) + (build-system pyproject-build-system) (propagated-inputs - (list python-dateutil python-simplejson)) + (list python-packaging)) (native-inputs - (list python-pytest python-pytz)) + (list python-flake8 + python-flake8-bugbear + python-mypy + python-pre-commit + python-pytest + python-pytz + python-simplejson)) (home-page "https://github.com/marshmallow-code/marshmallow") - (synopsis "Convert complex datatypes to and from native - Python datatypes") - (description "@code{marshmallow} provides a library for converting - complex datatypes to and from native Python datatypes.") + (synopsis "Convert complex datatypes to and from native Python datatypes") + (description "@code{marshmallow} provides a library for converting complex +datatypes to and from native Python datatypes.") (license license:expat))) (define-public python-marshmallow-jsonapi -- cgit v1.3 From 99a29b4933144599c29bd54a0eb654b20cbe6500 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Dec 2022 13:45:51 +0100 Subject: gnu: python-apispec: Update to 6.0.2. * gnu/packages/python-xyz.scm (python-apispec): Update to 6.0.2. [build-system]: Use pyproject-build-system. [arguments]: Disable test through test-flags, not by replacing the 'check phase. [propagated-inputs]: Remove python-pyyaml; add python-packaging. [native-inputs]: Add python-flake8, python-flake8-bugbear, python-mypy, python-pre-commit, and python-pyyaml. --- gnu/packages/python-xyz.scm | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2d013054eca..0ddb91cf79e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21012,33 +21012,36 @@ datatypes to and from native Python datatypes.") (define-public python-apispec (package (name "python-apispec") - (version "4.0.0") + (version "6.0.2") (source (origin - (method url-fetch) - (uri (pypi-uri "apispec" version)) - (sha256 + (method url-fetch) + (uri (pypi-uri "apispec" version)) + (sha256 (base32 - "12n4w5zkn4drcn8izq68vmixmqvz6abviqkdn4ip0kaax3jjh3in")))) - (build-system python-build-system) + "11vqxwdxmm7qmyhdbxk4gnx37nbzmn266ah92gi4pvzd76vq0vg7")))) + (build-system pyproject-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "pytest" "-vv" - ;; Disable validation tests since they require - ;; the optional 'prance' library which is not - ;; yet in Guix. - "-k" "not openapi_tools_validate")))))) + (list + ;; Disable validation tests since they require + ;; the optional 'prance' library which is not + ;; yet in Guix. + #:test-flags '(list "-k" "not openapi_tools_validate"))) (propagated-inputs - (list python-pyyaml)) + (list python-packaging)) (native-inputs - (list python-pytest python-marshmallow)) + (list python-flake8 + python-flake8-bugbear + python-marshmallow + python-mypy + python-pre-commit + python-pytest + python-pyyaml)) (home-page "https://github.com/marshmallow-code/apispec") (synopsis "Swagger/OpenAPI specification generator") (description "@code{python-apispec} is a pluggable API specification - generator. It currently supports the OpenAPI specification, formerly known - as Swagger.") +generator. It currently supports the OpenAPI specification, formerly known as +Swagger.") (license license:expat))) (define-public python-apispec-webframeworks -- cgit v1.3 From 8c197f990b7ab60e4524567d628d78ea62973c11 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Dec 2022 15:01:42 +0100 Subject: gnu: python-pyjwt: Update to 2.6.0. * gnu/packages/python-xyz.scm (python-pyjwt): Update to 2.6.0. [build-system]: Use pyproject-build-system. [arguments]: Remove. [native-inputs]: Add pytohn-coverage, python-pre-commit, python-sphinx, and python-sphinx-rtd-theme. --- gnu/packages/python-xyz.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0ddb91cf79e..0f7903bdfbe 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4088,23 +4088,22 @@ memory usage and transliteration quality.") (define-public python-pyjwt (package (name "python-pyjwt") - (version "2.4.0") + (version "2.6.0") (source (origin (method url-fetch) (uri (pypi-uri "PyJWT" version)) (sha256 (base32 - "1fmbcwfw1463wjzwbcgg3s16rad6kfb1mc5y7jbkp6v9ihh0hafl")))) - (build-system python-build-system) - (arguments - '(#:phases (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-vv"))))))) + "1z85kwr945rbzrn5wabrsmck5x8disa9wc7b3y5gci7w65z5qa39")))) + (build-system pyproject-build-system) (native-inputs - (list python-cryptography python-pytest)) + (list python-coverage + python-cryptography + python-pre-commit + python-pytest + python-sphinx + python-sphinx-rtd-theme)) (home-page "https://github.com/progrium/pyjwt") (synopsis "JSON Web Token implementation in Python") (description -- cgit v1.3 From 9bf2101049eb79430a6b15f0017a6027ad37a1f2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 11 Dec 2022 15:37:40 +0100 Subject: gnu: python-flasgger: Update to 0.9.5. * gnu/packages/python-xyz.scm (python-flasgger): Update to 0.9.5. [build-system]: Use pyproject-build-system. [arguments]: Remove custom 'check phase; add 'prepare-check phase; disable "test_swag" test via #:test-flags. [native-inputs]: Add python-apispec-webframeworks and python-flask-jwt. --- gnu/packages/python-xyz.scm | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0f7903bdfbe..2279503d633 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21074,7 +21074,7 @@ web frameworks.") (define-public python-flasgger (package (name "python-flasgger") - (version "0.6.3") + (version "0.9.5") (source (origin (method git-fetch) @@ -21083,29 +21083,35 @@ web frameworks.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0yydxsyjnc0clbrjqb1n7587l6cdqvwdagwxk5hkx01qwdfbkvpn")))) - (build-system python-build-system) + (base32 "0a2djgfq905a4in16068qz0ikg88dm4nbckaamhaz2v9khllr0bi")))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* "Makefile" - (("flake8 flasgger --ignore=F403") - "flake8 flasgger --ignore=E731,F403")) - (invoke "py.test")))))) + (list + ;; This test fails due to missing fixtures + #:test-flags '(list "-k" "not test_swag") + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'prepare-check + (lambda _ + ;; This requires a dummy package "flasgger_package" to be installed. + (delete-file "examples/package_example.py") + ;; These fail with an internal server error + (for-each delete-file '("examples/marshmallow_apispec.py" + "examples/validation.py"))))))) (propagated-inputs (list python-flask python-pyyaml python-jsonschema python-mistune python-six)) (native-inputs - (list python-decorator + (list python-apispec + python-apispec-webframeworks + python-decorator python-flake8 + python-flask-jwt python-flask-restful python-flex - python-pytest - python-pytest-cov python-marshmallow - python-apispec)) + python-pytest + python-pytest-cov)) (home-page "https://github.com/rochacbruno/flasgger/") (synopsis "Extract Swagger specs from your Flask project") (description "@code{python-flasgger} allows extracting Swagger specs -- cgit v1.3 From 0682e7c2e36933c5447678549c8e61bd1271d92c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 5 Dec 2022 22:59:12 +0000 Subject: gnu: python-h5netcdf: Update to 1.1.0. * gnu/packages/python-xyz.scm (python-h5netcdf): Update to 1.1.0. [build-system]: Use pyproject-build-system, to simplify package. [description]: Style content and add links to referenced projects. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2279503d633..3ea2763b497 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1759,21 +1759,14 @@ NetCDF files can also be read and modified. Python-HDF4 is a fork of (define-public python-h5netcdf (package (name "python-h5netcdf") - (version "1.0.1") + (version "1.1.0") (source (origin (method url-fetch) (uri (pypi-uri "h5netcdf" version)) (sha256 - (base32 "1b2dcgf5rwy7pb7hr4prkc5vgcw9qc2was20dmnj90lbrpx08rvp")))) - (build-system python-build-system) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-vv" "h5netcdf/tests"))))))) + (base32 "0mmzfr6k55zqxxpb64gvdqisak8s1zb2r04yzkmp0wzd7dbknb4k")))) + (build-system pyproject-build-system) (native-inputs (list python-netcdf4 python-pytest @@ -1782,9 +1775,11 @@ NetCDF files can also be read and modified. Python-HDF4 is a fork of (list python-h5py python-packaging)) (home-page "https://h5netcdf.org") (synopsis "Python interface for the netCDF4 file-format based on h5py") - (description "This package provides Python interface for the netCDF4 -file-format that reads and writes local or remote HDF5 files directly via h5py -or h5pyd, without relying on the Unidata netCDF library") + (description "This package provides a Python interface for the netCDF4 +file-format that reads and writes local or remote HDF5 files directly via +@url{h5py, https://www.h5py.org/} or @url{h5pyd, +https://github.com/HDFGroup/h5pyd}, without relying on the Unidata netCDF +library.") (license license:bsd-3))) (define-public python-h5py -- cgit v1.3 From 7833acab0da02335941974608510c02e2d1d8069 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 21 Dec 2022 11:17:44 +0100 Subject: gnu: pyzo: Update to 4.12.4. * gnu/packages/python-xyz.scm (pyzo): Update to 4.12.4. --- 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 3ea2763b497..ee25a2d655f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27002,17 +27002,17 @@ accessor layer.") (define-public pyzo (package (name "pyzo") - (version "4.12.3") + (version "4.12.4") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/pyzo/pyzo.git") + (url "https://github.com/pyzo/pyzo") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0v6rgp52bf9za2spxx9c1yc6wmskvlsj81iw0gipjy7y8vpypgn2")))) + "10qqilbh7n4z2656qbr9gllvgi7xq11xcm2bv64h02jmkb7m4m6n")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.3 From bae13578f7b03735c1cfcd1addb31a05fa413c44 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 24 Dec 2022 00:43:20 +0100 Subject: gnu: python-scikit-build: Depend on 'git-minimal/fixed'. * gnu/packages/python-xyz.scm (python-scikit-build)[native-inputs]: Replace 'git-minimal' with 'git-minimal/fixed'. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ee25a2d655f..6b71d6872e7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28550,7 +28550,7 @@ and frame grabber interface.") (native-inputs (list cmake-minimal gfortran - git-minimal + git-minimal/fixed ;for tests ninja python-coverage python-cython -- cgit v1.3 From 0cb8f7125b19264b01962c1249c3df4c5ce85aa9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 27 Dec 2022 21:46:46 +0100 Subject: gnu: python-bitarray: Update to 2.6.1. * gnu/packages/python-xyz.scm (python-bitarray): Update to 2.6.1. [arguments]: Override check phase. --- gnu/packages/python-xyz.scm | 14 ++++++++++++-- 1 file changed, 12 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 6b71d6872e7..d0cedf696a0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1675,14 +1675,24 @@ and a list of words that are easier to remember for humans (the (define-public python-bitarray (package (name "python-bitarray") - (version "1.4.0") + (version "2.6.1") (source (origin (method url-fetch) (uri (pypi-uri "bitarray" version)) (sha256 (base32 - "177fj6wbw5jln54wpp6plcqy2329wjkwqwvgz7022rrg3xfrq49g")))) + "0c4jli872nzix81n1xirnrghlq2fdsxb570d9rnfvxi1694sah44")))) (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Step out of the source directory to avoid interference. + (with-directory-excursion "/tmp" + (invoke "python" "-c" + "import bitarray; bitarray.test()")))))))) (home-page "https://github.com/ilanschnell/bitarray") (synopsis "Efficient arrays of booleans") (description "This package provides an object type which efficiently -- cgit v1.3 From a09f28758af24e947f9daaf549740e52af111941 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Fri, 23 Dec 2022 18:47:42 +0000 Subject: gnu: glances: Update to 3.3.0.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (glances): Update to 3.3.0.4. [propagated-inputs]: Add python-defusedxml and python-packaging. Signed-off-by: 宋文武 --- 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 d0cedf696a0..2b28e8bd53e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18889,13 +18889,13 @@ numbers, real numbers, mixed types and more, and comes with a shell command (define-public glances (package (name "glances") - (version "3.1.7") + (version "3.3.0.4") (source (origin (method url-fetch) (uri (pypi-uri "Glances" version)) (sha256 - (base32 "020vb38qrb0m3sdr7xjr43cmcfxpnyg4hmb97wgxsa9zvwsjwa5x")) + (base32 "0klyyxqc7cbrf1i741304i3rrwan19qm2v58xmrlgqsmxac542la")) (modules '((guix build utils))) (snippet '(begin @@ -18909,7 +18909,7 @@ numbers, real numbers, mixed types and more, and comes with a shell command #t)))) (build-system python-build-system) (propagated-inputs - (list python-future python-psutil)) + (list python-defusedxml python-future python-packaging python-psutil)) (home-page "https://github.com/nicolargo/glances") (synopsis "Cross-platform curses-based monitoring tool") (description -- cgit v1.3 From 1115bd7f9635ef630de18061e0415b1eb36409b2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 29 Dec 2022 22:20:30 +0100 Subject: gnu: python-dogtail: Use the test-only Xorg server variant. * gnu/packages/python-xyz.scm (python-dogtail)[native-inputs]: Change from XORG-SERVER to XORG-SERVER-FOR-TESTS. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2b28e8bd53e..b0d0c097703 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3160,7 +3160,7 @@ Prefix) - Encode and decode data structures.") (native-inputs `(("python-nose" ,python-nose) ("gtk+" ,gtk+) - ("xvfb" ,xorg-server) + ("xvfb" ,xorg-server-for-tests) ("dbus" ,dbus) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gobject-introspection" ,gobject-introspection))) -- cgit v1.3 From aa1f9cb4b56c8d455b24b2eb840debb99ead0289 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 29 Dec 2022 22:21:35 +0100 Subject: gnu: python-dogtail: Remove input labels. * gnu/packages/python-xyz.scm (python-dogtail)[native-inputs]: Remove labels. --- gnu/packages/python-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b0d0c097703..3bdd1e00d66 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3158,12 +3158,12 @@ Prefix) - Encode and decode data structures.") (propagated-inputs (list python-pygobject python-pycairo python-pyatspi)) (native-inputs - `(("python-nose" ,python-nose) - ("gtk+" ,gtk+) - ("xvfb" ,xorg-server-for-tests) - ("dbus" ,dbus) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gobject-introspection" ,gobject-introspection))) + (list python-nose + gtk+ + xorg-server-for-tests + dbus + gsettings-desktop-schemas + gobject-introspection)) (home-page "https://gitlab.com/dogtail/dogtail/") (synopsis "GUI test tool and automation framework written in Python") (description -- cgit v1.3 From f84f676404d90b3e8df1e1c79d186eaf1ca9b88a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 2 Jan 2023 10:22:20 -0500 Subject: gnu: Add python-docx. * gnu/packages/python-xyz.scm (python-docx): New variable. --- gnu/packages/python-xyz.scm | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3bdd1e00d66..9526447a2ab 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -52,7 +52,7 @@ ;;; Copyright © 2018-2022 Nicolas Goaziou ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018, 2019, 2021 Clément Lassieur -;;; Copyright © 2018, 2019, 2020, 2021, 2022 Maxim Cournoyer +;;; Copyright © 2018, 2019, 2020, 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2018 Luther Thompson ;;; Copyright © 2018 Vagrant Cascadian ;;; Copyright © 2015, 2018 Pjotr Prins @@ -4885,6 +4885,31 @@ via commands such as @command{rst2man}, as well as supporting Python code.") ;; tests contain Python 2 syntax. (arguments '(#:tests? #false)))) +(define-public python-docx + (package + (name "python-docx") + (version "0.8.11") + (source (origin + (method url-fetch) + (uri (pypi-uri "python-docx" version)) + (sha256 + (base32 + "1i7bxghb7knlyjain101qg1jmmz2b6qj03bi3vfxhvcml0rx418i")))) + (build-system pyproject-build-system) + (native-inputs + (list behave + python-flake8 + python-mock + python-pyparsing + python-pytest)) + (propagated-inputs + (list python-lxml)) + (home-page "https://github.com/python-openxml/python-docx/") + (synopsis "Python library to create and modify Microsoft Word documents") + (description "This Python library can be used to create and update +Microsoft Word (.docx) documents.") + (license license:expat))) + (define-public python-restructuredtext-lint (package (name "python-restructuredtext-lint") -- cgit v1.3 From e06c150662ebd96fbaee8a7d7494152e3e93ed0b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Jan 2023 22:04:35 +0100 Subject: gnu: python-numcodecs: Do not use python-typing-extensions-next. * gnu/packages/python-xyz.scm (python-numcodecs)[propagated-inputs]: Replace python-typing-extensions-next with python-typing-extensions. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9526447a2ab..d0b54443af1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23569,7 +23569,7 @@ tool).") (list python-entrypoints python-numpy python-msgpack - python-typing-extensions-next)) + python-typing-extensions)) (native-inputs (list python-cython python-pytest python-setuptools-scm)) (home-page "https://github.com/zarr-developers/numcodecs") -- cgit v1.3 From edbacab9953144a3aa204f9f0eee1584ef321a8f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 7 Jan 2023 14:11:55 +0100 Subject: gnu: Use old setuptools in packages that relies on use_2to3 conversion. This fixes a regression since 520cdf80581669646ff61e9f18f3b27045556e76 where the use_2to3 functionality was removed from setuptools. * gnu/packages/graph.scm (python-louvain)[native-inputs]: Change from PYTHON-SETUPTOOLS to PYTHON-SETUPTOOLS-57. * gnu/packages/python-check.scm (python-parameterizedtestcase)[native-inputs]: Likewise. * gnu/packages/python-xyz.scm (python-anyjson)[native-inputs]: Add PYTHON-SETUPTOOLS-57. * gnu/packages/bioinformatics.scm (python-pyvcf)[native-inputs]: Change from PYTHON-SETUPTOOLS-FOR-TENSORFLOW to PYTHON-SETUPTOOLS-57. --- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/graph.scm | 2 +- gnu/packages/python-check.scm | 2 +- gnu/packages/python-xyz.scm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a4583b06c07..5aafaa6df61 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -16782,7 +16782,7 @@ for the analysis and visualization of raw nanopore signal.") "/vcf/test"))))))) (native-inputs ;; Older setuptools is needed for use_2to3. - (list python-cython python-setuptools-for-tensorflow)) + (list python-cython python-setuptools-57)) (propagated-inputs (list python-pysam python-rpy2)) (home-page "https://github.com/jamescasbon/PyVCF") diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 52c63c86549..a2f771799f9 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -295,7 +295,7 @@ subplots, multiple-axes, polar charts, and bubble charts.") (base32 "0sx53l555rwq0z7if8agirjgw4ddp8r9b949wwz8vlig03sjvfmp")))) (build-system python-build-system) (native-inputs - (list python-setuptools)) ;for use_2to3 support + (list python-setuptools-57)) ;for use_2to3 support (propagated-inputs (list python-networkx python-numpy)) (home-page "https://github.com/taynaud/python-louvain") diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 486abf1c13d..7cb467c166c 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -2268,7 +2268,7 @@ Avocado machine readable outputs this one is streamlined (per test results). (sha256 (base32 "0zhjmsd16xacg4vd7zb75kw8q9khn52wvad634v1bvz7swaivk2c")))) (build-system python-build-system) - (native-inputs (list python-setuptools)) ;for use_2to3 + (native-inputs (list python-setuptools-57)) ;for use_2to3 (home-page "https://github.com/msabramo/python_unittest_parameterized_test_case") (synopsis "Parameterized tests for Python's unittest module") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d0b54443af1..df2c7ce52d6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15847,8 +15847,8 @@ fast xml and html manipulation.") ;; whatever) so this transformation needs to be done before the tests ;; can be run. Maybe we could add a build step to transform beforehand ;; but it could be annoying/difficult. - ;; We can enable tests for the Python 2 version, though, and do below. #:tests? #f)) + (native-inputs (list python-setuptools-57)) ;for use_2to3 support (home-page "https://bitbucket.org/runeh/anyjson/") (synopsis "Wraps best available JSON implementation in a common interface") -- cgit v1.3 From a6c005dbac90f3e22898c502bd32fdf86d61d38b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 7 Jan 2023 14:55:00 +0100 Subject: gnu: Remove python-pyev. This package fails to build, is no longer on PyPI, and has been inactive upstream for 10 years. * gnu/packages/python-xyz.scm (python-pyev): Remove variable. --- gnu/packages/python-xyz.scm | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index df2c7ce52d6..d78716107f1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19216,35 +19216,6 @@ working with Portable Executable (PE) files. It makes to most information from the header, as well as section details and data available.") (license license:expat))) -(define-public python-pyev - (package - (name "python-pyev") - (version "0.9.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pyev" version)) - (sha256 - (base32 - "0rf603lc0s6zpa1nb25vhd8g4y337wg2wyz56i0agsdh7jchl0sx")))) - (build-system python-build-system) - (arguments - `(#:tests? #f ; no test suite - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda* (#:key inputs #:allow-other-keys) - (let ((libev (search-input-file inputs "/lib/libev.so.4"))) - (substitute* "setup.py" - (("libev_dll_name = find_library\\(\\\"ev\\\"\\)") - (string-append "libev_dll_name = \"" libev "\""))))))))) - (inputs - (list libev)) - (home-page "https://github.com/gabrielfalcao/pyev") - (synopsis "Python libev interface") - (description "Pyev provides a Python interface to libev.") - (license license:gpl3))) - (define-public python-imagesize (package (name "python-imagesize") -- cgit v1.3 From ed59b32a40a590eb399de9a53be319c8eac77013 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 7 Jan 2023 15:03:47 +0100 Subject: gnu: python-pytidylib: Fix failing test. * gnu/packages/python-xyz.scm (python-pytidylib)[arguments]: Add phase. --- gnu/packages/python-xyz.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d78716107f1..3b202afcd17 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27145,6 +27145,12 @@ be necessary when using @code{cmd}.") (arguments '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-queue-import + (lambda _ + ;; Adjust Queue import for Python 3. Remove for versions >=0.4.0. + (substitute* "tests/threadsafety.py" + (("from Queue import Queue") + "from queue import Queue")))) (add-before 'build 'qualify-libtidy (lambda* (#:key inputs #:allow-other-keys) (let ((libtidy (search-input-file inputs "/lib/libtidy.so"))) -- cgit v1.3 From 09091b841bb83096a2f921fb6f5f03b19fe9cd14 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 7 Jan 2023 16:21:27 +0100 Subject: gnu: python-gyp: Update to 0.0.0-1.9d09418. * gnu/packages/python-xyz.scm (python-gyp): Update to 0.0.0-1.9d09418. --- gnu/packages/python-xyz.scm | 7 ++++--- 1 file changed, 4 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 3b202afcd17..014e7632d95 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22064,8 +22064,8 @@ filters can be used to process the data as it passes through.") (license license:asl2.0))) (define-public python-gyp - (let ((commit "5e2b3ddde7cda5eb6bc09a5546a76b00e49d888f") - (revision "0")) + (let ((commit "9d09418933ea2f75cc416e5ce38d15f62acd5c9a") + (revision "1")) (package (name "python-gyp") ;; Google does not release versions, @@ -22082,8 +22082,9 @@ filters can be used to process the data as it passes through.") (file-name (git-file-name name version)) (sha256 (base32 - "0fr7nxcrk292djmxzpcjaphnsd123k31gp8jnd91vwknhq6snmv9")))) + "0ay99rc5msqjpjl7fy1l69f8mvn08wnh2pgr08ijdih9z88xaa5x")))) (build-system python-build-system) + (propagated-inputs (list python-six)) (home-page "https://gyp.gsrc.io/") (synopsis "GYP is a Meta-Build system") (description -- cgit v1.3 From 73b765d64bcc81e42da0843536580d9bcedd275e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 7 Jan 2023 16:53:57 +0100 Subject: gnu: python-whatever: Use pyproject-build-system. * gnu/packages/python-xyz.scm (python-whatever)[build-system]: Change to PYPROJECT-BUILD-SYSTEM. [arguments]: Remove. --- gnu/packages/python-xyz.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 014e7632d95..856b554114f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22106,13 +22106,7 @@ files, and Makefiles.") (file-name (git-file-name name version)) (sha256 (base32 "1q7ajgqjfivxqsqgnhp4lc4p6jxyh4zprcsdbpd6dw54inaf0av5")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "py.test")))))) + (build-system pyproject-build-system) (native-inputs (list python-pytest)) (home-page "https://github.com/Suor/whatever") -- cgit v1.3 From 998c8db2a57e6cc081972d3f49217bd031b2bf4d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 7 Jan 2023 16:54:53 +0100 Subject: gnu: python-funcy: Use pyproject-build-system. * gnu/packages/python-xyz.scm (python-funcy)[build-system]: Change to PYPROJECT-BUILD-SYSTEM. [arguments]: Remove. --- gnu/packages/python-xyz.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 856b554114f..bab4a907ac8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22128,13 +22128,7 @@ functions by partial application of operators.") (sha256 (base32 "1s98vkjnq3zq71737hn8xa15kssvmy1sfzsll3vrlv53902418mw")) (file-name (git-file-name name version)))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "py.test")))))) + (build-system pyproject-build-system) (native-inputs (list python-pytest python-whatever)) (home-page "https://github.com/Suor/funcy") -- cgit v1.3 From 7dbc7f6ca3eb97388f4db218e015dbeca6fef49a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 5 Dec 2022 23:48:14 +0000 Subject: gnu: python-jsonschema-next: Simplify package. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To have this package on the latest version Guix needs to have new Python build procedure with Hatch https://hatch.pypa.io/. * gnu/packages/python-xyz.scm (python-jsonschema-next): [build-system]: Use pyproject-build-system to simplify package. [native-inputs]: Remove python-pypa-build. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bab4a907ac8..fe82775ceab 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3931,6 +3931,8 @@ compare, diff, and patch JSON and JSON-like structures in Python.") (define-public python-jsonschema-next (package (inherit python-jsonschema) + ;; XXX: Update to the latest version requires new build system - Hatch + ;; https://hatch.pypa.io/ (version "4.5.1") (source (origin @@ -3938,25 +3940,9 @@ compare, diff, and patch JSON and JSON-like structures in Python.") (uri (pypi-uri "jsonschema" version)) (sha256 (base32 "1z0x22691jva7lwfcfh377jdmlz68zhiawxzl53k631l34k8hvbw")))) - (arguments - (substitute-keyword-arguments (package-arguments python-jsonschema) - ((#:phases phases) - #~(modify-phases #$phases - ;; XXX: PEP 517 manual build/install procedures copied from - ;; python-isort. - (replace 'build - (lambda _ - ;; ZIP does not support timestamps before 1980. - (setenv "SOURCE_DATE_EPOCH" "315532800") - (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((whl (car (find-files "dist" "\\.whl$")))) - (invoke "pip" "--no-cache-dir" "--no-input" - "install" "--no-deps" "--prefix" #$output whl)))))))) - (native-inputs (list python-pypa-build - python-setuptools-scm - python-twisted)) + (build-system pyproject-build-system) + (native-inputs + (list python-setuptools-scm python-twisted)) (propagated-inputs (list python-attrs python-importlib-metadata -- cgit v1.3 From 10befaafca7ca5acd07b1b46920bc28076bcb5a3 Mon Sep 17 00:00:00 2001 From: jgart Date: Sat, 10 Dec 2022 20:11:09 -0600 Subject: gnu: python-proselint: Use official home page URL. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-proselint): [home-page]: Use official home page URL. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index fe82775ceab..8e503b2e44d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18089,7 +18089,7 @@ characters, mouse support, and auto suggestions.") (setenv "HOME" "/tmp")))))) (propagated-inputs (list python-click python-future python-six)) - (home-page "https://github.com/amperser/proselint") + (home-page "http://proselint.com/") (synopsis "Linter for prose") (description "@code{python-proselint} is a linter for English prose, that scans through a file and detects issues.") -- cgit v1.3 From ad6d10ac853367ea76352827787a7b0411da0452 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 3 Dec 2022 10:31:42 +0100 Subject: gnu: Add python-omegaconf. * gnu/packages/python-xyz.scm (python-omegaconf): New variable. --- gnu/packages/python-xyz.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8e503b2e44d..32d826d3c5f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -193,6 +193,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages image-processing) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages java) #:use-module (gnu packages jupyter) #:use-module (gnu packages kerberos) #:use-module (gnu packages libevent) @@ -14500,6 +14501,46 @@ config files.") (home-page "https://github.com/DiffSK/configobj") (license license:bsd-3))) +(define-public python-omegaconf + (package + (name "python-omegaconf") + (version "2.2.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/omry/omegaconf") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet #~(begin + (delete-file-recursively "build_helpers/bin") + (substitute* "build_helpers/build_helpers.py" + (("java") "antlr4") + (("\"-jar\",") "") + (("str\\(build_dir / \"bin\" / \"antlr.*\"\\),") "")))) + (sha256 + (base32 + "00rw1rkjycn0jdg3jmar6jdxb1pcb21jclm5g1921s9z8f5ii5dh")))) + (build-system pyproject-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'loosen-requirements + (lambda _ + (substitute* "requirements/base.txt" + (("antlr4-python3-runtime==") + "antlr4-python3-runtime>="))))))) + (propagated-inputs (list java-antlr4-runtime-python + python-pydevd + python-pyyaml)) + (native-inputs (list icedtea antlr4 python-pytest python-pytest-mock)) + (home-page "https://github.com/omry/omegaconf") + (synopsis "Flexible configuration system") + (description "OmegaConf is a hierarchical configuration system and +supports merging configurations from multiple sources. It provides a +consistent API regardless of how the configuration was created.") + (license license:bsd-3))) + (define-public python-configargparse (package (name "python-configargparse") -- cgit v1.3 From 245152c364aa91a9de53dea4e2a2689b8b8f5a87 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sat, 14 Jan 2023 22:28:04 +0000 Subject: gnu: python-pint: Update to 0.20.1. * gnu/packages/python-xyz.scm (python-pint): Update to 0.20.1. Signed-off-by: Maxim Cournoyer --- 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 32d826d3c5f..c91561e7872 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -965,13 +965,13 @@ Markdown. All extensions are found under the module namespace of pymdownx.") (define-public python-pint (package (name "python-pint") - (version "0.19.2") + (version "0.20.1") (source (origin (method url-fetch) (uri (pypi-uri "Pint" version)) (sha256 (base32 - "1bsbiikm9i4saqc6mc3minkmrgnsgcg734agsvd7icqhyngrim71")))) + "0rv0cbala7ibjbaf6kkcn0mdhqdbajnvlcw0f15gwzfwg10g0z1q")))) (build-system python-build-system) (native-inputs (list python-pytest -- cgit v1.3 From bc61a788b385d88b1365327bb11ece77fe5169b3 Mon Sep 17 00:00:00 2001 From: Peter Polidoro Date: Tue, 13 Dec 2022 15:39:05 -0500 Subject: gnu: python-pyserial-asyncio: Update to 0.6. * gnu/packages/python-xyz.scm (python-pyserial-asyncio): Update to 0.6. Signed-off-by: Christopher Baines --- 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 c91561e7872..c9d9d2e672c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18350,13 +18350,13 @@ etc.") (define-public python-pyserial-asyncio (package (name "python-pyserial-asyncio") - (version "0.5") + (version "0.6") (source (origin (method url-fetch) (uri (pypi-uri "pyserial-asyncio" version)) (sha256 - (base32 "0cwd2cjz859v6jrm3y6hikfqjyhyfj5vhfjb8vvflvl6791yah8n")))) + (base32 "0bx3syngmq2j9mh81byzka1x4ilw8ac9mbx52zn7b7ayw0ijj0xn")))) (build-system python-build-system) (propagated-inputs (list python-pyserial)) (home-page "https://github.com/pyserial/pyserial-asyncio") -- cgit v1.3 From bdbe7cbe8169ffaa87f3e969c617fecb6db915a3 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 20 Dec 2022 16:09:52 +0100 Subject: gnu: python-greenlet: Update to 2.0.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-greenlet): Update to 2.0.1. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c9d9d2e672c..508984d671c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16985,13 +16985,13 @@ library. It can be used to act both as a TFTP client or TFTP server.") (define-public python-greenlet (package (name "python-greenlet") - (version "1.1.2") - (source (origin - (method url-fetch) - (uri (pypi-uri "greenlet" version)) - (sha256 - (base32 - "0jkln5bf6rq7dbvpv7ypin3pp9jqd2jr91yyxlnfcii3msj5w3z3")))) + (version "2.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "greenlet" version)) + (sha256 + (base32 "0rqgxp1fai0fcyv46nd1389mxvk3ccixgdkwws70xnk08ib05rj2")))) (build-system python-build-system) (home-page "https://greenlet.readthedocs.io/") (synopsis "Lightweight in-process concurrent programming") -- cgit v1.3 From 8803cb9eb9b78779ea440f21a7c65b0a62572ee3 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 20 Dec 2022 16:09:53 +0100 Subject: gnu: python-gevent: Update to 22.10.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-gevent): Update to 22.10.2. Signed-off-by: Ludovic Courtès --- 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 508984d671c..86ccc00bf78 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17028,13 +17028,13 @@ graphviz.") (define-public python-gevent (package (name "python-gevent") - (version "21.12.0") + (version "22.10.2") (source (origin (method url-fetch) (uri (pypi-uri "gevent" version)) (sha256 (base32 - "0kh9mmq811mzfgj60n64icybjp4ryjmfmy1vg7x92yrniibn92zl")) + "0ijwwm2yr7jgz8xs1rbvzj6gp7xw1pagf0i7g99b6dzffshiv80w")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.3 From 7a36e8e21809d05fdd011a0ce2ce7a83127c6679 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 20 Dec 2022 16:09:54 +0100 Subject: gnu: python-eventlet: Manage broken tests with nosetests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-eventlet): [arguments] Manage broken tests with nosetests. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 86ccc00bf78..acc6c051e92 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2876,15 +2876,14 @@ standard.") ;; getprotobyname is called. Thankfully there is an environment ;; variable to disable the greendns import, so use it: (setenv "EVENTLET_NO_GREENDNS" "yes"))) - (add-after 'unpack 'delete-broken-tests - (lambda _ - (delete-file "tests/greendns_test.py") - (delete-file "tests/socket_test.py"))) - ;; See https://github.com/eventlet/eventlet/issues/562#issuecomment-714183009 (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (invoke "nosetests" "-v" "tests/"))))))) + (invoke + "nosetests" + "-v" "tests/" + "-I" "greendns_test.py" + "-I" "socket_test.py"))))))) (home-page "https://eventlet.net") (synopsis "Concurrent networking library for Python") (description -- cgit v1.3 From f59df2f488061c68bb828470aef5c14811df4c4a Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 20 Dec 2022 16:09:55 +0100 Subject: gnu: python-eventlet: Exclude broken test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-eventlet): [arguments] Exclude broken test. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index acc6c051e92..b14c4ff0f35 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2883,7 +2883,8 @@ standard.") "nosetests" "-v" "tests/" "-I" "greendns_test.py" - "-I" "socket_test.py"))))))) + "-I" "socket_test.py" + "-e" "test_018b_http_10_keepalive_framing"))))))) (home-page "https://eventlet.net") (synopsis "Concurrent networking library for Python") (description -- cgit v1.3