From 579f31396dd8066c013cb3b6463e85dba5e84c52 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 21 Oct 2021 13:33:01 +0000 Subject: gnu: python-levenshtein: Update to 0.12.2. * gnu/packages/python-xyz.scm (python-levenshtein): Update to 0.12.2. --- 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 c335dea277..18f88fc1a7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18358,14 +18358,14 @@ (define-public python2-dirsync (define-public python-levenshtein (package (name "python-levenshtein") - (version "0.12.0") + (version "0.12.2") (source (origin (method url-fetch) (uri (pypi-uri "python-Levenshtein" version)) (sha256 (base32 - "1c9ybqcja31nghfcc8xxbbz9h60s9qi12b9hr4jyl69xbvg12fh3")))) + "1xj60gymwx1jl2ra9razx2wk8nb9cv1i7l8d14qsp8a8s7xra8yw")))) (build-system python-build-system) (home-page "https://github.com/ztane/python-Levenshtein") (synopsis "Fast computation of Levenshtein distance and string similarity") -- cgit v1.2.3 From 2f79308872482402d3a32174dbefbf3d6d40f727 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Oct 2021 20:38:42 +0200 Subject: gnu: Fix ‘this packages’ and some other niggles. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/crates-io.scm (rust-home-0.5)[description]: Fix ‘this packages’ typo. * gnu/packages/emacs-xyz.scm (emacs-ahg, emacs-cwl-mode)[description]: Likewise. * gnu/packages/python-check.scm (python-pytest-csv)[description]: Likewise. * gnu/packages/ocaml.scm (ocaml-syntax-shims)[description]: Likewise, and note which language. * gnu/packages/python-xyz.scm (python-recommonmark)[description]: Likewise, and work around ‘enabling you’. --- gnu/packages/crates-io.scm | 2 +- gnu/packages/emacs-xyz.scm | 4 ++-- gnu/packages/ocaml.scm | 4 ++-- gnu/packages/python-check.scm | 2 +- gnu/packages/python-xyz.scm | 4 ++-- gnu/packages/web.scm | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 089b9f456c..b8587e8084 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20512,7 +20512,7 @@ (define-public rust-home-0.5 (("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/brson/home") (synopsis "Shared definitions of home directories") - (description "This packages provides the definition of @code{home_dir} + (description "This package provides the definition of @code{home_dir} used by @command{cargo} and @command{rustup}, as well as functions to find the correct value of @samp{CARGO_HOME} and @samp{RUSTUP_HOME}.") (license (list license:expat license:asl2.0)))) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 31fe24057f..8ad35124ed 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1722,7 +1722,7 @@ (define-public emacs-ahg (home-page "https://bitbucket.org/agriggio/ahg") (synopsis "Emacs front-end for the Mercurial SCM") (description - "This packages provides a simple Emacs front-end for the Mercurial + "This package provides a simple Emacs front-end for the Mercurial Distributed @acronym{Source Control Management, SCM} system.") (license license:gpl3+)))) @@ -29509,7 +29509,7 @@ (define-public emacs-cwl-mode `(("emacs-yaml-mode" ,emacs-yaml-mode))) (home-page "https://github.com/tom-tan/cwl-mode") (synopsis "Emacs mode for @acronym{CWL, Common Workflow Language} files") - (description "This packages provides a major mode for editing + (description "This package provides a major mode for editing @acronym{CWL, Common Workflow Language} files.") (license license:gpl3+))) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 025bac691c..660bc44bc7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7262,8 +7262,8 @@ (define-public ocaml-syntax-shims (synopsis "Backport new syntax to older OCaml versions") (description - "This packages backports new features of the language to older -compilers, such as let+.") + "This package backports new language features such as @code{let+} to older +OCaml compilers.") (license license:expat))) (define-public ocaml-angstrom diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index f321d0b0f6..a13bd0baa4 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -120,7 +120,7 @@ (define-public python-pytest-csv ("python-six" ,python-six))) (home-page "https://github.com/nicoulaj/pytest-csv") (synopsis "CSV reporter for Pytest") - (description "This packages provides a plugin for Pytest that enables a + (description "This package provides a plugin for Pytest that enables a CSV output mode for Pytest. It can be enabled via the @option{--csv} option it adds to the Pytest command line interface (CLI).") (license license:gpl3+))) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 18f88fc1a7..eb9fcc310d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27044,8 +27044,8 @@ (define-public python-recommonmark (home-page "https://github.com/readthedocs/recommonmark") (synopsis "Docutils-compatibility bridge to CommonMark") (description - "This packages provides a docutils-compatibility bridge to CommonMark, -enabling you to write CommonMark inside of Docutils & Sphinx projects.") + "This package provides a docutils-compatibility bridge to CommonMark that +lets you write CommonMark inside of Docutils & Sphinx projects.") (license license:expat))) (define-public python-pyhull diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0fd9e865cb..7d7a3c4317 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -807,7 +807,7 @@ (define-public nginx-rtmp-module ;; The nginx source code is part of the module’s source. (format #t "decompressing nginx source code~%") (invoke "tar" "xvf" (assoc-ref inputs "nginx-sources") - ;; This packages's LICENSE file would be + ;; This package's LICENSE file would be ;; overwritten with the one from nginx when ;; unpacking the nginx source, so rename the nginx ;; one when unpacking. -- cgit v1.2.3 From b87fe805aa66851f17f56078cb0e94f7cc4525df Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 25 Oct 2021 10:38:21 +0200 Subject: gnu: python-peachpy: Make output deterministic. Fixes . This makes users of python-peachpy bit-reproducible, such as nnpack. * gnu/packages/patches/python-peachpy-determinism.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/python-xyz.scm (python-peachpy)[source]: Use it. Co-authored-by: Kyle Meyer --- gnu/local.mk | 1 + .../patches/python-peachpy-determinism.patch | 25 ++++++++++++++++++++++ gnu/packages/python-xyz.scm | 3 ++- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-peachpy-determinism.patch (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 2d52bba3ef..cfd608fa01 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1675,6 +1675,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-execnet-read-only-fix.patch \ %D%/packages/patches/python-flask-restful-werkzeug-compat.patch \ %D%/packages/patches/python-keras-integration-test.patch \ + %D%/packages/patches/python-peachpy-determinism.patch \ %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-flint-includes.patch \ diff --git a/gnu/packages/patches/python-peachpy-determinism.patch b/gnu/packages/patches/python-peachpy-determinism.patch new file mode 100644 index 0000000000..f326a4b6b0 --- /dev/null +++ b/gnu/packages/patches/python-peachpy-determinism.patch @@ -0,0 +1,25 @@ +Make PeachPy processes deterministic: + + https://github.com/Maratyszcza/PeachPy/issues/88 + https://issues.guix.gnu.org/50672 + +diff --git a/peachpy/name.py b/peachpy/name.py +index b6a03dc..412079d 100644 +--- a/peachpy/name.py ++++ b/peachpy/name.py +@@ -86,13 +86,13 @@ def add_scoped_name(self, scoped_name): + self.names[scope_name.name] = scope + else: + assert scope_name.name is None +- self.prenames.setdefault(scope_name.prename, set()) ++ self.prenames.setdefault(scope_name.prename, {}) + if subscoped_name: + for subscope in iter(self.prenames[scope_name.prename]): + if isinstance(subscope, Namespace) and subscope.scope_name is scope_name: + subscope.add_scoped_name(subscoped_name) + return +- self.prenames[scope_name.prename].add(scope) ++ self.prenames[scope_name.prename][scope] = None + + def assign_names(self): + # Step 1: assign names to symbols with prenames with no conflicts diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index eb9fcc310d..a7b1e0efe2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27118,7 +27118,8 @@ (define-public python-peachpy (file-name (git-file-name name version)) (sha256 (base32 - "1yy62k3cjr6556nbp651w6v4hzl7kz4y75wy2dfqgndgbnixskx2")))) + "1yy62k3cjr6556nbp651w6v4hzl7kz4y75wy2dfqgndgbnixskx2")) + (patches (search-patches "python-peachpy-determinism.patch")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From a56b000745029bc457f01ad87d2e36f83823337b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 27 Oct 2021 20:05:15 +0300 Subject: gnu: python-deprecated: Honor #:tests? flag. * gnu/packages/python-xyz.scm (python-deprecated)[arguments]: Adjust custom 'check phase to honor the #:tests? flag. --- gnu/packages/python-xyz.scm | 5 +++-- 1 file changed, 3 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 a7b1e0efe2..d5b21d8352 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4362,8 +4362,9 @@ (define-public python-deprecated (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ - (invoke "pytest")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest"))))))) (propagated-inputs `(("python-wrapt" ,python-wrapt))) (native-inputs -- cgit v1.2.3 From 014f1b607f1d88a8e733017afaca006545b7d99b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 27 Oct 2021 20:09:21 +0300 Subject: gnu: python-deprecated: Update to 1.2.13. * gnu/packages/python-xyz.scm (python-deprecated): Update to 1.2.13. --- 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 d5b21d8352..bd5a5c2d4a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4347,7 +4347,7 @@ (define-public python-bumpversion (define-public python-deprecated (package (name "python-deprecated") - (version "1.2.5") + (version "1.2.13") (source (origin (method git-fetch) @@ -4357,7 +4357,7 @@ (define-public python-deprecated (file-name (git-file-name name version)) (sha256 (base32 - "14909glxxwwc4b9qpz2b9jdriwzi5n65ichw85xqppap5f79wcwz")))) + "0v4ys9xr8lski2r98da99spsj6hjlnnqgnhhmyhrm66myiix885c")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From a239b1e678e0c6b21fa95105546e754e2eff8a5d Mon Sep 17 00:00:00 2001 From: Raphaël Mélotte Date: Tue, 19 Oct 2021 14:08:52 +0200 Subject: gnu: Add python-ijson. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-ijson): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bd5a5c2d4a..f12cca9757 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -110,6 +110,7 @@ ;;; Copyright © 2021 Pradana Aumars ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Sébastien Lerique +;;; Copyright © 2021 Raphaël Mélotte ;;; ;;; This file is part of GNU Guix. ;;; @@ -27606,3 +27607,38 @@ (define-public python-aspectlib code is desired. It includes tools for debugging and testing: simple mock/record and a complete capture/replay framework.") (license license:bsd-2))) + +(define-public python-ijson + (package + (name "python-ijson") + (version "3.1.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ijson" version)) + (sha256 + (base32 "1sp463ywj4jv5cp6hsv2qwiima30d09xsabxb2dyq5b17jp0640x")))) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; the tests run by the default setup.py require yajl 1.x, + ;; but we have 2.x. yajl 1.x support is going to be removed + ;; anyway, so use pytest to avoid running the yajl1-related + ;; tests. See: https://github.com/ICRAR/ijson/issues/55 + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) + (inputs + ;; libyajl is optional, but compiling with it makes faster + ;; backends available to ijson: + `(("libyajl", libyajl))) + (native-inputs + `(("python-pytest", python-pytest))) + (build-system python-build-system) + (home-page "https://github.com/ICRAR/ijson") + (synopsis "Iterative JSON parser with Python iterator interfaces") + (description + "Ijson is an iterative JSON parser with standard Python iterator +interfaces.") + (license license:bsd-3))) -- cgit v1.2.3