From aae5efb6d4f02f3f7007d83bdfc656de2cc55622 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 13 Feb 2022 15:34:34 +0100 Subject: gnu: python-psutil: Update to 5.9.0. * gnu/packages/python-xyz.scm (python-psutil): Update to 5.9.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 41b60325d2..00b4e2980a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -984,13 +984,13 @@ access the technical and tag data for video and audio files.") (define-public python-psutil (package (name "python-psutil") - (version "5.8.0") + (version "5.9.0") (source (origin (method url-fetch) (uri (pypi-uri "psutil" version)) (sha256 - (base32 "1immnj532bnnrh1qmk5q3lsw3san8qfk9kxy1cpmy0knmfcwp70c")))) + (base32 "09fa4vfhansixvxd3lv664xcrbnfdyfn53hm2wr0rf3bsvdl5646")))) (build-system python-build-system) (arguments ;; FIXME: some tests do not return and time out. Some tests fail because -- cgit v1.3 From 5e244cd712220b849538b37968226b117e138567 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 14 Feb 2022 23:32:14 +0100 Subject: gnu: python-drmaa: Fix build failure. * gnu/packages/python-xyz.scm (python-drmaa)[arguments]: Disable sanity checks. --- gnu/packages/python-xyz.scm | 7 ++++++- 1 file changed, 6 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 00b4e2980a..c67fd6ce71 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7792,7 +7792,12 @@ etc. The core of this module is a decorator factory.") ;; The test suite requires libdrmaa which is provided by the cluster ;; environment. At runtime the environment variable DRMAA_LIBRARY_PATH ;; should be set to the path of the libdrmaa library. - (arguments '(#:tests? #f)) + (arguments + '(#:tests? #f + #:phases (modify-phases %standard-phases + ;; Loading the library fails because DRMAA_LIBRARY_PATH + ;; is not configured. + (delete 'sanity-check)))) (native-inputs (list python-nose)) (home-page "https://pypi.org/project/drmaa/") -- cgit v1.3 From d21a7695e651171fcc500c671d869371ee599eeb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 14 Feb 2022 23:33:21 +0100 Subject: gnu: python-drmaa: Remove unused input. * gnu/packages/python-xyz.scm (python-drmaa)[native-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 c67fd6ce71..e0237ab86f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7798,8 +7798,6 @@ etc. The core of this module is a decorator factory.") ;; Loading the library fails because DRMAA_LIBRARY_PATH ;; is not configured. (delete 'sanity-check)))) - (native-inputs - (list python-nose)) (home-page "https://pypi.org/project/drmaa/") (synopsis "Python bindings for the DRMAA library") (description -- cgit v1.3 From f6350f003edd9864a6fc283b27cdf731ff9b5339 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 14 Feb 2022 23:50:04 +0100 Subject: gnu: python-pyelftools: Update to 0.28. * gnu/packages/python-xyz.scm (python-pyelftools): Update to 0.28. [source]: Change to GIT-FETCH. [source](snippet): New field. [arguments]: Override check phase. --- gnu/packages/python-xyz.scm | 26 +++++++++++++++++++------- 1 file changed, 19 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 e0237ab86f..f09c40fae8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17801,17 +17801,29 @@ multitouch applications.") (define-public python-pyelftools (package (name "python-pyelftools") - (version "0.25") + (version "0.28") + (home-page "https://github.com/eliben/pyelftools") (source (origin - (method url-fetch) - (uri (pypi-uri "pyelftools" version)) + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "090vdksbz341f7ljvr0zswblw4lspa8qaiikzyjkf318arpxmil9")))) + (base32 "1z4fx39c9rds0bd4d2fjjq7n05b1nfxl36pmy523x8knm38l4gpr")) + (snippet + ;; Delete bundled readelf executable. + '(delete-file "test/external_tools/readelf")))) (build-system python-build-system) - (home-page - "https://github.com/eliben/pyelftools") + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Taken from tox.ini. + (invoke "python" "test/run_all_unittests.py") + (invoke "python" "test/run_examples_test.py") + (invoke "python" "test/run_readelf_tests.py"))))))) (synopsis "Analyze binary and library file information") (description "This Python library provides interfaces for parsing and -- cgit v1.3 From 48daa39724487607f07c192e47a18834f1e65182 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 15 Feb 2022 00:13:08 +0100 Subject: gnu: python-argh: Fix test failure. * gnu/packages/python-xyz.scm (python-argh)[arguments]: Add patch-tests phase and override check phase. --- gnu/packages/python-xyz.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f09c40fae8..5c003e3c1a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24567,6 +24567,22 @@ itself.") (base32 "1p5h3dnpbsjmqrvil96s71asc6i3gpinmbrabqmwnrsxprz7r3ns")))) (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda _ + ;; Fix test failures on Python 3.9.9+. + ;; Taken via . + (substitute* "test/test_integration.py" + (("assert run\\(p, '(bar|orig-name|nest bar)', exit=True\\)\ +\\.startswith\\('invalid choice'\\)" _ name) + (string-append "assert 'invalid choice' in \ +run(p, '" name "', exit=True)"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) (propagated-inputs (list python-iocapture python-mock python-pytest python-pytest-cov python-pytest-xdist)) -- cgit v1.3 From da696ee165991f85e7c29665f38a481c52915ebd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 15 Feb 2022 15:18:22 -0500 Subject: gnu: python-robotframework-datadriver: Update to 1.6.0. * gnu/packages/python-xyz.scm (python-robotframework-datadriver): Update to 1.6.0. [phases]{fix-readme-file-name}: Delete phase. --- gnu/packages/python-xyz.scm | 7 ++----- 1 file changed, 2 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 5c003e3c1a..537403240d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4676,20 +4676,17 @@ process automation (RPA).") (define-public python-robotframework-datadriver (package (name "python-robotframework-datadriver") - (version "1.5.0") + (version "1.6.0") (source (origin (method url-fetch) (uri (pypi-uri "robotframework-datadriver" version)) (sha256 - (base32 "1kv6h47850gdqr8azknkh81z7hw6yz5pjn53mkn71ly4szw4pqb7")))) + (base32 "0qa2vry8jr49k5rbrvmkgggzsmis1wv06dp5dvwmp7afm7vjc51k")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-readme-file-name - (lambda _ - (rename-file "Readme.rst" "README.rst"))) (add-before 'check 'skip-problematic-tests (lambda _ ;; The test file 'tab-csv-file-name.tsv' contains special -- cgit v1.3 From d87c2db4f7923a9aeb4983c53b557f0b1c74c28f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 15 Feb 2022 21:54:13 +0100 Subject: gnu: python-moto: Disable flaky test. * gnu/packages/python-xyz.scm (python-moto)[arguments]: Skip one test. Don't use ADD-INSTALLED-PYTHONPATH while at it. [inputs]: Remove label, too. --- gnu/packages/python-xyz.scm | 10 ++++++---- 1 file changed, 6 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 537403240d..9a7b2d3890 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13994,13 +13994,15 @@ text.") (substitute* (find-files "tests" "\\.py$") (("#!/bin/bash") (string-append "#!" bash-exec)))))) (replace 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (lambda* (#:key tests? #:allow-other-keys) (when tests? - (add-installed-pythonpath inputs outputs) (invoke "pytest" "-vv" "-m" "not network" "-k" (string-append + ;; XXX: This test is timing sensitive and may + ;; fail non-deterministically. + "not test_cancel_pending_job" ;; These tests require Docker. - "not test_terminate_job" + " and not test_terminate_job" " and not test_invoke_function_from_sqs_exception" " and not test_rotate_secret_lambda_invocations" ;; These tests also require the network. @@ -14017,7 +14019,7 @@ text.") python-pytest python-sure)) (inputs - `(("bash" ,bash-minimal))) + (list bash-minimal)) (propagated-inputs (list python-aws-xray-sdk python-boto -- cgit v1.3 From 52269e27c628d34af896e95347870b1755cb3e5f Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Wed, 9 Feb 2022 09:57:08 -0500 Subject: gnu: Add python-miniupnpc * gnu/packages/python-xyz.scm (python-miniupnpc): New variable. Signed-off-by: Nicolas Goaziou --- 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 9a7b2d3890..9478b8a2bc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -229,6 +229,7 @@ #:use-module (gnu packages serialization) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix hg-download) #:use-module (guix gexp) @@ -3156,6 +3157,41 @@ server.") "@code{pafy} is a python library to retrieve YouTube content and metadata.") (license license:lgpl3+))) +(define-public python-miniupnpc + (package + (name "python-miniupnpc") + (version "2.2.3") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/miniupnp/miniupnp") + (commit + (string-append + "miniupnpc_" (string-replace-substring version "." "_"))))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "03q1rlzvfzm15g1bfw2zqzavlsyaypnaf2k3cz6ha7k5rirkdy0l")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'subdir + (lambda* (#:key inputs #:allow-other-keys) + (chdir "miniupnpc") + (setenv "CC" #$(cc-for-target)) + (substitute* "Makefile" + (("/bin/sh") (search-input-file inputs "/bin/sh")))))))) + (inputs (list python)) ;we are building a Python extension + (synopsis "UPnP client for Python") + (description "Miniupnpc is a client library for Python programs to set up +port forwards using @acronym{UPnP, Universal Plug and Play}.") + (home-page "http://miniupnp.free.fr") + (license license:bsd-3))) + (define-public python2-funcsigs (package (name "python2-funcsigs") -- cgit v1.3 From 0dc0d87839ccb7e85f99d7469da1ef478a1c8dc4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 28 Jan 2022 14:38:44 -0500 Subject: gnu: python-pyqtgraph: Remove a transitive dependency on QtWebKit. See for more information about this change. * gnu/packages/python-xyz.scm (python-pyqtgraph)[propagated-inputs]: Replace python-pyqt with python-pyqt-without-qtwebkit. --- 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 9478b8a2bc..21e6a7755b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14948,7 +14948,7 @@ ISO 8859, etc.).") (list qtbase-5)) (propagated-inputs (list python-h5py python-numpy python-pyopengl python-scipy - python-pyqt)) + python-pyqt-without-qtwebkit)) (home-page "http://www.pyqtgraph.org") (synopsis "Scientific graphics and GUI library for Python") (description -- cgit v1.3 From 142255d8259e3fbb41bcc517d83fa17b0ca2b82a Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Mon, 7 Feb 2022 13:05:37 +1100 Subject: gnu: python-regex: Update to 2022.1.18. * gnu/packages/python-xyz.scm (python-regex): Update to 2022.1.18. Signed-off-by: Nicolas Goaziou --- 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 21e6a7755b..13e2bd7e1f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20126,13 +20126,13 @@ class ShellOutSSHClientTests")))) (define-public python-regex (package (name "python-regex") - (version "2020.6.8") + (version "2022.1.18") (source (origin (method url-fetch) (uri (pypi-uri "regex" version)) (sha256 (base32 - "1b3k0zi1pd99q5mk7ri7vcx2y1mq5inm9hk8dryqyhrpkmh4xdp9")))) + "05ir92d0cmv8wkafn3r05j5q47l6shg7cpdblp2a8m407b02vwwp")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.3 From b731d34ed796ad3ca1cfba6e08369ffd6dcb57bf Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Mon, 7 Feb 2022 13:05:42 +1100 Subject: gnu: Remove python-dukpy, python2-dukpy. * gnu/packages/python-xyz.scm: Remove unused packages python-dukpy, python2-dukpy. This is actually not the 'dukpy' package in pypi either but something else made for calibre. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 13e2bd7e1f..8424065a1d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20547,32 +20547,6 @@ executed more than a given number of times during a given period.") (define-public python2-ratelimiter (package-with-python2 python-ratelimiter)) -(define-public python-dukpy - (package - (name "python-dukpy") - (version "0.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/kovidgoyal/dukpy") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "13h21nqzasv4zj32xs61brmc106pr2cx243672crcmwxxnjgaxls")))) - (build-system python-build-system) - (home-page "https://github.com/kovidgoyal/dukpy") - (synopsis "Run JavaScript in python") - (description - "dukpy is a JavaScript runtime environment for Python using the duktape -embeddable JavaScript engine.") - ;; Dukpy is licensed under MIT like the embedded duktape library, - ;; with 'errors.c' as GPL3. - (license (list license:expat license:gpl3)))) - -(define-public python2-dukpy - (package-with-python2 python-dukpy)) - (define-public python-jsonrpclib-pelix (package (name "python-jsonrpclib-pelix") -- cgit v1.3 From 76c30931ad5e9a2b3383c6e5315bb00e0c0aa3b6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Feb 2022 21:33:29 +0100 Subject: gnu: python-gridmap: Disable sanity check. * gnu/packages/python-xyz.scm (python-gridmap)[arguments]: Add #:phases. --- 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 8424065a1d..517648ecf7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7936,7 +7936,10 @@ you to actually draw things with your favorite toolkit.") (base32 "0v0sgpg6pz8h61f9aqjf5xk0ipr512bbz8dxzjjylksj135qr19l")))) (build-system python-build-system) (arguments - '(#:tests? #f)) ; FIXME: Requires python-cherrypy. + '(#:tests? #f ;FIXME: Requires python-cherrypy. + #:phases (modify-phases %standard-phases + ;; Importing the web server module requires cherrypy, too. + (delete 'sanity-check)))) (propagated-inputs (list python-psutil python-drmaa python-pyzmq)) (home-page "https://github.com/pygridtools/gridmap") -- cgit v1.3 From c4c45205a746a372df3f99ffc026971d010fdaf2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Feb 2022 21:38:57 +0100 Subject: gnu: Add python-beniget. * gnu/packages/python-xyz.scm (python-beniget): 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 517648ecf7..516fa4057f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14708,6 +14708,27 @@ It is maintained by the Celery project, and used by kombu as a pure python alternative when librabbitmq is not available.") (license license:lgpl2.1+))) +(define-public python-beniget + (package + (name "python-beniget") + (version "0.4.1") + (home-page "https://github.com/serge-sans-paille/beniget") + (source + (origin + (method url-fetch) + (uri (pypi-uri "beniget" version)) + (sha256 + (base32 "035c4f78yllpw2c5p1w92520rilm7nnpsqh7yvi3qmfhi8xlnmbm")))) + (build-system python-build-system) + (propagated-inputs + (list python-gast)) + (synopsis "Extract semantic information about static Python code") + (description + "Beniget is a collection of analyzers for Python @acronym{AST, +Abstract Syntax Tree}. It is a building block for writing a static analyzer +or compiler for Python.") + (license license:bsd-3))) + (define-public python-txamqp (package (name "python-txamqp") -- cgit v1.3 From 7eefff2054b94f8a7ad850ad8f36b8773bb39ce9 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 21 Feb 2022 10:35:45 +0100 Subject: gnu: python-nbconvert: Fix PDF generation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-nbconvert)[native-inputs]: Move texlive packages… [propagated-inputs]: …here. --- gnu/packages/python-xyz.scm | 69 +++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 34 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 516fa4057f..c560781582 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12762,39 +12762,7 @@ time.") ;;("python-pyppeteer" ,python-pyppeteer) ("python-pytest" ,python-pytest) ("python-pytest-cov" ,python-pytest-cov) - ("python-pytest-dependency" ,python-pytest-dependency) - ("texlive" ,(texlive-updmap.cfg (list texlive-adjustbox - texlive-amsfonts - texlive-booktabs - texlive-caption - texlive-enumitem - texlive-eurosym - texlive-fonts-rsfs - texlive-generic-iftex - texlive-jknappen - texlive-latex-amsmath - texlive-latex-fancyvrb - texlive-latex-float - texlive-fontspec - texlive-latex-geometry - texlive-grffile - texlive-hyperref - texlive-latex-jknapltx - texlive-latex-ms - texlive-oberdiek - texlive-latex-parskip - texlive-latex-trimspaces - texlive-latex-upquote - texlive-latex-ucs - texlive-lm - texlive-mathpazo - texlive-stringenc - texlive-tcolorbox - texlive-titling - texlive-tools - texlive-ulem - texlive-xcolor - texlive-zapfding))))) + ("python-pytest-dependency" ,python-pytest-dependency))) (propagated-inputs (list python-bleach python-defusedxml @@ -12810,7 +12778,40 @@ time.") python-testpath python-traitlets ;; Required, even if [serve] is not used. - python-tornado-6)) + python-tornado-6 + ;; Required at runtime for `jupyter nbconvert --to=pdf`. + (texlive-updmap.cfg (list texlive-adjustbox + texlive-amsfonts + texlive-booktabs + texlive-caption + texlive-enumitem + texlive-eurosym + texlive-fonts-rsfs + texlive-generic-iftex + texlive-jknappen + texlive-latex-amsmath + texlive-latex-fancyvrb + texlive-latex-float + texlive-fontspec + texlive-latex-geometry + texlive-grffile + texlive-hyperref + texlive-latex-jknapltx + texlive-latex-ms + texlive-oberdiek + texlive-latex-parskip + texlive-latex-trimspaces + texlive-latex-upquote + texlive-latex-ucs + texlive-lm + texlive-mathpazo + texlive-stringenc + texlive-tcolorbox + texlive-titling + texlive-tools + texlive-ulem + texlive-xcolor + texlive-zapfding)))) (home-page "https://jupyter.org") (synopsis "Converting Jupyter Notebooks") (description "The @code{nbconvert} tool, @{jupyter nbconvert}, converts -- cgit v1.3 From 83bcb4912eca1bf3a47dedb591cdc02f5e09a10b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 21 Jan 2022 02:44:20 -0500 Subject: gnu: Add python-pyfuse3. * gnu/packages/python-xyz.scm (python-pyfuse3): New variable. --- gnu/packages/python-xyz.scm | 22 +++++++++++++++++++++- 1 file changed, 21 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 c560781582..33e7de1606 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2015, 2016, 2020 Christine Lemmer-Webber ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2015, 2016 David Thompson -;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari +;;; Copyright © 2015, 2016, 2017, 2019, 2022 Leo Famulari ;;; Copyright © 2015, 2017 Ben Woodcroft ;;; Copyright © 2015, 2016 Erik Edrosa ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner @@ -28998,3 +28998,23 @@ multipurpose analysis in Python.") "This packages provides a collection of library stubs for Python, with static types.") (license license:asl2.0))) + +(define-public python-pyfuse3 + (package + (name "python-pyfuse3") + (version "3.2.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyfuse3" version)) + (sha256 + (base32 "0cvybynv9igssfa4l13q09gb6m7afmwk34wsbq8jk14sqpd4dl92")))) + (build-system python-build-system) + (native-inputs (list pkg-config)) + (inputs (list fuse-3)) + (propagated-inputs (list python-pytest-trio)) + (home-page "https://github.com/libfuse/pyfuse3") + (synopsis "Python bindings FUSE 3") + (description "This package provides Python 3 bindings for libfuse 3 with +async I/O support.") + (license license:gpl2+))) -- cgit v1.3 From aef87f82c2293bd06bd90dee214df46b51bdf734 Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Wed, 26 Jan 2022 22:57:27 -0500 Subject: gnu: Remove python2-defusedxml. * gnu/packages/xml.scm (python2-defused): Remove variable. Signed-off-by: Maxim Cournoyer --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 33e7de1606..96448fc29b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17543,9 +17543,6 @@ multitouch applications.") ;; number of files with other licenses. (list license:gpl2+ license:asl2.0 license:lgpl2.1+ license:cc-by-sa3.0)))) -(define-public python2-odfpy - (package-with-python2 python-odfpy)) - (define-public python-natsort (package (name "python-natsort") -- cgit v1.3 From c88c267f44d361d29ef3dd1fa3c2ee8f04a6baa7 Mon Sep 17 00:00:00 2001 From: Pierre-Henry Fröhring Date: Sun, 6 Feb 2022 09:16:05 +0100 Subject: gnu: Add python-types-ujson. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-types-ujson): New variable. Signed-off-by: Ludovic Courtès --- 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 96448fc29b..c05502388e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29015,3 +29015,22 @@ static types.") (description "This package provides Python 3 bindings for libfuse 3 with async I/O support.") (license license:gpl2+))) + +(define-public python-types-ujson + (package + (name "python-types-ujson") + (version "4.2.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "types-ujson" version)) + (sha256 + (base32 + "0k9n9hsq4k2zaakdwbkcsvi7m8d3mv2y9yl6f171y58ld4qpcxcy")))) + (build-system python-build-system) + (home-page "https://github.com/python/typeshed") + (synopsis "Typing stubs for ujson") + (description + "This is a PEP 561 type stub package for the ujson package. It can be +used by type-checking tools like mypy, PyCharm, pytype etc. to check code that +uses ujson.") + (license license:asl2.0))) -- cgit v1.3 From 5a04a8a6bce81ddbd65c3e13dc83a7941521044e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 2 Mar 2022 18:28:40 +0100 Subject: gnu: texlive-latex-wrapfig: Rename to "texlive-wrapfig". * gnu/packages/tex.scm (texlive-latex-wrapfig): Rename to... (texlive-wrapfig): ... this. (texlive-latex-wrapfig): Define as deprecated. * gnu/packages/maths.scm (hypre)[native-inputs]: Use new name. * gnu/packages/python-xyz.scm (python-ipython-documentation) (python-numpy-documentation): Likewise. --- gnu/packages/maths.scm | 2 +- gnu/packages/python-xyz.scm | 6 +++--- gnu/packages/tex.scm | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 70b0d76ea5..16050f8840 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5414,7 +5414,7 @@ set.") texlive-latex-varwidth texlive-ulem texlive-wasysym - texlive-latex-wrapfig))))) + texlive-wrapfig))))) (inputs `(("blas" ,openblas) ("lapack" ,lapack))) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c05502388e..d3d7b7160d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès +;;; Copyright © 2013-2022 Ludovic Courtès ;;; Copyright © 2013, 2014, 2015, 2016, 2019 Andreas Enge ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2014, 2017, 2021 Eric Bavier @@ -5899,7 +5899,7 @@ readable format.") texlive-latex-upquote texlive-url texlive-latex-varwidth - texlive-latex-wrapfig))) + texlive-wrapfig))) ("texinfo" ,texinfo) ("perl" ,perl) ("scipy-sphinx-theme" @@ -9001,7 +9001,7 @@ computing.") texlive-latex-upquote texlive-url texlive-latex-varwidth - texlive-latex-wrapfig))) + texlive-wrapfig))) ("texinfo" ,texinfo))))) (define-public python-urwid diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 758ec601b7..c430e9968c 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7108,9 +7108,9 @@ implements an easy to use interface for these symbols.") (define-deprecated-package texlive-latex-wasysym texlive-wasysym) -(define-public texlive-latex-wrapfig +(define-public texlive-wrapfig (package - (name "texlive-latex-wrapfig") + (name "texlive-wrapfig") (version (number->string %texlive-revision)) (source (origin (method svn-fetch) @@ -7142,6 +7142,8 @@ It does not work in combination with list environments, but can be used in a @code{parbox} or @code{minipage}, and in two-column format.") (license license:lppl))) +(define-deprecated-package texlive-latex-wrapfig texlive-wrapfig) + (define-public texlive-latex-ucs (package (name "texlive-latex-ucs") -- cgit v1.3 From b16e17f34c8803ac8510cfbc6f5d766e1e564939 Mon Sep 17 00:00:00 2001 From: Evgeny Pisemsky Date: Fri, 11 Feb 2022 19:55:13 +0300 Subject: gnu: Add python-stltools. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-stltools): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d3d7b7160d..8b51bfb3d1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -116,6 +116,7 @@ ;;; Copyright © 2021 Greg Hogan ;;; Copyright © 2022 John Kehayias ;;; Copyright © 2022 Aleksandr Vityazev +;;; Copyright © 2022 Evgeny Pisemsky ;;; ;;; This file is part of GNU Guix. ;;; @@ -29034,3 +29035,49 @@ async I/O support.") used by type-checking tools like mypy, PyCharm, pytype etc. to check code that uses ujson.") (license license:asl2.0))) + +(define-public python-stltools + (package + (name "python-stltools") + (version "2022.01.20") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rsmith-nl/stltools") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1k6dhszza4lpy46qffaqx5zr70ikfqqysbacy7zabnrvz09fd4rs")))) + (build-system python-build-system) + (arguments + `(#:use-setuptools? #f + #:phases + (modify-phases %standard-phases + (delete 'build) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((moddir (string-append (site-packages inputs outputs) "/stltools")) + (bindir (string-append (assoc-ref outputs "out") "/bin"))) + (copy-recursively "stltools" moddir) + (mkdir-p bindir) + (for-each + (lambda (script) + (let ((source (string-append script ".py")) + (target (string-append bindir "/" script))) + (copy-file source target) + (chmod target #o555))) + '("stl2pov" "stl2ps" "stl2pdf" "stlinfo"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "py.test" "-v"))))))) + (propagated-inputs (list python-pycairo)) + (native-inputs (list python-pytest)) + (home-page "https://github.com/rsmith-nl/stltools") + (synopsis "Python modules and scripts for handling STL files") + (description "This package consists of Python modules and scripts for +manipulating stereolithography (STL) files. It can convert STL files into +POV-ray meshes, PDF and PostScript. The Python modules allow for reading and +writing STL files. It supports both the text and binary forms of STL.") + (license license:expat))) -- cgit v1.3 From afb9f2752315f131e4ddd44eba02eed403365085 Mon Sep 17 00:00:00 2001 From: Алексей Дроздов Date: Fri, 21 Jan 2022 14:00:08 +0300 Subject: gnu: Add python-xmldiff. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-xmldiff): New variable. Co-authored-by: Ludovic Courtès --- 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 8b51bfb3d1..38659e3209 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -117,6 +117,7 @@ ;;; Copyright © 2022 John Kehayias ;;; Copyright © 2022 Aleksandr Vityazev ;;; Copyright © 2022 Evgeny Pisemsky +;;; Copyright © 2022 drozdov ;;; ;;; This file is part of GNU Guix. ;;; @@ -242,6 +243,24 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) +(define-public python-xmldiff + (package + (name "python-xmldiff") + (version "2.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "xmldiff" version)) + (sha256 + (base32 "0qygxi3z1jwb0471k7bh5gcqf7wqm4xhrkmwhf36gjgjw46a5gh5")))) + (build-system python-build-system) + (propagated-inputs (list python-lxml python-six)) + (home-page "https://github.com/Shoobx/xmldiff") + (synopsis "Creates diffs of XML files") + (description "This Python tool figures out the differences between two +similar XML files, in the same way the @command{diff} utility does it.") + (license license:expat))) + (define-public python-janus (package (name "python-janus") -- cgit v1.3 From ad464b1704d21ef59c91c1ab6935af4b34efd5c5 Mon Sep 17 00:00:00 2001 From: Pierre-Henry Fröhring Date: Mon, 24 Jan 2022 18:34:33 +0100 Subject: gnu: Add python-multipart. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-multipart): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 38659e3209..2500ffa7ac 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29100,3 +29100,30 @@ manipulating stereolithography (STL) files. It can convert STL files into POV-ray meshes, PDF and PostScript. The Python modules allow for reading and writing STL files. It supports both the text and binary forms of STL.") (license license:expat))) + +(define-public python-multipart + (package + (name "python-multipart") + (version "0.0.5") + (source (origin + (method url-fetch) + (uri (pypi-uri "python-multipart" version)) + (sha256 + (base32 + "0hzshd665rl1bkwvaj9va4j3gs8nmb478fbvligx20663xhmzfzp")))) + (build-system python-build-system) + (propagated-inputs (list python-six)) + (native-inputs (list python-pyyaml python-mock python-pytest-cov)) + (arguments + `(#:phases (modify-phases %standard-phases + ;; There is a bug in the test_suit specification. + (add-after 'unpack 'patch-test-suite + (lambda _ + (substitute* "setup.py" + (("test_suite = 'multipart.tests.suite'") + "test_suite = 'multipart.tests.test_multipart.suite'"))))))) + (home-page "https://github.com/andrew-d/python-multipart") + (synopsis "Streaming multipart parser for Python") + (description + "This package provides a streaming multipart parser for Python.") + (license license:asl2.0))) -- cgit v1.3 From 7f212c550457747861fa477ba3a1737339ddb6d0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 8 Mar 2022 17:33:59 -0500 Subject: gnu: python-robotframework: Update to 4.1.3. * gnu/packages/python-xyz.scm (python-robotframework): Update to 4.1.3. [phases]{check}: Honor TESTS?. Search tzdata in both native-inputs or inputs, for cross-compilation. --- gnu/packages/python-xyz.scm | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2500ffa7ac..dcb36a55bd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4677,7 +4677,7 @@ ecosystem, but can naturally be used also by other projects.") (define-public python-robotframework (package (name "python-robotframework") - (version "4.1.2") + (version "4.1.3") ;; There are no tests in the PyPI archive. (source (origin @@ -4687,7 +4687,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 "0s6lakbd8h1pa4lfdj18sm13gpywszgpcns4hz026a4kam787kby")) + (base32 "0j71awmfkwk7prz82kr1zbcl3nrih3396sshrygnqlrdjmgivd3p")) (patches (search-patches "python-robotframework-source-date-epoch.patch")))) (build-system python-build-system) @@ -4703,23 +4703,25 @@ ecosystem, but can naturally be used also by other projects.") (copy-recursively "doc/libraries" (string-append doc "/libraries"))))) (replace 'check - (lambda* (#:key inputs #:allow-other-keys) - ;; Some tests require timezone data. Otherwise, they - ;; look up /etc/localtime, which doesn't exist, and fail - ;; with: - ;; - ;; OverflowError: mktime argument out of range - (setenv "TZDIR" - (search-input-directory inputs "share/zoneinfo")) - (setenv "TZ" "Europe/Paris") - - (invoke "python" "utest/run.py")))))) + (lambda* (#:key native-inputs inputs tests? + #:allow-other-keys) + (when tests? + ;; Some tests require timezone data. Otherwise, they + ;; look up /etc/localtime, which doesn't exist, and + ;; fail with: + ;; + ;; OverflowError: mktime argument out of range + (setenv "TZDIR" + (search-input-directory + (or native-inputs inputs) "share/zoneinfo")) + (setenv "TZ" "Europe/Paris") + (invoke "python" "utest/run.py"))))))) (native-inputs `(("python-docutils" ,python-docutils) ("python-jsonschema" ,python-jsonschema) ("python-invoke" ,python-invoke) ("python-rellu" ,python-rellu) - ("python:tk" ,python "tk") ;used when building the HTML doc + ("python:tk" ,python "tk") ;used when building the HTML doc ("tzdata" ,tzdata-for-tests))) (outputs '("out" "doc")) (home-page "https://robotframework.org") -- cgit v1.3 From 191ff815566699ce33c77fc140404d8f73fa4ab0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 8 Mar 2022 17:34:20 -0500 Subject: gnu: python-robotframework-sshlibrary: Update to 3.8.0. * gnu/packages/python-xyz.scm (python-robotframework-sshlibrary): Update to 3.8.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 dcb36a55bd..e977620ac6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4839,7 +4839,7 @@ trace directly to the terminal to ease debugging.") (define-public python-robotframework-sshlibrary (package (name "python-robotframework-sshlibrary") - (version "3.7.0") + (version "3.8.0") ;; There are no tests in the PyPI archive. (source (origin @@ -4850,7 +4850,7 @@ trace directly to the terminal to ease debugging.") (file-name (git-file-name name version)) (sha256 (base32 - "09ak22rh9qa9wlpvhkliyybcp4xafjhxsps28wz0pf0030771xav")))) + "1fn72hw7xacjjpl4dd6wynh2x63i9rk8iqhj3v640db21qpcnbkw")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.3 From 1a7424957dbe50c68a49145f95955984c4fa118e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 8 Mar 2022 20:51:35 -0500 Subject: gnu: python-robotframework-sshlibrary: Patch for RobotFramework 5 compatibility. * gnu/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/python-xyz.scm (python-robotframework-sshlibrary): Apply it. --- gnu/local.mk | 1 + .../python-robotframework-sshlibrary-rf5-compat.patch | 19 +++++++++++++++++++ gnu/packages/python-xyz.scm | 4 +++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 9bfeede60f..11e16c2a16 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1706,6 +1706,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-pytorch-system-libraries.patch \ %D%/packages/patches/python-pytorch-1.9.0-system-libraries.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/python2-subprocess32-disable-input-test.patch \ diff --git a/gnu/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch b/gnu/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch new file mode 100644 index 0000000000..d867d4cabb --- /dev/null +++ b/gnu/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch @@ -0,0 +1,19 @@ +This patches add compatibility for the forthcoming RobotFramework 5. + +Taken from: https://github.com/robotframework/SSHLibrary/pull/403. +diff --git a/src/SSHLibrary/pythonforward.py b/src/SSHLibrary/pythonforward.py +index 8b85997b7..607985cf4 100644 +--- a/src/SSHLibrary/pythonforward.py ++++ b/src/SSHLibrary/pythonforward.py +@@ -1,9 +1,9 @@ + import select + import socket + import threading +-from robot.utils import platform ++from robot.utils import PY2, WINDOWS + from .logger import logger +-if platform.PY2 and platform.WINDOWS: ++if PY2 and WINDOWS: + import win_inet_pton + try: + import SocketServer diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e977620ac6..53db2e2062 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4850,7 +4850,9 @@ trace directly to the terminal to ease debugging.") (file-name (git-file-name name version)) (sha256 (base32 - "1fn72hw7xacjjpl4dd6wynh2x63i9rk8iqhj3v640db21qpcnbkw")))) + "1fn72hw7xacjjpl4dd6wynh2x63i9rk8iqhj3v640db21qpcnbkw")) + (patches (search-patches + "python-robotframework-sshlibrary-rf5-compat.patch")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.3 From edbf4f60e24e40d4dca20775d18873f71057f7f9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 8 Mar 2022 22:56:43 -0500 Subject: gnu: python-jedi: Remove optional test dependency on python-django-2.2. This avoids a dependency cycle between python-selenium (4.1.0) and python-pytest-trio. * gnu/packages/python-xyz.scm (python-jedi)[native-inputs]: Remove python-django-2.2. --- 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 53db2e2062..c8ec319626 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17015,7 +17015,7 @@ characters, mouse support, and auto suggestions.") (invoke "python" "-m" "pytest" "-vv")) #t))))) (native-inputs - (list python-colorama python-docopt python-django-2.2 python-pytest)) + (list python-colorama python-docopt python-pytest)) (propagated-inputs (list python-parso)) (home-page "https://github.com/davidhalter/jedi") -- cgit v1.3 From 09aa025b44c099e669bcda3c38344b270fd7982b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 9 Mar 2022 08:36:16 -0500 Subject: gnu: Add python-trio-websocket. * gnu/packages/python-xyz.scm (python-trio-websocket): New variable. --- gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c8ec319626..860ea35959 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23801,6 +23801,40 @@ a mypy plugin that smooths over some limitations in the basic type hints. ;; Either license applies. (license (list license:expat license:asl2.0)))) +(define-public python-trio-websocket + (package + (name "python-trio-websocket") + (version "0.9.2") + (source + (origin + (method git-fetch) ;no tests in pypi archive + (uri (git-reference + (url "https://github.com/HyperionGray/trio-websocket") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1yk2ak991kbl30xg8ldpggack1lwkizd7s5cpr28ir34z8iyjnpi")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? (invoke "pytest" "-vv"))))))) + (native-inputs (list python-pytest python-pytest-trio python-trustme)) + (propagated-inputs (list python-async-generator python-trio python-wsproto)) + (home-page "https://github.com/HyperionGray/trio-websocket") + (synopsis "WebSocket library for Trio") + (description "This library implements both server and client aspects of +the @url{https://tools.ietf.org/html/rfc6455, the WebSocket protocol}, +striving for safety, correctness, and ergonomics. It is based on the +@url{https://wsproto.readthedocs.io/en/latest/, wsproto project}, which is a +@url{https://sans-io.readthedocs.io/, Sans-IO} state machine that implements +the majority of the WebSocket protocol, including framing, codecs, and events. +This library handles I/O using @url{https://trio.readthedocs.io/en/latest/, +the Trio framework}.") + (license license:expat))) + (define-public python-humanize (package (name "python-humanize") -- cgit v1.3 From ebd2093b32942756fa376833786e0cc70fc9765f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 9 Mar 2022 14:16:54 -0500 Subject: gnu: python-robotframework: Fully build the documentation. * gnu/packages/patches/python-robotframework-ug2html.patch: New patch. * gnu/local.mk: Register it. * gnu/packages/python-xyz.scm (python-robotframework): Apply patch. [modules]: New argument. [phases]{build-and-install-doc}: Modify to build the full HTML documentation, including the user guide. [native-inputs]: Add python-pygments. --- gnu/local.mk | 1 + .../patches/python-robotframework-ug2html.patch | 57 ++++++++++++++++++++ gnu/packages/python-xyz.scm | 63 +++++++++++++--------- 3 files changed, 96 insertions(+), 25 deletions(-) create mode 100644 gnu/packages/patches/python-robotframework-ug2html.patch (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 11e16c2a16..60ee713508 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1706,6 +1706,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-pytorch-system-libraries.patch \ %D%/packages/patches/python-pytorch-1.9.0-system-libraries.patch \ %D%/packages/patches/python-robotframework-source-date-epoch.patch \ + %D%/packages/patches/python-robotframework-ug2html.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 \ diff --git a/gnu/packages/patches/python-robotframework-ug2html.patch b/gnu/packages/patches/python-robotframework-ug2html.patch new file mode 100644 index 0000000000..eea88e01f3 --- /dev/null +++ b/gnu/packages/patches/python-robotframework-ug2html.patch @@ -0,0 +1,57 @@ +Do not require the obsolete robotframeworklexer. + +Submitted upstream at: https://github.com/robotframework/robotframework/pull/4265. +diff --git a/doc/userguide/ug2html.py b/doc/userguide/ug2html.py +index 43cdb31bd..033203552 100755 +--- a/doc/userguide/ug2html.py ++++ b/doc/userguide/ug2html.py +@@ -93,34 +93,26 @@ from docutils.parsers.rst import directives + from pygments import highlight, __version__ as pygments_version + from pygments.lexers import get_lexer_by_name + +-# Use latest version, not version bundled with Pygments +-import robotframeworklexer +- + + def too_old(version_string, minimum): + version = tuple(int(v) for v in version_string.split('.')[:2]) + return version < minimum + + +-if too_old(getattr(robotframeworklexer, '__version__', '1.0'), (1, 1)): +- sys.exit('robotframeworklexer >= 1.1 is required.') +-if too_old(pygments_version, (2, 1)): +- sys.exit('Pygments >= 2.1 is required.') ++if too_old(pygments_version, (2, 8)): ++ sys.exit('Pygments >= 2.8 is required.') + + + def pygments_directive(name, arguments, options, content, lineno, + content_offset, block_text, state, state_machine): + try: +- if arguments[0] == 'robotframework': +- lexer = robotframeworklexer.RobotFrameworkLexer() +- else: +- lexer = get_lexer_by_name(arguments[0]) ++ lexer = get_lexer_by_name(arguments[0]) + except ValueError as err: + raise ValueError(f'Invalid syntax highlighting language "{arguments[0]}".') + # take an arbitrary option if more than one is given + formatter = options and VARIANTS[options.keys()[0]] or DEFAULT + # possibility to read the content from an external file +- filtered = [ line for line in content if line.strip() ] ++ filtered = [line for line in content if line.strip()] + if len(filtered) == 1: + path = filtered[0].replace('/', os.sep) + if os.path.isfile(path): +diff --git a/requirements-build.txt b/requirements-build.txt +index e0f5e19a2..a2fcdcfd5 100644 +--- a/requirements-build.txt ++++ b/requirements-build.txt +@@ -5,5 +5,4 @@ rellu >= 0.7 + twine >= 1.12 + wheel + docutils +-pygments >= 2.1 +-robotframeworklexer >= 1.1 ++pygments >= 2.8 diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 860ea35959..1387f1f260 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4689,37 +4689,50 @@ ecosystem, but can naturally be used also by other projects.") (sha256 (base32 "0j71awmfkwk7prz82kr1zbcl3nrih3396sshrygnqlrdjmgivd3p")) (patches (search-patches - "python-robotframework-source-date-epoch.patch")))) + "python-robotframework-source-date-epoch.patch" + "python-robotframework-ug2html.patch")))) (build-system python-build-system) (arguments - `(#:phases (modify-phases %standard-phases - (add-before 'build 'build-and-install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((doc-output (assoc-ref outputs "doc")) - (doc (string-append doc-output "/share/" - ,name "-" ,version "/"))) - (invoke "invoke" "library-docs" "all") - (mkdir-p doc) - (copy-recursively "doc/libraries" - (string-append doc "/libraries"))))) - (replace 'check - (lambda* (#:key native-inputs inputs tests? - #:allow-other-keys) - (when tests? - ;; Some tests require timezone data. Otherwise, they - ;; look up /etc/localtime, which doesn't exist, and - ;; fail with: - ;; - ;; OverflowError: mktime argument out of range - (setenv "TZDIR" - (search-input-directory - (or native-inputs inputs) "share/zoneinfo")) - (setenv "TZ" "Europe/Paris") - (invoke "python" "utest/run.py"))))))) + `(#:modules ((guix build python-build-system) + (guix build utils) + (ice-9 ftw) + (ice-9 match) + (srfi srfi-26)) + #:phases + (modify-phases %standard-phases + (add-before 'build 'build-and-install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((doc (string-append (assoc-ref outputs "doc") + "/share/doc/robotframework"))) + (invoke "invoke" "library-docs" "all") + (invoke "doc/userguide/ug2html.py" "dist") ;user guide + (mkdir-p doc) + (with-directory-excursion "dist" + (define user-guide-dir + (match (scandir "." (cut string-prefix? + "robotframework-userguide-" <>)) + ((dir) dir) + (_ (error "could not find the user guide directory")))) + (copy-recursively user-guide-dir doc))))) + (replace 'check + (lambda* (#:key native-inputs inputs tests? + #:allow-other-keys) + (when tests? + ;; Some tests require timezone data. Otherwise, they + ;; look up /etc/localtime, which doesn't exist, and + ;; fail with: + ;; + ;; OverflowError: mktime argument out of range + (setenv "TZDIR" + (search-input-directory + (or native-inputs inputs) "share/zoneinfo")) + (setenv "TZ" "Europe/Paris") + (invoke "python" "utest/run.py"))))))) (native-inputs `(("python-docutils" ,python-docutils) ("python-jsonschema" ,python-jsonschema) ("python-invoke" ,python-invoke) + ("python-pygments" ,python-pygments) ("python-rellu" ,python-rellu) ("python:tk" ,python "tk") ;used when building the HTML doc ("tzdata" ,tzdata-for-tests))) -- cgit v1.3 From 48e049b38d756771824fb71c6bc476bdcc2d1d16 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 9 Mar 2022 15:16:22 -0500 Subject: gnu: python-robotframework-sshlibrary: Normalize doc location. * gnu/packages/python-xyz.scm (python-robotframework-sshlibrary): [phases]{build-and-install-doc}: Install HTML documentation to the share/doc subdirectory of the 'doc' output. --- 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 1387f1f260..4da68a91ca 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4872,9 +4872,9 @@ trace directly to the terminal to ease debugging.") (modify-phases %standard-phases (add-before 'build 'build-and-install-doc (lambda* (#:key outputs #:allow-other-keys) - (let* ((doc-output (assoc-ref outputs "doc")) - (doc (string-append doc-output "/share/" - ,name "-" ,version "/"))) + (let ((doc (string-append + (assoc-ref outputs "doc") + "/share/doc/robotframework-sshlibrary"))) (invoke "chmod" "-R" "+w" "docs") (invoke "invoke" "kw-docs" "project-docs") (mkdir-p doc) -- cgit v1.3 From db1532e1adb2bc90bff43ab7cf40be602a208556 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 11 Mar 2022 20:54:48 -0500 Subject: gnu: Remove python2-empy. * gnu/packages/python-xyz.scm (python2-empy): Delete variable. --- gnu/packages/python-xyz.scm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4da68a91ca..ab73e19c4e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2785,12 +2785,6 @@ system is highly configurable via command line options and embedded commands.") (license license:lgpl2.1+))) -(define-public python2-empy - (let ((base (package-with-python2 (strip-python2-variant python-empy)))) - (package/inherit base - (arguments `(,@(package-arguments base) - #:tests? #t))))) - (define-public python2-element-tree (package (name "python2-element-tree") -- cgit v1.3 From d43568013e6fe7233f884238954295a4f7de05c5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 11 Mar 2022 20:55:54 -0500 Subject: gnu: Remove python2-promise. * gnu/packages/python-xyz.scm (python2-promise): Delete variable. (python-promise)[properties]: Delete field. --- gnu/packages/python-xyz.scm | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ab73e19c4e..ea63670d11 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13944,20 +13944,8 @@ concurrent.futures package from Python 3.2") (synopsis "Promises/A+ implementation for Python") (description "Promises/A+ implementation for Python") - (properties `((python2-variant . ,(delay python2-promise)))) (license license:expat))) -(define-public python2-promise - (let ((promise (package-with-python2 - (strip-python2-variant python-promise)))) - (package/inherit promise - (arguments (substitute-keyword-arguments (package-arguments promise) - ((#:tests? _) #t))) - (native-inputs - `(("python2-futures" ,python2-futures) - ("python2-pytest" ,python2-pytest) - ,@(package-native-inputs promise)))))) - (define-public python-progressbar2 (package (name "python-progressbar2") -- cgit v1.3 From 857e5ab22292fe7c2ba5b9855c0829a2ef942d38 Mon Sep 17 00:00:00 2001 From: Pradana AUMARS Date: Sun, 27 Feb 2022 16:11:03 +0100 Subject: gnu: Add python-ansicolors. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-ansicolors): New variable. Signed-off-by: Ludovic Courtès --- 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 ea63670d11..7ed6de5a2b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29069,6 +29069,27 @@ static types.") async I/O support.") (license license:gpl2+))) +(define-public python-ansicolors + (package + (name "python-ansicolors") + (version "1.1.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ansicolors" version ".zip")) + (sha256 + (base32 "1q3jqglkq4z0f6nkkn8bswcwqg012i2grrc27kabr8286dg4zycr")))) + (build-system python-build-system) + (native-inputs + (list python-tox + python-pytest-cov + unzip)) + (home-page "https://github.com/jonathaneunice/colors/") + (synopsis "ANSI colors for Python") + (description + "This package adds ANSI colors and decorations to your strings.") + (license license:isc))) + (define-public python-types-ujson (package (name "python-types-ujson") -- cgit v1.3 From ba6f59328558d756df5f7675cb690d80815eb1d8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 20 Mar 2022 23:28:42 +0100 Subject: gnu: pyzo: Update to 4.12.3. * gnu/packages/python-xyz.scm (pyzo): Update to 4.12.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 7ed6de5a2b..7649dd0ad5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -26054,7 +26054,7 @@ dictionaries.") (define-public pyzo (package (name "pyzo") - (version "4.12.0") + (version "4.12.3") (source (origin (method git-fetch) @@ -26064,7 +26064,7 @@ dictionaries.") (file-name (git-file-name name version)) (sha256 (base32 - "0ndiplnz2d5qc6ppjhfwl4zswn79q6732s4vlkaw8xwc3kjrql5b")))) + "0v6rgp52bf9za2spxx9c1yc6wmskvlsj81iw0gipjy7y8vpypgn2")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.3