From adf638065722b02ae672efa904aa34427f7c7238 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Tue, 19 Jan 2021 19:25:41 +0100 Subject: gnu: python-invoke: Patch reference to bash. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-invoke)[arguments]: Patch the reference to 'bash' in the source. [inputs]: Add bash. Signed-off-by: 宋文武 --- gnu/packages/python-xyz.scm | 14 +++++++++++++- 1 file changed, 13 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 783812eb03..3aa7516f01 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15267,7 +15267,19 @@ projects.") (build-system python-build-system) (arguments ;; XXX: Requires many dependencies that are not yet in Guix. - `(#:tests? #f)) + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-bash-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((bash (assoc-ref inputs "bash"))) + (substitute* "invoke/config.py" + (("shell = \"/bin/bash\"") + (string-append "shell = \"" bash "/bin/bash\"")) + ) + #t)))))) + (inputs + `(("bash" ,bash-minimal))) (synopsis "Pythonic task execution") (description "Invoke is a Python task execution tool and library, drawing inspiration -- cgit 1.4.1 From 512c6ea6e9f23492a7d0ec2afb8e2150ad9ff67d Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Tue, 19 Jan 2021 19:25:42 +0100 Subject: gnu: python-invoke: Update to 1.5.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-invoke): Update to 1.5.0. Signed-off-by: 宋文武 --- 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 3aa7516f01..cc21caa721 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15257,13 +15257,13 @@ projects.") (package (name "python-invoke") (home-page "https://www.pyinvoke.org/") - (version "1.4.1") + (version "1.5.0") (source (origin (method url-fetch) (uri (pypi-uri "invoke" version)) (sha256 (base32 - "0pg1lpl4583z83i12262v72y1a4cxdcxi7vqhl8dpqv9wszj6gyy")))) + "0l16v7zcbgi36z6pvmdrs5q4ks8lalcafi5d9nhrpcjzbc3n1igh")))) (build-system python-build-system) (arguments ;; XXX: Requires many dependencies that are not yet in Guix. -- cgit 1.4.1 From bab0c30be31944a3f2ea3fe99269859db192ffea Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Feb 2021 14:08:58 +0200 Subject: gnu: Add python-structlog. * gnu/packages/python-xyz.scm (python-structlog): New variable. --- gnu/packages/python-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cc21caa721..d0548c2ac2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10785,6 +10785,41 @@ applications.") (home-page "https://github.com/click-contrib/click-log") (license license:expat))) +(define-public python-structlog + (package + (name "python-structlog") + (version "20.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "structlog" version)) + (sha256 + (base32 + "0x1i21vn3xjfa3j9ijbblia5z0jlzc9aqvpqc26sy16i8yjxyydg")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest")) + #t))))) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-freezegun" ,python-freezegun) + ("python-pretend" ,python-pretend) + ("python-pytest" ,python-pytest) + ("python-pytest-asyncio" ,python-pytest-asyncio) + ("python-simplejson" ,python-simplejson) + ("python-twisted" ,python-twisted))) + (home-page "https://www.structlog.org/") + (synopsis "Structured Logging for Python") + (description "@code{structlog} changes logging in Python by adding structure +to your log entries.") + (license (list license:asl2.0 license:expat)))) + (define-public python-apipkg (package (name "python-apipkg") -- cgit 1.4.1 From 92bae0136cd755b268b4a52f1ab790759234da15 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Feb 2021 09:56:53 +0200 Subject: gnu: poetry: Adjust for newer python-keyring. * gnu/packages/python-xyz.scm (poetry)[arguments]: Adjust custom 'patch-setup-py phase to allow newer versions of python-keyring. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 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 d0548c2ac2..a504bb521b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13379,9 +13379,8 @@ database, file, dict stores. Cachy supports python versions 2.7+ and 3.2+.") (add-before 'build 'patch-setup-py (lambda _ (substitute* "setup.py" - ;; Newer versions of keyring produce a package with version "0.0.0" - ;; Reported upstream: - (("keyring>=21.2.0,<22.0.0") "keyring>=21.0.0,<22.0.0") + ;; Allow newer versions of python-keyring. + (("(keyring>=21.2.0),<22.0.0" _ keyring) keyring) ;; TODO: remove after the next release cycle, ;; when packaging has been updated. (("packaging>=20.4,<21.0") "packaging>=20.0,<21.0")) -- cgit 1.4.1 From 74acb300a34cc19a10e72d7d7f67635ef59b8eb7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 7 Feb 2021 23:29:45 +0000 Subject: gnu: Add python-extension-helpers. * gnu/packages/python-xyz.scm (python-extension-helpers): New variable. Signed-off-by: Guillaume Le Vaillant --- 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 a504bb521b..dbb79e608c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -96,6 +96,7 @@ ;;; Copyright © 2020, 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Morgan Smith ;;; Copyright © 2020 EuAndreh +;;; Copyright © 2021 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -2382,6 +2383,30 @@ software.") (inherit (package-with-python2 scons)) (name "scons-python2"))) +(define-public python-extension-helpers +(package + (name "python-extension-helpers") + (version "0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "extension-helpers" version)) + (sha256 + (base32 "10iqjzmya2h4sk765dlm1pbqypwlqyh8rw59a5m9i63d3klnz2mc")))) + (build-system python-build-system) + (native-inputs + `(("coverage" ,python-coverage) + ("pytest" ,python-pytest-astropy) + ("pytest-cov" ,python-pytest-cov) + ("setuptools-scm" ,python-setuptools-scm))) + (home-page "https://github.com/astropy/astropy-helpers") + (synopsis + "Utilities for building and installing packages in the Astropy ecosystem") + (description + "The extension-helpers package includes many build, installation, and +documentation-related tools used by the Astropy project.") + (license license:bsd-3))) + (define-public python-extras (package (name "python-extras") -- cgit 1.4.1 From ae66756a69350e2ca69a9a888dc92066e0cbaafa Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 18 Feb 2021 22:30:37 -0500 Subject: gnu: python-gevent: Update to 21.1.2. * gnu/packages/python-xyz.scm (python-gevent): Update to 21.1.2. Delete trailing #t. --- gnu/packages/python-xyz.scm | 22 ++++++++-------------- 1 file changed, 8 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 dbb79e608c..5c7fde7d4d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12770,19 +12770,18 @@ graphviz.") (define-public python-gevent (package (name "python-gevent") - (version "20.9.0") + (version "21.1.2") (source (origin (method url-fetch) (uri (pypi-uri "gevent" version)) (sha256 (base32 - "13aw9x6imsy3b369kfjblqiwfni69pp32m4r13n62r9k3l2lhvaz")) + "10f9y899y9nmq51pv4r1zb51b4w5yxx00sz5whvg9vm956hc432j")) (modules '((guix build utils))) (snippet '(begin ;; unbunding libev and c-ares - (delete-file-recursively "deps") - #t)))) + (delete-file-recursively "deps"))))) (build-system python-build-system) (arguments `(#:modules ((ice-9 ftw) @@ -12799,8 +12798,7 @@ graphviz.") (substitute* file (("/bin/sh") (which "sh")) (("/bin/true") (which "true")))) - (find-files "src/greentest" "\\.py$")) - #t)) + (find-files "src/greentest" "\\.py$")))) (add-before 'build 'do-not-use-bundled-sources (lambda _ (setenv "GEVENTSETUP_EMBED" "0") @@ -12808,8 +12806,7 @@ graphviz.") ;; Prevent building bundled libev. (substitute* "setup.py" (("run_make=_BUILDING") - "run_make=False")) - #t)) + "run_make=False")))) (add-before 'build 'add-greenlet-on-C_INCLUDE_PATH (lambda* (#:key inputs #:allow-other-keys) (let ((greenlet (string-append @@ -12822,16 +12819,14 @@ graphviz.") (setenv "C_INCLUDE_PATH" (string-append greenlet "/" python ":" (or (getenv "C_INCLUDE_PATH") - "")))))) - #t)) + "")))))))) (add-before 'check 'pretend-to-be-CI (lambda _ ;; A few tests are skipped due to network constraints or ;; get longer timeouts when running in a CI environment. ;; Piggy-back on that, as we need the same adjustments. (setenv "TRAVIS" "1") - (setenv "APPVEYOR" "1") - #t)) + (setenv "APPVEYOR" "1"))) (add-before 'check 'adjust-tests (lambda _ (let ((disabled-tests @@ -12863,8 +12858,7 @@ graphviz.") (call-with-output-file "skipped_tests.txt" (lambda (port) (format port "~a~%" - (string-join disabled-tests "\n")))) - #t))) + (string-join disabled-tests "\n"))))))) (replace 'check (lambda _ ;; Make sure the build directory is on PYTHONPATH. -- cgit 1.4.1 From c2baa33e4b5963ca3343b0d180e2566611ccd23e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 18 Feb 2021 23:01:45 -0500 Subject: gnu: python-greenlet: Update to 1.0.0. * gnu/packages/python-xyz.scm (python-greenlet): Update to 1.0.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 5c7fde7d4d..956319dab4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12723,13 +12723,13 @@ multiple processes (imagine multiprocessing, billiard, futures, celery etc). (define-public python-greenlet (package (name "python-greenlet") - (version "0.4.17") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "greenlet" version)) (sha256 (base32 - "0swdhrcq13bdszv3yz5645gi4ijbzmmhxpb6whcfg3d7d5f87n21")))) + "1y6wbg9yhm9dw6m768n4yslp56h85pnxkk3drz6icn15g6f1d7ki")))) (build-system python-build-system) (home-page "https://greenlet.readthedocs.io/") (synopsis "Lightweight in-process concurrent programming") -- cgit 1.4.1 From a386d29c18c4b483bd38321e4c1d842ec379af7d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 18 Feb 2021 23:15:58 -0500 Subject: gnu: python-psutil: Update to 5.8.0. * gnu/packages/python-xyz.scm (python-psutil): Update to 5.8.0. [home-page]: Update. [description]: Please lint and re-flow text. --- gnu/packages/python-xyz.scm | 20 ++++++++++---------- 1 file changed, 10 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 956319dab4..c19429cff2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -550,28 +550,28 @@ data for video and audio files.") (define-public python-psutil (package (name "python-psutil") - (version "5.7.2") + (version "5.8.0") (source (origin (method url-fetch) (uri (pypi-uri "psutil" version)) (sha256 - (base32 "1svv985vmqsls35kmvp3vhh26nsgz229324s9k29awf6qgqhm6ch")))) + (base32 "1immnj532bnnrh1qmk5q3lsw3san8qfk9kxy1cpmy0knmfcwp70c")))) (build-system python-build-system) (arguments ;; FIXME: some tests do not return and time out. Some tests fail because ;; some processes survive kill(). '(#:tests? #f)) - (home-page "https://www.github.com/giampaolo/psutil") + (home-page "https://github.com/giampaolo/psutil") (synopsis "Library for retrieving information on running processes") (description - "psutil (Python system and process utilities) is a library for retrieving -information on running processes and system utilization (CPU, memory, disks, -network) in Python. It is useful mainly for system monitoring, profiling and -limiting process resources and management of running processes. It implements -many functionalities offered by command line tools such as: ps, top, lsof, -netstat, ifconfig, who, df, kill, free, nice, ionice, iostat, iotop, uptime, -pidof, tty, taskset, pmap.") + "@code{psutil} (Python system and process utilities) is a library for +retrieving information on running processes and system utilization (CPU, +memory, disks, network) in Python. It is useful mainly for system monitoring, +profiling and limiting process resources and management of running processes. +It implements many functionalities offered by command line tools such as: ps, +top, lsof, netstat, ifconfig, who, df, kill, free, nice, ionice, iostat, +iotop, uptime, pidof, tty, taskset, pmap.") (properties `((python2-variant . ,(delay python2-psutil)))) (license license:bsd-3))) -- cgit 1.4.1 From 081d927409f0adc2ef32bdca055926a5b33cde2d Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 19 Feb 2021 23:51:49 -0300 Subject: gnu: Add python-pillow-simd. * gnu/packages/python-xyz.scm (python-pillow-simd): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 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 c19429cff2..2ca4625c2c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -82,7 +82,7 @@ ;;; Copyright © 2020 Josh Holland ;;; Copyright © 2020 Yuval Kogman ;;; Copyright © 2020 Michael Rohleder -;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2020 Guy Fleury Iteriteka ;;; Copyright © 2020 Hendursaga ;;; Copyright © 2020 Malte Frank Gerdes @@ -5919,6 +5919,39 @@ a general image processing tool.") ((#:tests? _ #f) #f))) (properties '((hidden? #t))))) +(define-public python-pillow-simd + (package + (inherit python-pillow) + (name "python-pillow-simd") + (version "7.1.2") + ;; The PyPI tarball does not include test files. + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/uploadcare/pillow-simd") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0w11np4cybamry3jsg70x747c79zwjzfq0xiprfp6c186rd6nzp9")))) + (arguments + (substitute-keyword-arguments + (package-arguments python-pillow) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'make-tests-writable + (lambda _ + (for-each make-file-writable (find-files "Tests")) + #t)))))) + (inputs + `(("libraqm" ,libraqm) + ("libimagequant" ,libimagequant) + ,@(package-inputs python-pillow))) + (home-page "https://github.com/uploadcare/pillow-simd") + (synopsis "Fork of the Python Imaging Library (Pillow)") + (description "This package is a fork of Pillow which adds support for SIMD +parallelism."))) + (define-public python-roifile (package (name "python-roifile") -- cgit 1.4.1 From 8067897fb940daa4db64decea76b1679610c3422 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 20 Feb 2021 04:05:03 -0300 Subject: gnu: Add python-pdfminer-six. * gnu/packages/python-xyz.scm (python-pdfminer-six): New variable. Signed-off-by: Nicolas Goaziou --- 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 2ca4625c2c..b26fce72a9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12309,6 +12309,54 @@ encoding algorithms to do fuzzy string matching.") module, adding support for Unicode strings.") (license license:bsd-2))) +(define-public python-pdfminer-six + (package + (name "python-pdfminer-six") + (version "20201018") + ;; There are no tests in the PyPI tarball. + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pdfminer/pdfminer.six") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1a2fxxnnjqbx344znpvx7cnv1881dk6585ibw01inhfq3w6yj2lr")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Tests write to the source tree. + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t)) + (replace 'check + (lambda _ + (invoke "make" "test"))) + (add-before 'reset-gzip-timestamps 'make-files-writable + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each make-file-writable + (find-files out "\\.gz$")) + #t)))))) + (propagated-inputs + `(("python-chardet" ,python-chardet) + ("python-cryptography" ,python-cryptography) + ("python-sortedcontainers" ,python-sortedcontainers))) + (native-inputs + `(("python-nose" ,python-nose) + ("python-tox" ,python-tox))) + (home-page "https://github.com/pdfminer/pdfminer.six") + (synopsis "PDF parser and analyzer") + (description "@code{pdfminer.six} is a community maintained fork of +the original PDFMiner. It is a tool for extracting information from PDF +documents. It focuses on getting and analyzing text data. Pdfminer.six +extracts the text from a page directly from the sourcecode of the PDF. It +can also be used to get the exact location, font or color of the text.") + (license license:expat))) + (define-public python-rarfile (package (name "python-rarfile") -- cgit 1.4.1 From f500905ce1baf85a2407c5ccde148ee6c2ea2584 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Sat, 20 Feb 2021 22:30:22 -0800 Subject: gnu: Add python-sane. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-sane): New variable Signed-off-by: Ludovic Courtès --- 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 b26fce72a9..ef811054b8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -180,6 +180,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages sdl) #:use-module (gnu packages search) + #:use-module (gnu packages scanner) #:use-module (gnu packages shells) #:use-module (gnu packages sphinx) #:use-module (gnu packages ssh) @@ -23906,3 +23907,25 @@ Application Programming Interface based on the Open Inventor 2.1 API.") Crayons automatically wraps a given string in the foreground color and restores the original state after the string is printed.") (license license:expat))) + +(define-public python-sane + (package + (name "python-sane") + (version "2.9.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri name version)) + (sha256 + (base32 + "1pi597z94n2mkd821ln52fq0g727n2jxfskf280ip3kf7jw8w294")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (inputs + `(("sane-backends" ,sane-backends))) + (home-page "https://github.com/python-pillow/Sane") + (synopsis "Python interface to the SANE scanner") + (description "This package provides Python interface to the SANE scanner +and frame grabber interface.") + (license license:expat))) -- cgit 1.4.1 From ad06c29b37924ecf5eb3bd440c7456cad6415c3b Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sat, 9 Jan 2021 14:42:47 +0000 Subject: gnu: Add python-screenkey. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-screenkey): New variable. Co-authored-by: Léo Le Bouter --- gnu/packages/python-xyz.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 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 ef811054b8..e42cbc561c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -74,7 +74,7 @@ ;;; Copyright © 2020 Sebastian Schott ;;; Copyright © 2020 Alexandros Theodotou ;;; Copyright © 2020 Josh Marshall -;;; Copyright © 2020 Alexandros Theodotou +;;; Copyright © 2020, 2021 Alexandros Theodotou ;;; Copyright © 2020 Lars-Dominik Braun ;;; Copyright © 2020 Alex ter Weele ;;; Copyright © 2020 Matthew Kraai @@ -23929,3 +23929,57 @@ restores the original state after the string is printed.") (description "This package provides Python interface to the SANE scanner and frame grabber interface.") (license license:expat))) + +(define-public python-screenkey + (package + (name "python-screenkey") + (version "1.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/screenkey/screenkey") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rfngmkh01g5192pi04r1fm7vsz6hg9k3qd313sn9rl9xkjgp11l")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-dlopen-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((x11 (assoc-ref inputs "libx11")) + (xtst (assoc-ref inputs "libxtst"))) + (substitute* "Screenkey/xlib.py" + (("libX11.so.6") + (string-append x11 "/lib/libX11.so.6"))) + (substitute* "Screenkey/xlib.py" + (("libXtst.so.6") + (string-append xtst "/lib/libXtst.so.6"))) + #t))) + (add-after 'install 'wrap-screenkey + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program + (string-append (assoc-ref outputs "out") "/bin/screenkey") + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))) + `("GI_TYPELIB_PATH" + ":" prefix (,(getenv "GI_TYPELIB_PATH")))) + #t))))) + (inputs + `(("python-distutils-extra" ,python-distutils-extra) + ("python-tokenize-rt" ,python-tokenize-rt) + ("libx11" ,libx11) + ("libxtst" ,libxtst) + ("gtk+" ,gtk+) + ("python-pygobject" ,python-pygobject) + ("python-pycairo" ,python-pycairo) + ("python-setuptools-git" ,python-setuptools-git) + ("python-babel" ,python-babel))) + (home-page "https://www.thregr.org/~wavexx/software/screenkey/") + (synopsis + "Screencast tool to display pressed keys") + (description + "A screencast tool to display your keys inspired by Screenflick.") + (license license:gpl3+))) -- cgit 1.4.1 From a821818fb78bc352aef81a5f8d162729de3e5c8a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 22 Feb 2021 13:25:16 -0500 Subject: gnu: python-sane: Correct the license. This is a followup to commit f500905ce1baf85a2407c5ccde148ee6c2ea2584. * gnu/packages/python-xyz.scm (python-sane)[license]: Describe the license. --- gnu/packages/python-xyz.scm | 4 +++- 1 file changed, 3 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 e42cbc561c..072cc3db53 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23928,7 +23928,9 @@ restores the original state after the string is printed.") (synopsis "Python interface to the SANE scanner") (description "This package provides Python interface to the SANE scanner and frame grabber interface.") - (license license:expat))) + (license (license:non-copyleft + ;; Yet another variant of the X/MIT license. + "https://github.com/python-pillow/Sane/blob/master/COPYING")))) (define-public python-screenkey (package -- cgit 1.4.1 From 3b3724760842f6ef95f6bbeeee67ae4237c54c8c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 26 Feb 2021 09:50:44 +0100 Subject: gnu: python-pikepdf: Update to 2.6.0. * gnu/packages/python-xyz.scm (python-pikepdf): Update to 2.6.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 072cc3db53..c10a55e8b6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5807,13 +5807,13 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pikepdf (package (name "python-pikepdf") - (version "2.5.2") + (version "2.6.0") (source (origin (method url-fetch) (uri (pypi-uri "pikepdf" version)) (sha256 - (base32 "1wwfspm912388a61lailbpjpqihq9ha8yz05mjqx9yys4ixykhwg")))) + (base32 "1y3nmwjv0in0gbbcq53myx3sjf5j18iy556zvq9d67bg73y7l9s2")))) (build-system python-build-system) (arguments `(#:tests? #false)) ;require python-xmp-toolkit -- cgit 1.4.1 From 34bc222230b6a44c5a664cd5a532efac9b2d662e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 10:58:52 +0100 Subject: gnu: python-pikepdf: Update to 2.7.0. * gnu/packages/python-xyz.scm (python-pikepdf): 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 c10a55e8b6..312df53d9b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5807,13 +5807,13 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pikepdf (package (name "python-pikepdf") - (version "2.6.0") + (version "2.7.0") (source (origin (method url-fetch) (uri (pypi-uri "pikepdf" version)) (sha256 - (base32 "1y3nmwjv0in0gbbcq53myx3sjf5j18iy556zvq9d67bg73y7l9s2")))) + (base32 "0xjr9qnv6z94ka1xj57am4a64vppdrplgmm359y1za1mqnfyabyk")))) (build-system python-build-system) (arguments `(#:tests? #false)) ;require python-xmp-toolkit -- cgit 1.4.1 From 80a0a05f98d8a09b7565d85b27567daf33ab0c0f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:23:37 +0100 Subject: gnu: python-cycler: Use HTTPS home page URI. * gnu/packages/python-xyz.scm (python-cycler)[home-page]: Use HTTPS URI. --- 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 312df53d9b..8590494a5e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5077,7 +5077,7 @@ transcendental functions).") '(#:tests? #f)) (propagated-inputs `(("python-six" ,python-six))) - (home-page "http://matplotlib.org/cycler/") + (home-page "https://matplotlib.org/cycler/") (synopsis "Composable keyword argument iterator") (description "When using @code{matplotlib} and plotting more than one line, it is -- cgit 1.4.1 From 21ec04e372a6a970ed653a5dc7a123c204519260 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:26:02 +0100 Subject: gnu: python-jupyter-client: Use HTTPS home page URI. * gnu/packages/python-xyz.scm (python-jupyter-client)[home-page]: Use HTTPS URI. --- 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 8590494a5e..44bd1b3279 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7221,7 +7221,7 @@ without using the configuration machinery.") `(("python-pyzmq" ,python-pyzmq) ("python-traitlets" ,python-traitlets) ("python-jupyter-core" ,python-jupyter-core))) - (home-page "http://jupyter.org/") + (home-page "https://jupyter.org/") (synopsis "Jupyter protocol implementation and client libraries") (description "The @code{jupyter_client} package contains the reference implementation -- cgit 1.4.1 From 68295921591b63ef608868c417aab40f05037b18 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:26:38 +0100 Subject: gnu: python-jupyter-core: Use HTTPS home page URI. * gnu/packages/python-xyz.scm (python-jupyter-core)[home-page]: Use HTTPS URI. --- 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 44bd1b3279..277f31bdc3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7180,7 +7180,7 @@ without using the configuration machinery.") (arguments `(#:tests? #f)) (propagated-inputs `(("python-traitlets" ,python-traitlets))) - (home-page "http://jupyter.org/") + (home-page "https://jupyter.org/") (synopsis "Jupyter base package") (description "Jupyter core is the base package on which Jupyter projects rely.") -- cgit 1.4.1 From a6004b5fd27e56dc28786fe77e42d2468f9a0be8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:27:14 +0100 Subject: gnu: python-mpmath: Use HTTPS home page URI. * gnu/packages/python-xyz.scm (python-mpmath)[home-page]: Use HTTPS URI. --- 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 277f31bdc3..631cb1405b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8074,7 +8074,7 @@ and statistical routines from scipy and statsmodels.") (replace 'check (lambda _ (invoke "python" "mpmath/tests/runtests.py" "-local")))))) - (home-page "http://mpmath.org") + (home-page "https://mpmath.org") (synopsis "Arbitrary-precision floating-point arithmetic in python") (description "@code{mpmath} can be used as an arbitrary-precision substitute for -- cgit 1.4.1 From 88f55605afcd885a7b44c80a7d5fc3eafcc56fda Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:27:54 +0100 Subject: gnu: python-msgpack-python: Use HTTPS home page URI. * gnu/packages/python-xyz.scm (python-msgpack-python)[home-page]: Use HTTPS URI. --- 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 631cb1405b..0ee4bbd245 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13415,7 +13415,7 @@ interfaces.") (base32 "16wh8qgybmfh4pjp8vfv78mdlkxfmcasg78lzlnm6nslsfkci31p")))) (build-system python-build-system) - (home-page "http://msgpack.org/") + (home-page "https://msgpack.org/") (synopsis "Package to deserialize messages in MessagePack binary format") (description "MessagePack is an efficient binary serialization format. It lets you -- cgit 1.4.1 From c48b66d6ed95cf205d74c47df52b09d51568968a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:28:22 +0100 Subject: gnu: python-nbconvert: Use HTTPS home page URI. * gnu/packages/python-xyz.scm (python-nbconvert)[home-page]: Use HTTPS URI. --- 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 0ee4bbd245..08e064c561 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10192,7 +10192,7 @@ time.") ("python-nbformat" ,python-nbformat) ("python-pygments" ,python-pygments) ("python-traitlets" ,python-traitlets))) - (home-page "http://jupyter.org") + (home-page "https://jupyter.org") (synopsis "Converting Jupyter Notebooks") (description "The @code{nbconvert} tool, @{jupyter nbconvert}, converts notebooks to various other formats via Jinja templates. It allows you to -- cgit 1.4.1 From 6c70a7104a1cc0eda3485c7b0a8a1bcbcc4c6c4b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:28:50 +0100 Subject: gnu: python-nbformat: Use HTTPS home page URI. * gnu/packages/python-xyz.scm (python-nbformat)[home-page]: Use HTTPS URI. --- 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 08e064c561..c6c97854cc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10003,7 +10003,7 @@ Debian-related files, such as: ("python-jsonschema" ,python-jsonschema) ("python-jupyter-core" ,python-jupyter-core) ("python-traitlets" ,python-traitlets))) - (home-page "http://jupyter.org") + (home-page "https://jupyter.org") (synopsis "Jupyter Notebook format") (description "This package provides the reference implementation of the Jupyter Notebook format and Python APIs for working with notebooks.") -- cgit 1.4.1 From c2424076fb5f0941a3c80c141b5da8c86b60ef8b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:29:11 +0100 Subject: gnu: python-notebook: Use HTTPS home page URI. * gnu/packages/python-xyz.scm (python-notebook)[home-page]: Use HTTPS URI. --- 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 c6c97854cc..ceaed61950 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10249,7 +10249,7 @@ convert an @code{.ipynb} notebook file into various static formats including: `(("python-nose" ,python-nose) ("python-sphinx" ,python-sphinx) ("python-requests" ,python-requests))) - (home-page "http://jupyter.org/") + (home-page "https://jupyter.org/") (synopsis "Web-based notebook environment for interactive computing") (description "The Jupyter HTML notebook is a web-based notebook environment for -- cgit 1.4.1 From b6e90b3bedcd703b06f73ebb69c0cb12c4cc5d6f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:32:03 +0100 Subject: gnu: python-pyev: Update home page. * gnu/packages/python-xyz.scm (python-pyev)[home-page]: Update URI. --- 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 ceaed61950..d7b7618cb4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14762,7 +14762,7 @@ Record Format (DWARF).") (string-append "libev_dll_name = \"" libev "\""))))))))) (inputs `(("libev" ,libev))) - (home-page "http://pythonhosted.org/pyev/") + (home-page "https://github.com/gabrielfalcao/pyev") (synopsis "Python libev interface") (description "Pyev provides a Python interface to libev.") (license license:gpl3))) -- cgit 1.4.1 From c9370473cd5403d244ccaab3b9011a2811053a0a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:33:28 +0100 Subject: gnu: python-pylzma: Use HTTPS home page URI. * gnu/packages/python-xyz.scm (python-pylzma)[home-page]: Use HTTPS URI. --- 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 d7b7618cb4..c0eccaab4c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20666,7 +20666,7 @@ format.") (base32 "074anvhyjgsv2iby2ql1ixfvjgmhnvcwjbdz8gk70xzkzcm1fx5q")))) (build-system python-build-system) - (home-page "http://www.joachim-bauch.de/projects/pylzma/") + (home-page "https://www.joachim-bauch.de/projects/pylzma/") (synopsis "Python bindings for the LZMA library by Igor Pavlov.") (description "This package provides Python bindings for the LZMA library by Igor Pavlov.") -- cgit 1.4.1 From 155d26ac2fdfccf785f5aa1fd2eee6681600f3bd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:36:46 +0100 Subject: gnu: python-qtconsole: Use HTTPS home page URI. * gnu/packages/python-xyz.scm (python-qtconsole)[home-page]: Use HTTPS URI. --- 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 c0eccaab4c..a312558376 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10446,7 +10446,7 @@ Jupyter kernels such as IJulia and IRKernel.") ("python-ipython" ,python-ipython))) (native-inputs `(("python-pytest" ,python-pytest))) - (home-page "http://jupyter.org") + (home-page "https://jupyter.org") (synopsis "Jupyter Qt console") (description "This package provides a Qt-based console for Jupyter with support for rich media output.") -- cgit 1.4.1 From e0c6592c680edd47c7c03aeceafc29f0be9cb122 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:38:51 +0100 Subject: gnu: python-rstr: Update home page. * gnu/packages/python-xyz.scm (python-rstr)[home-page]: Update URI. --- gnu/packages/python-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a312558376..38dd0654d9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3985,8 +3985,7 @@ for SSH and SFTP. It has the following main usages: (base32 "197dw8mbq0pjjz1l6h1ksi62vgn7x55d373ch74y06744qiq5sjx")))) (build-system python-build-system) - (home-page - "http://bitbucket.org/leapfrogdevelopment/rstr/overview") + (home-page "https://github.com/leapfrogonline/rstr") (synopsis "Generate random strings in Python") (description "This package provides a python module for generating random strings of various types. It could be useful for fuzz testing, -- cgit 1.4.1 From 0f4030c4c6860806ef487c2b6d90fd9c599b64e7 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Mon, 1 Mar 2021 05:09:44 +0100 Subject: gnu: python-pysaml2: Update to 6.5.1 [fixes CVE-2021-21238, CVE-2021-21239]. * gnu/packages/python-xyz.scm (python-pysaml2): Update to 6.5.1. --- gnu/packages/python-xyz.scm | 9 ++++++--- 1 file changed, 6 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 38dd0654d9..a170c95cd2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22556,23 +22556,26 @@ networking engine for Python.") (define-public python-pysaml2 (package (name "python-pysaml2") - (version "5.0.0") + (version "6.5.1") (source (origin (method url-fetch) (uri (pypi-uri "pysaml2" version)) (sha256 (base32 - "1h8cmxh9cvxhrdfmkh92wg6zpxmhi2fixq1cy4hxismmaar7bsny")))) + "1xk2x0slz1f8cqv7vn77qx99xfd1mshhswiwrljk9m72w2m9iivd")))) (build-system python-build-system) (propagated-inputs `(("python-cryptography" ,python-cryptography) ("python-dateutil" ,python-dateutil) ("python-defusedxml" ,python-defusedxml) + ("python-importlib-resources" + ,python-importlib-resources) ("python-pyopenssl" ,python-pyopenssl) ("python-pytz" ,python-pytz) ("python-requests" ,python-requests) - ("python-six" ,python-six))) + ("python-six" ,python-six) + ("python-xmlschema" ,python-xmlschema))) (home-page "https://idpy.org") (synopsis "Python implementation of SAML Version 2 Standard") (description -- cgit 1.4.1 From 3fdb8fc0c4d897b17f487f18c5fc62cd40c337ed Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Mar 2021 09:35:13 +0100 Subject: gnu: python-pikepdf: Update to 2.8.0. * gnu/packages/python-xyz.scm (python-pikepdf): Update to 2.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 a170c95cd2..01f1e66258 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5806,13 +5806,13 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pikepdf (package (name "python-pikepdf") - (version "2.7.0") + (version "2.8.0") (source (origin (method url-fetch) (uri (pypi-uri "pikepdf" version)) (sha256 - (base32 "0xjr9qnv6z94ka1xj57am4a64vppdrplgmm359y1za1mqnfyabyk")))) + (base32 "1dfc8a7gp6ib6a2gdx6fz2zvvk4yx8vr2m7b6044rk91vpyrdzvl")))) (build-system python-build-system) (arguments `(#:tests? #false)) ;require python-xmp-toolkit -- cgit 1.4.1 From c48c69194fee468d2ac16ccc25f012312083bf89 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Mar 2021 18:08:27 +0100 Subject: gnu: python-matplotlib: Fix running under Wayland with GTK3. * gnu/packages/python-xyz.scm (python-matplotlib)[source]: Add patch. * gnu/packages/patches/python-matplotlib-run-under-wayland-gtk3.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../python-matplotlib-run-under-wayland-gtk3.patch | 31 ++++++++++++++++++++++ gnu/packages/python-xyz.scm | 5 ++-- 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/python-matplotlib-run-under-wayland-gtk3.patch (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 0954158d4c..81ca759503 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1539,6 +1539,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-libxml2-utf8.patch \ + %D%/packages/patches/python-matplotlib-run-under-wayland-gtk3.patch \ %D%/packages/patches/python-mediafile-wavpack.patch \ %D%/packages/patches/python-memcached-syntax-warnings.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ diff --git a/gnu/packages/patches/python-matplotlib-run-under-wayland-gtk3.patch b/gnu/packages/patches/python-matplotlib-run-under-wayland-gtk3.patch new file mode 100644 index 0000000000..6f067763b5 --- /dev/null +++ b/gnu/packages/patches/python-matplotlib-run-under-wayland-gtk3.patch @@ -0,0 +1,31 @@ +From: Tobias Geerinckx-Rice +Date: Tue, 02 Mar 2021 18:04:33 +0100 +Subject: [PATCH] gnu: python-matplotlib: Run under Wayland with GTK3. + +Adopted from upstream's fix[0] for +. + +[0]: https://github.com/liuyun88/matplotlib/commit/3d5000463bd23cb046681220f5511f07743f7d82 + +--- +diff -Naur a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py +--- a/lib/matplotlib/backends/backend_gtk3.py 2019-11-21 23:47:05.000000000 +0100 ++++ b/lib/matplotlib/backends/backend_gtk3.py 2021-03-02 18:00:57.479929766 +0100 +@@ -42,11 +42,12 @@ + + try: ++ _display = Gdk.Display.get_default() + cursord = { +- cursors.MOVE : Gdk.Cursor.new(Gdk.CursorType.FLEUR), +- cursors.HAND : Gdk.Cursor.new(Gdk.CursorType.HAND2), +- cursors.POINTER : Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR), +- cursors.SELECT_REGION : Gdk.Cursor.new(Gdk.CursorType.TCROSS), +- cursors.WAIT : Gdk.Cursor.new(Gdk.CursorType.WATCH), ++ cursors.MOVE : Gdk.Cursor.new_from_name(_display, "move"), ++ cursors.HAND : Gdk.Cursor.new_from_name(_display, "pointer"), ++ cursors.POINTER : Gdk.Cursor.new_from_name(_display, "default"), ++ cursors.SELECT_REGION : Gdk.Cursor.new_from_name(_display, "crosshair"), ++ cursors.WAIT : Gdk.Cursor.new_from_name(_display, "wait"), + } + except TypeError as exc: + # Happens when running headless. Convert to ImportError to cooperate with diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 01f1e66258..456cfea5c6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5131,8 +5131,9 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc. (method url-fetch) (uri (pypi-uri "matplotlib" version)) (sha256 - (base32 - "1nmshfqh7wyg15i16hx1yiylcvzkws29ivn66n3i0wyqwcpjr3lf")))) + (base32 "1nmshfqh7wyg15i16hx1yiylcvzkws29ivn66n3i0wyqwcpjr3lf")) + (patches + (search-patches "python-matplotlib-run-under-wayland-gtk3.patch")))) (build-system python-build-system) (propagated-inputs ; the following packages are all needed at run time `(("python-cycler" ,python-cycler) -- cgit 1.4.1 From 3043974c36a6d9f54c3c95a0034266ee6228337a Mon Sep 17 00:00:00 2001 From: Ellis Kenyő Date: Wed, 17 Feb 2021 19:45:36 +0000 Subject: gnu: Add python-jinja2-cli. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-jinja2-cli): 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 456cfea5c6..e318329577 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -97,6 +97,7 @@ ;;; Copyright © 2021 Morgan Smith ;;; Copyright © 2020 EuAndreh ;;; Copyright © 2021 Sharlatan Hellseher +;;; Copyright © 2021 Ellis Kenyő ;;; ;;; This file is part of GNU Guix. ;;; @@ -23988,3 +23989,28 @@ and frame grabber interface.") (description "A screencast tool to display your keys inspired by Screenflick.") (license license:gpl3+))) + +(define-public python-jinja2-cli + (package + (name "python-jinja2-cli") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jinja2-cli" version)) + (sha256 + (base32 + "0vikx7v6fbvww6kfrv0k5a24jyv3ak7nindg60906pdd1m9qvkcw")))) + (build-system python-build-system) + (propagated-inputs + `(("python-jinja2" ,python-jinja2))) + (native-inputs + `(("python-flake8" ,python-flake8) + ("python-jinja2" ,python-jinja2) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/mattrobenolt/jinja2-cli") + (synopsis "Command-line interface to Jinja2") + (description + "This package provides a command-line interface (CLI) to the Jinja2 +template engine.") + (license license:bsd-3))) -- cgit 1.4.1 From 3aacc9f1dae2f68d623dae540fa050f1a87d2519 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 3 Mar 2021 21:01:29 +0100 Subject: gnu: python-pillow: Update to 8.1.1 [security fixes]. * gnu/packages/python-xyz.scm (python-pillow): Update to 8.1.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 e318329577..d9de9bc01c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5839,14 +5839,14 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pillow (package (name "python-pillow") - (version "8.0.1") + (version "8.1.1") (source (origin (method url-fetch) (uri (pypi-uri "Pillow" version)) (sha256 (base32 - "17pv0flaqqfld9m4lz8ayxyqb11gbbmr7w04mw4ar79cn3lwdi8i")))) + "086g7nhv52wclrwnzbzs2x3nvyzs2hfq1bvgivsrp5f7r7wiiz7n")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) -- cgit 1.4.1 From ab10e1086cf1e36330a55d05ee438b097c9fd626 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 4 Mar 2021 16:19:19 +0200 Subject: gnu: python-jedi: Allow test phase to be skipped. * gnu/packages/python-xyz.scm (python-jedi)[arguments]: Wrap custom 'check phase tests with check for tests? keyword. --- gnu/packages/python-xyz.scm | 8 +++++--- 1 file changed, 5 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 d9de9bc01c..fbc9ad688d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13945,9 +13945,11 @@ characters, mouse support, and auto suggestions.") `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ - (setenv "HOME" "/tmp") - (invoke "python" "-m" "pytest" "-vv")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" "/tmp") + (invoke "python" "-m" "pytest" "-vv")) + #t))))) (native-inputs `(("python-pytest" ,python-pytest) ("python-docopt" ,python-docopt))) -- cgit 1.4.1