From 4f3011f21c46c2eec6fa4256bfb00052aa9512c9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 1 Jun 2022 11:36:10 -0400 Subject: gnu: Add python-jsonschema-next. * gnu/packages/python-xyz.scm (python-jsonschema-next): New variable. --- 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 8088761f0f..91bed915d8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3424,6 +3424,42 @@ (define-public python-jsonschema "Jsonschema is an implementation of JSON Schema for Python.") (license license:expat))) +;;; TODO: Make the default python-jsonschema on core-updates +(define-public python-jsonschema-next + (package + (inherit python-jsonschema) + (version "4.5.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jsonschema" version)) + (sha256 + (base32 "1z0x22691jva7lwfcfh377jdmlz68zhiawxzl53k631l34k8hvbw")))) + (arguments + (substitute-keyword-arguments (package-arguments python-jsonschema) + ((#:phases phases) + #~(modify-phases #$phases + ;; XXX: PEP 517 manual build/install procedures copied from + ;; python-isort. + (replace 'build + (lambda _ + ;; ZIP does not support timestamps before 1980. + (setenv "SOURCE_DATE_EPOCH" "315532800") + (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((whl (car (find-files "dist" "\\.whl$")))) + (invoke "pip" "--no-cache-dir" "--no-input" + "install" "--no-deps" "--prefix" #$output whl)))))))) + (native-inputs (list python-pypa-build + python-setuptools-scm + python-twisted)) + (propagated-inputs + (list python-attrs + python-importlib-metadata + python-pyrsistent + python-typing-extensions)))) + (define-public python-schema (package (name "python-schema") -- cgit v1.2.3 From bf9da5ccc908376c84d0dfc7f1531fb479d23134 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 2 Jun 2022 10:55:26 +0200 Subject: gnu: Remove python-atomicwrites-1.4. * gnu/packages/python-xyz.scm (python-atomicwrites-1.4): Remove variable. * gnu/packages/matrix.scm (python-matrix-nio)[propagated-inputs]: Replace python-atomicwrites-1.4 with python-atomicwrites. --- gnu/packages/matrix.scm | 2 +- gnu/packages/python-xyz.scm | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index 9ac999b5fd..2ba6d8ba1f 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -211,7 +211,7 @@ (define-public python-matrix-nio (list python-aiofiles python-aiohttp python-aiohttp-socks - python-atomicwrites-1.4 + python-atomicwrites python-cachetools python-future python-h11 diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 91bed915d8..f54bf340f5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13498,17 +13498,6 @@ (define-public python-atomicwrites (home-page "https://github.com/untitaker/python-atomicwrites") (license license:expat))) -(define-public python-atomicwrites-1.4 - (package - (inherit python-atomicwrites) - (version "1.4.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "atomicwrites" version)) - (sha256 - (base32 - "0yla2svfhfqrcj8qbyqzx7wi4jy0dwcxvlkg0k3zjd54s5m3jw5f")))))) - (define-public python-qstylizer (package (name "python-qstylizer") -- cgit v1.2.3 From af0b3fdbf98004e87dc4270b3a424fd09b70665b Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 27 May 2022 00:26:52 -0500 Subject: gnu: python-shellingham: Update to 1.4.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-shellingham): Update to 1.4.0. [arguments]: Remove arguments block since upstream now includes a setup.py file. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f54bf340f5..979a11a5a6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16067,25 +16067,14 @@ (define-public python-tomlkit (define-public python-shellingham (package (name "python-shellingham") - (version "1.3.2") + (version "1.4.0") (source (origin (method url-fetch) (uri (pypi-uri "shellingham" version)) (sha256 - (base32 "07kmia2hvd2q7wik89m82hig9mqr2faynvy38vxq5fm0ps11jv2p")))) + (base32 "07hpndvcv9mf9hp54b4apzpwzmzfzl8ryaacsfdq4139im2w4ma8")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'restore-setup.py - ;; setup.py will return in the next release. - ;; - (lambda _ - (with-output-to-file "setup.py" - (lambda _ - (display "from setuptools import setup\nsetup()\n"))) - #t))))) (home-page "https://github.com/sarugaku/shellingham") (synopsis "Tool to detect surrounding shell") (description -- cgit v1.2.3 From ddb7e35bc4eb177d3cfe78973265851b8ab67361 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Mon, 30 May 2022 22:57:49 +0300 Subject: gnu: Add python-musical-scales * gnu/packages/python-xyz.scm (python-musical-scales): New variable. Signed-off-by: Mathieu Othacehe --- 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 979a11a5a6..bcc65e289f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29293,3 +29293,24 @@ (define-public python-gatt Currently, Linux is the only platform supported by this library.") (license license:expat))) + +(define-public python-musical-scales + (package + (name "python-musical-scales") + (version "1.0.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "musical-scales" version)) + (sha256 + (base32 + "1ckn8n37i7b65h0i385ycn0w8sg9na0iabz0kmhxxc1wj0hddkw9")))) + (build-system python-build-system) + (native-inputs (list python-wheel)) + (home-page "https://github.com/hmillerbakewell/musical-scale") + (synopsis "Retrieve a scale based on a given mode and starting note") + (description + "Retrieve a scale based on a given mode and starting note. +Information about these scales can be +@url{https://en.wikipedia.org/wiki/List_of_musical_scales_and_modes, found on +Wikipedia}.") + (license license:expat))) -- cgit v1.2.3 From 54d2664339a4a44678372a4ff582c649bb568696 Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 27 May 2022 00:24:37 -0500 Subject: gnu: python-pyflakes: Update to 2.4.0. * gnu/packages/python-xyz.scm (python-pyflakes): Update to 2.4.0. Signed-off-by: Mathieu Othacehe --- 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 bcc65e289f..c0870cab7d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10142,14 +10142,14 @@ (define-public python-pep621 (define-public python-pyflakes (package (name "python-pyflakes") - (version "2.3.1") + (version "2.4.0") (source (origin (method url-fetch) (uri (pypi-uri "pyflakes" version)) (sha256 (base32 - "1ny10364ciqh4ripasj4zzv4145l21l3s85m3qlrvfq5pk58xg7m")))) + "0k5jn8jpxni264wxf6cc3xcd1qckc0pww30bsd77mwzdf8l5ra05")))) (build-system python-build-system) (home-page "https://github.com/PyCQA/pyflakes") (synopsis "Passive checker of Python programs") -- cgit v1.2.3 From 5fd2868ef8a902af617909e9140b4ca2b3ebf30a Mon Sep 17 00:00:00 2001 From: Brian Kubisiak Date: Wed, 1 Jun 2022 18:56:40 -0700 Subject: gnu: python-sh: Update to 1.14.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-sh): Update to 1.14.2. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c0870cab7d..b8b3b00653 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1515,14 +1515,14 @@ (define-public python-pyls-black (define-public python-sh (package (name "python-sh") - (version "1.12.14") + (version "1.14.2") (source (origin (method url-fetch) (uri (pypi-uri "sh" version)) (sha256 (base32 - "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm")))) + "03gyss1rhj4in7pgysg4q0hxp3230whinlpy1532ljs99lrx0ywx")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From 52cb6e6310b908d29948064d060b2abe0b576c0c Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 5 Jun 2022 23:54:01 +0200 Subject: gnu: python-flake8: Update to 3.9.2. * gnu/packages/python-xyz.scm (python-flake8): Update to 3.9.2. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b8b3b00653..0dfc6ca7e0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10193,13 +10193,13 @@ (define-public python-mccabe (define-public python-flake8 (package (name "python-flake8") - (version "3.9.1") + (version "3.9.2") (source (origin (method url-fetch) (uri (pypi-uri "flake8" version)) (sha256 (base32 - "0y732h02n2aih8gzyfj4bbhg4jgahyv84mjwfindk2g6w45rka0s")))) + "0sspgh2ph7bb5fmf49mrdhi7n5m421kfkxk1n0vn4akgg20q6lh7")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From e6df9f92f54d6c2be70d014a3a1506d0c4887968 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 6 Jun 2022 15:30:22 +0200 Subject: gnu: python-rope: Update to 1.1.1. * gnu/packages/python-xyz.scm (python-rope): Update to 1.1.1. [arguments]: Add build phase to disable broken test. [native-inputs]: Add python-pytest and python-pytest-timeout. [description]: Remove explicit mention of Python 2. --- gnu/packages/python-xyz.scm | 19 ++++++++++++++++--- 1 file changed, 16 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 0dfc6ca7e0..1bed505a56 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15484,20 +15484,33 @@ (define-public python-cysignals (define-public python-rope (package (name "python-rope") - (version "0.19.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (pypi-uri "rope" version)) (sha256 (base32 - "1nlhkmsfvn2p1msrmwqnypnvr993alzawnpc1605q7rfad3xgrk4")))) + "0bkzwkllxxdxd3w70xiy137lqvnlmmaplsc2ya3s23ss4kq8y10k")))) (build-system python-build-system) + (arguments + (list #:phases + `(modify-phases %standard-phases + (add-after 'unpack 'disable-broken-test + (lambda _ + (substitute* "ropetest/contrib/autoimporttest.py" + (("def test_search_module") + "def __notest_search_module") + (("def test_search_submodule") + "def __notest_search_submodule"))))))) + (native-inputs + (list python-pytest-timeout + python-pytest)) (home-page "https://github.com/python-rope/rope") (synopsis "Refactoring library for Python") (description "Rope is a refactoring library for Python. It facilitates the renaming, moving and extracting of attributes, functions, modules, fields -and parameters in Python 2 source code. These refactorings can also be applied +and parameters in Python source code. These refactorings can also be applied to occurrences in strings and comments.") (license license:lgpl3+))) -- cgit v1.2.3 From 1c7d5b1c822b4a0820e02afde3853eeb3093b2f3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jun 2022 13:04:08 -0400 Subject: gnu: Add python-exodriver. * gnu/packages/python-xyz.scm (python-exodriver): New variable. --- gnu/packages/python-xyz.scm | 54 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1bed505a56..f9f5b26ea1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -187,6 +187,7 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) #:use-module (gnu packages libidn) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages man) @@ -16966,6 +16967,59 @@ (define-public python-pymodbus @end itemize") (license license:bsd-3))) +(define-public python-exodriver + (package + (name "python-exodriver") + (version "2.6.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/labjack/exodriver") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ikjz8147p14s814yabdq821y691klnr2yg54zgsymcc97kvwp2q")))) + (outputs (list "out" + "doc")) ;544 KiB of examples + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ;no test suite + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output) + "RUN_LDCONFIG=0" + "LINK_SO=1") + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key make-flags #:allow-other-keys #:rest args) + (with-directory-excursion "liblabjackusb" + (apply (assoc-ref %standard-phases 'build) + `(,@args #:make-flags ,make-flags))))) + (replace 'install + (lambda* (#:key make-flags #:allow-other-keys #:rest args) + (with-directory-excursion "liblabjackusb" + (apply (assoc-ref %standard-phases 'install) + `(,@args #:make-flags ,make-flags))) + ;; Install udev rules. + (install-file "90-labjack.rules" + (string-append #$output "/lib/udev/rules.d")) + ;; Install examples. + (let ((doc (string-append #$output:doc "/share/doc/" #$name))) + (mkdir-p doc) + (copy-recursively "examples" + (string-append doc "/examples")))))))) + (inputs (list libusb)) + (home-page "https://github.com/labjack/exodriver") + (synopsis "USB driver for LabJack data acquisition instruments") + (description "This package provides @code{liblabjackusb}, a USB library for low-level +communication with the U3, U6, UE9, Digit, T4 and T7 LabJack data acquisition +instruments. A udev rule is also included to allow unprivileged users to +communicate with the instruments via USB.") + (license license:expat))) ;see README + (define-public python-kivy-garden (package (name "python-kivy-garden") -- cgit v1.2.3 From b9c8c3585bab79a44d820a43f9bf4597445e7929 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jun 2022 13:32:34 -0400 Subject: gnu: Add python-labjack. * gnu/packages/python-xyz.scm (python-labjack): New variable. --- gnu/packages/python-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f9f5b26ea1..feb211edb8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17020,6 +17020,38 @@ (define-public python-exodriver communicate with the instruments via USB.") (license license:expat))) ;see README +(define-public python-labjack + (package + (name "python-labjack") + (version "2.0.4") + (source (origin + (method url-fetch) + (uri (pypi-uri "LabJackPython" version)) + (sha256 + (base32 + "013bjqdi05vlbdqprr6kqi8gs4qhqc7rnyp1klw8k6fng77rpdzz")))) + (build-system python-build-system) + (arguments + (list + #:tests? #f ;no test suite + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-liblabjackusb.so + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "." "\\.py$") + (("ctypes.CDLL\\(\"liblabjackusb.so\"") + (format #f "ctypes.CDLL(~s" + (search-input-file inputs + "lib/liblabjackusb.so"))))))))) + ;; exodriver is provided as a regular input, as only its shared object is + ;; used, not its Python API. + (inputs (list python-exodriver)) + (home-page "https://labjack.com/support/software/examples/ud/labjackpython") + (synopsis "Python library for LabJack U3, U6, UE9 and U12") + (description "This Python library allows communicating with the U3, U6, +UE9 and U12 LabJack data acquisition (DAQ) modules.") + (license license:expat))) ;see setup.py + (define-public python-kivy-garden (package (name "python-kivy-garden") -- cgit v1.2.3 From b995c1bd10e445cfdabadb1a5e30935729ce094c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jun 2022 22:18:36 +0300 Subject: gnu: python-flake8: Allow building with newer python-pyflakes. * gnu/packages/python-xyz.scm (python-flake8)[source]: Add snippet to remove upper bound on dependency python-pyflakes version. --- gnu/packages/python-xyz.scm | 9 ++++++++- 1 file changed, 8 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 feb211edb8..6132019a53 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10200,7 +10200,14 @@ (define-public python-flake8 (uri (pypi-uri "flake8" version)) (sha256 (base32 - "0sspgh2ph7bb5fmf49mrdhi7n5m421kfkxk1n0vn4akgg20q6lh7")))) + "0sspgh2ph7bb5fmf49mrdhi7n5m421kfkxk1n0vn4akgg20q6lh7")) + (snippet + #~(begin + (use-modules (guix build utils)) + (substitute* "setup.cfg" + ;; Remove upper bound on pyflakes version. + (("(pyflakes >=.*), .*" _ pyflakes) + (string-append pyflakes "\n"))))))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 2aceb1e13ee994385bd20cfc8a59346366447199 Mon Sep 17 00:00:00 2001 From: Peter Polidoro Date: Fri, 27 May 2022 14:37:22 -0400 Subject: gnu: Add python-canopen. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-canopen): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6132019a53..17e9a922fb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2072,6 +2072,30 @@ (define-public python-can sending and receiving messages on a CAN bus.") (license license:lgpl3+))) +(define-public python-canopen + (package + (name "python-canopen") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "canopen" version)) + (sha256 + (base32 "1nb543wb37kj95v6bhh272lm5gkpi41q3pnsl1fxlyizm2gamj5w")))) + (build-system python-build-system) + (native-inputs (list python-packaging)) + (propagated-inputs (list python-can)) + (home-page "https://github.com/christiansandberg/canopen") + (synopsis "CANopen stack implementation") + (description + "This package provides a Python implementation of the +@uref{https://www.can-cia.org/canopen/,CANopen standard} for +@acronym{CANs, controller-area networks}. The aim of the project is to +support the most common parts of the CiA 301 standard in a simple +Pythonic interface. It is mainly targeted for testing and automation +tasks rather than a standard compliant master implementation.") + (license license:expat))) + (define-public python-caniusepython3 (package (name "python-caniusepython3") -- cgit v1.2.3 From f08bfca0836ea515ea8ddcfb72d319fd6838908a Mon Sep 17 00:00:00 2001 From: Peter Polidoro Date: Fri, 27 May 2022 14:57:26 -0400 Subject: gnu: Add python-progress. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-progress): 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 17e9a922fb..9a84f9e534 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13883,6 +13883,25 @@ (define-public python-promise "Promises/A+ implementation for Python") (license license:expat))) +(define-public python-progress + (package + (name "python-progress") + (version "1.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "progress" version)) + (sha256 + (base32 "1k9lpb7lqr6mywpnqcz71y6qny54xlgprdp327za2gy0nnc6xj69")))) + (build-system python-build-system) + (home-page "http://github.com/verigak/progress/") + (synopsis "Progress reporting bars for Python") + (description "This Python package provides progress reporting for visual +of progress of long running operations. There are multiple choices of +progress bars and spinners, with customizable options, such as width, fill +character, and suffix.") + (license license:isc))) + (define-public python-progressbar2 (package (name "python-progressbar2") -- cgit v1.2.3 From b04c338265e77031a1b45f75d4b2b3a526c23e84 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 5 Jun 2022 21:20:36 -0400 Subject: gnu: python-msgpack: Update to 1.0.4. * gnu/packages/python-xyz.scm (python-msgpack): Update to 1.0.4. --- 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 9a84f9e534..7c9c0b2cc6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11069,13 +11069,13 @@ (define-public python-llfuse (define-public python-msgpack (package (name "python-msgpack") - (version "1.0.3") + (version "1.0.4") (source (origin (method url-fetch) (uri (pypi-uri "msgpack" version)) (sha256 (base32 - "07m84yisf8m6gr68ip9v6vzxax7kqbn8qxg7ir18clk1jgxwgzai")))) + "0pqzy1zclyhd42gfibhkcqymbspy5a6v421g87mh40h3iz0nkn7m")))) (build-system python-build-system) (arguments `(#:modules ((guix build utils) -- cgit v1.2.3 From 2660f99b5761d215555dc0f95a562ba68e4a0f77 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Mon, 6 Jun 2022 22:13:03 +0200 Subject: gnu: python-pycodestyle: Update to 2.8.0. * gnu/packages/python-xyz.scm (python-pycodestyle): Update to 2.8.0. [arguments]: Respect tests?. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 9 +++++---- 1 file changed, 5 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 7c9c0b2cc6..56a3972703 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6468,21 +6468,22 @@ (define-public python-socksipychain (define-public python-pycodestyle (package (name "python-pycodestyle") - (version "2.7.0") + (version "2.8.0") (source (origin (method url-fetch) (uri (pypi-uri "pycodestyle" version)) (sha256 (base32 - "1vqwmzmjdv331kmfq3q9j3as2x7r2r49lf83r9w4147pdg8c32f3")))) + "0zxyrg8029lzjhima6l5nk6y0z6lm5wfp9qchz3s33j3xx3mipgd")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ - (invoke "pytest" "-vv")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) (native-inputs (list python-pytest)) (home-page "https://pycodestyle.readthedocs.io/") -- cgit v1.2.3 From 7e7c8b253cc520812dacfb3a33427a992f56b74c Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Mon, 6 Jun 2022 22:15:10 +0200 Subject: gnu: python-flake8: Update to 4.0.1. * gnu/packages/python-xyz.scm (python-flake8): Update to 4.0.1. [source]: Remove snippet. [arguments]: Respect tests?. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 56a3972703..b9af0d4a3f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10219,27 +10219,21 @@ (define-public python-mccabe (define-public python-flake8 (package (name "python-flake8") - (version "3.9.2") + (version "4.0.1") (source (origin (method url-fetch) (uri (pypi-uri "flake8" version)) (sha256 (base32 - "0sspgh2ph7bb5fmf49mrdhi7n5m421kfkxk1n0vn4akgg20q6lh7")) - (snippet - #~(begin - (use-modules (guix build utils)) - (substitute* "setup.cfg" - ;; Remove upper bound on pyflakes version. - (("(pyflakes >=.*), .*" _ pyflakes) - (string-append pyflakes "\n"))))))) + "03c7mnk34wfz7a0m5zq0273y94awz69fy5iww8alh4a4v96h6vl0")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-v")))))) + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-v"))))))) (propagated-inputs (list python-pycodestyle python-entrypoints python-pyflakes python-mccabe)) (native-inputs (list python-mock python-pytest)) -- cgit v1.2.3 From 49a47bdcc5fb6dd8363917ea005fb51155c8e266 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Jun 2022 09:22:35 +0300 Subject: gnu: python-flake8-polyfill: Fix building with python-flake8@4. * gnu/packages/python-xyz.scm (python-flake8-polyfill)[source]: Add patch. * gnu/packages/patches/python-flake8-polyfill-flake8-4-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + .../python-flake8-polyfill-flake8-4-compat.patch | 32 ++++++++++++++++++++++ gnu/packages/python-xyz.scm | 3 +- 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-flake8-polyfill-flake8-4-compat.patch (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 68b317b32a..4e58df6ff7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1593,6 +1593,7 @@ dist_patch_DATA = \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ %D%/packages/patches/python-chai-drop-python2.patch \ + %D%/packages/patches/python-flake8-polyfill-flake8-4-compat.patch \ %D%/packages/patches/python-random2-getrandbits-test.patch \ %D%/packages/patches/python-poppler-qt5-fix-build.patch \ %D%/packages/patches/python-w3lib-fix-test-failure.patch \ diff --git a/gnu/packages/patches/python-flake8-polyfill-flake8-4-compat.patch b/gnu/packages/patches/python-flake8-polyfill-flake8-4-compat.patch new file mode 100644 index 0000000000..7f5babd07d --- /dev/null +++ b/gnu/packages/patches/python-flake8-polyfill-flake8-4-compat.patch @@ -0,0 +1,32 @@ +https://github.com/PyCQA/flake8-polyfill/commit/3cf414350e82ceb835ca2edbd5d5967d33e9ff35.patch + + +From 3cf414350e82ceb835ca2edbd5d5967d33e9ff35 Mon Sep 17 00:00:00 2001 +From: Ian Stapleton Cordasco +Date: Mon, 1 Nov 2021 19:18:04 -0500 +Subject: [PATCH] Skip unnecessary tests on Flake8 4.x+ + +--- + tests/test_stdin.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/test_stdin.py b/tests/test_stdin.py +index 4350967..212b309 100644 +--- a/tests/test_stdin.py ++++ b/tests/test_stdin.py +@@ -1,4 +1,5 @@ + """Tests for polyfill's stdin monkey patching.""" ++import flake8 + import pep8 + import pycodestyle + import pytest +@@ -6,6 +7,9 @@ + from flake8_polyfill import stdin + from flake8_polyfill import version + ++if (4, 0, 0) <= flake8.__version_info__: ++ pytestmark = pytest.mark.skip ++ + + def test_modules_dict(): + """Verify that it works the way we expect.""" diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b9af0d4a3f..d5ad05f4d9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10359,7 +10359,8 @@ (define-public python-flake8-polyfill (uri (pypi-uri "flake8-polyfill" version)) (sha256 (base32 - "1nlf1mkqw856vi6782qcglqhaacb23khk9wkcgn55npnjxshhjz4")))) + "1nlf1mkqw856vi6782qcglqhaacb23khk9wkcgn55npnjxshhjz4")) + (patches (search-patches "python-flake8-polyfill-flake8-4-compat.patch")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From 0fd5222ad61fb1d2a776d018e1dd7161e50bea41 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Jun 2022 09:24:14 +0300 Subject: gnu: python-flake8-polyfill: Honor tests? flag. * gnu/packages/python-xyz.scm (python-flake8-polyfill)[arguments]: Adjust custom 'check phase to honor the #:tests? flag. --- gnu/packages/python-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d5ad05f4d9..f4ae6a7e62 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10366,13 +10366,14 @@ (define-public python-flake8-polyfill '(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ + (lambda* (#:key tests? #:allow-other-keys) ;; Be compatible with Pytest 4: ;; https://gitlab.com/pycqa/flake8-polyfill/merge_requests/7 (substitute* "setup.cfg" (("\\[pytest\\]") "[tool:pytest]")) - (invoke "py.test" "-v")))))) + (when tests? + (invoke "py.test" "-v"))))))) (propagated-inputs (list python-flake8)) (native-inputs -- cgit v1.2.3 From 478d2e4b02b90591c558df5eb3218d61bba231a0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Jun 2022 09:25:33 +0300 Subject: gnu: python-flake8-polyfill: Update home-page. * gnu/packages/python-xyz.scm (python-flake8-polyfill)[home-page]: Update to new upstream 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 f4ae6a7e62..97335e34cb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10378,7 +10378,7 @@ (define-public python-flake8-polyfill (list python-flake8)) (native-inputs (list python-mock python-pep8 python-pycodestyle python-pytest)) - (home-page "https://gitlab.com/pycqa/flake8-polyfill") + (home-page "https://github.com/pycqa/flake8-polyfill") (synopsis "Polyfill package for Flake8 plugins") (description "This package that provides some compatibility helpers for Flake8 -- cgit v1.2.3 From e326552698845eb45582441c35e5dcc7733a1130 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jun 2022 14:25:59 -0400 Subject: gnu: python-radon: Update to 5.1.0. * gnu/packages/python-xyz.scm (python-radon): Update to 5.1.0. [propagated-inputs]: Remove python-flake8-polyfill. --- gnu/packages/python-xyz.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 97335e34cb..bef157cbe7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19033,14 +19033,14 @@ (define-public python-relatorio (define-public python-radon (package (name "python-radon") - (version "4.1.0") + (version "5.1.0") (source (origin (method url-fetch) (uri (pypi-uri "radon" version)) (sha256 (base32 - "0vfxxzbnz5lxfvp0yxp35g6c8qqnnbhi4dm7shkm1d3d4192q22n")))) + "1vmf56zsf3paa1jadjcjghiv2kxwiismyayq42ggnqpqwm98f7fb")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -19054,10 +19054,8 @@ (define-public python-radon (replace 'check (lambda _ (invoke "python" "radon/tests/run.py")))))) - (propagated-inputs - (list python-colorama python-flake8-polyfill python-mando)) - (native-inputs - (list python-pytest python-pytest-mock)) + (propagated-inputs (list python-colorama python-mando)) + (native-inputs (list python-pytest python-pytest-mock)) (home-page "https://radon.readthedocs.org/") (synopsis "Code Metrics in Python") (description "Radon is a Python tool which computes various code metrics. -- cgit v1.2.3 From e05cac9080d784882b71dc19cd3affe0fb16dbc0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jun 2022 14:28:36 -0400 Subject: gnu: python-pep8-naming: Update to 0.13.0. * gnu/packages/python-xyz.scm (python-pep8-naming): Update to 0.13.0. [propagated-inputs]: Remove python-flake8-polyfill. --- gnu/packages/python-xyz.scm | 7 +++---- 1 file changed, 3 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 bef157cbe7..9af1ddba78 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10082,17 +10082,16 @@ (define-public python-pep8 (define-public python-pep8-naming (package (name "python-pep8-naming") - (version "0.12.0") + (version "0.13.0") (source (origin (method url-fetch) (uri (pypi-uri "pep8-naming" version)) (sha256 (base32 - "04kyh9hkpyc8jzj16d1kkk29b5n8miqdvbs0zm035n1z5z5kx6hz")))) + "1dc0b6xw1cxp01v9zsv4ryk49rfs1lngfpvzsixgp8b7z3ffcf4z")))) (build-system python-build-system) - (propagated-inputs - (list python-flake8 python-flake8-polyfill)) + (propagated-inputs (list python-flake8)) (home-page "https://github.com/PyCQA/pep8-naming") (synopsis "Check PEP-8 naming conventions") (description -- cgit v1.2.3 From f4696aeb943c5ece7082b686786fcc0c26c7b88c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jun 2022 14:28:57 -0400 Subject: gnu: Remove python-flake8-polyfill. This package is mostly useful for Flake8 version 2 or 3 (see: https://github.com/PyCQA/flake8-polyfill/pull/14#issuecomment-979161161). * gnu/packages/python-xyz.scm (python-flake8-polyfill): Delete variable. --- gnu/packages/python-xyz.scm | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9af1ddba78..9ce64f129f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10348,42 +10348,6 @@ (define-public python-flake8-implicit-str-concat unnecessary plus operators for explicit string literal concatenation.") (license license:expat))) -(define-public python-flake8-polyfill - (package - (name "python-flake8-polyfill") - (version "1.0.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "flake8-polyfill" version)) - (sha256 - (base32 - "1nlf1mkqw856vi6782qcglqhaacb23khk9wkcgn55npnjxshhjz4")) - (patches (search-patches "python-flake8-polyfill-flake8-4-compat.patch")))) - (build-system python-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - ;; Be compatible with Pytest 4: - ;; https://gitlab.com/pycqa/flake8-polyfill/merge_requests/7 - (substitute* "setup.cfg" - (("\\[pytest\\]") - "[tool:pytest]")) - (when tests? - (invoke "py.test" "-v"))))))) - (propagated-inputs - (list python-flake8)) - (native-inputs - (list python-mock python-pep8 python-pycodestyle python-pytest)) - (home-page "https://github.com/pycqa/flake8-polyfill") - (synopsis "Polyfill package for Flake8 plugins") - (description - "This package that provides some compatibility helpers for Flake8 -plugins that intend to support Flake8 2.x and 3.x simultaneously.") - (license license:expat))) - (define-public python-flake8-print (package (name "python-flake8-print") -- cgit v1.2.3 From 5022cf8e044cadaad41660f97c0a763ff0a81688 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jun 2022 14:12:04 -0400 Subject: gnu: python-flake8: Update to 4.0.1. * gnu/packages/python-xyz.scm (python-flake8): Update to 4.0.1. [phases]{check}: Delete extraneous add-installed-pythonpath call. [propagated-inputs]: Re-indent. [native-inputs]: Remove python-mock. --- gnu/packages/python-xyz.scm | 12 +++++++----- 1 file changed, 7 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 9ce64f129f..eefb08ae6a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10229,13 +10229,15 @@ (define-public python-flake8 (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (lambda* (#:key tests? #:allow-other-keys) (when tests? - (add-installed-pythonpath inputs outputs) (invoke "pytest" "-v"))))))) - (propagated-inputs (list python-pycodestyle python-entrypoints - python-pyflakes python-mccabe)) - (native-inputs (list python-mock python-pytest)) + (propagated-inputs + (list python-entrypoints + python-mccabe + python-pycodestyle + python-pyflakes)) + (native-inputs (list python-pytest)) (home-page "https://gitlab.com/pycqa/flake8") (synopsis "The modular source code checker: pep8, pyflakes and co") (description -- cgit v1.2.3 From 86a915433bfb9eccdcfa6239f95cd3acb87892ff Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jun 2022 15:49:46 -0400 Subject: gnu: xenon: Update to 0.9.0, rename and relocate. * gnu/packages/python-xyz.scm (python-xenon): Rename to... * gnu/packages/code.scm (xenon): ... this. Update to 0.9.0. [native-inputs]: Delete field. [inputs]: New field. [phases]: Delete argument. (python-xenon): Mark as deprecated. --- gnu/packages/code.scm | 30 +++++++++++++++++++++++++++++- gnu/packages/python-xyz.scm | 35 ----------------------------------- 2 files changed, 29 insertions(+), 36 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 1093bff028..4432e0b851 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2019 Hartmut Goebel -;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020, 2022 Maxim Cournoyer ;;; Copyright © 2020, 2021 Marius Bakke ;;; Copyright © 2020 Julien Lepiller ;;; Copyright © 2021 lu hui @@ -67,6 +67,7 @@ (define-module (gnu packages code) #:use-module (gnu packages perl-compression) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages serialization) @@ -1045,3 +1046,30 @@ (define-public cscope Using cscope, you can easily search for where symbols are used and defined.") (license license:bsd-3))) + +(define-public xenon + (package + (name "xenon") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "xenon" version)) + (sha256 + (base32 + "1f4gynjzfckm3rjfywwgz1c7icfx3zjqirf16aj73xv0c9ncpffj")))) + (build-system python-build-system) + (arguments (list #:tests? #f)) ;test suite not shipped with the PyPI archive + (inputs (list python-pyyaml python-radon python-requests)) + (home-page "https://xenon.readthedocs.org/") + (synopsis "Monitor code metrics for Python on your CI server") + (description + "Xenon is a monitoring tool based on Radon. It monitors code complexity. +Ideally, @code{xenon} is run every time code is committed. Through command +line options, various thresholds can be set for the complexity of code. It +will fail (i.e. it will exit with a non-zero exit code) when any of these +requirements is not met.") + (license license:expat))) + +(define-public python-xenon + (deprecated-package "python-xenon" xenon)) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index eefb08ae6a..722322e001 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19746,41 +19746,6 @@ (define-public python-rencode pure Python module.") (license license:bsd-3))) -(define-public python-xenon - (package - (name "python-xenon") - (version "0.7.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "xenon" version)) - (sha256 - (base32 - "0nv207ql2wmh9q62503np056c4vf1c1hlsi5cvv5p5kx574k6r2y")))) - (build-system python-build-system) - (native-inputs - (list python-pyyaml python-radon python-requests python-flake8 - python-tox)) - (arguments - `(#:tests? #f ;test suite not shipped with the PyPI archive - #:phases - (modify-phases %standard-phases - (add-before 'build 'patch-test-requirements - (lambda _ - ;; Remove httpretty dependency for tests. - (substitute* "setup.py" - (("httpretty") "")) - #t))))) - (home-page "https://xenon.readthedocs.org/") - (synopsis "Monitor code metrics for Python on your CI server") - (description - "Xenon is a monitoring tool based on Radon. It monitors code complexity. -Ideally, @code{xenon} is run every time code is committed. Through command -line options, various thresholds can be set for the complexity of code. It -will fail (i.e. it will exit with a non-zero exit code) when any of these -requirements is not met.") - (license license:expat))) - (define-public python-pysocks (package (name "python-pysocks") -- cgit v1.2.3 From 8b2ce33ee202263a3cd28e8709d91ca85ac32557 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jun 2022 17:22:21 -0400 Subject: gnu: nikola: Update to 8.2.2. * gnu/packages/python-xyz.scm (nikola): Update to 8.2.2. --- 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 722322e001..508753fd50 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28263,13 +28263,13 @@ (define-public python-phpserialize (define-public nikola (package (name "nikola") - (version "8.1.3") + (version "8.2.2") (source (origin (method url-fetch) (uri (pypi-uri "Nikola" version)) (sha256 - (base32 "1vspzvi4039zgjc93bspqjb384r6c9ksvmidbp8csws2pdbc7sh5")))) + (base32 "1h96y4sfypp2fbqxa8xrqch5f7r3srm2ly222k9w2n143h2spx4m")))) (build-system python-build-system) (propagated-inputs (list python-babel @@ -28305,7 +28305,6 @@ (define-public nikola (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - ;;(add-installed-pythonpath inputs outputs) (invoke "pytest" "tests" "--no-cov" "-k" "not test_compiling_markdown[hilite]"))))))) (home-page "https://getnikola.com/") -- cgit v1.2.3 From e3d2650726e0345b52649558d9319da3e6a8898a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jun 2022 21:43:58 -0400 Subject: gnu: python-pygit2: Update to 1.9.2 and enable tests. * gnu/packages/python-xyz.scm (python-pygit2): Update to 1.9.2. [tests?]: Delete argument. [phases]{check}: New phase override. [description]: Fix sentence. --- gnu/packages/python-xyz.scm | 13 ++++++++----- 1 file changed, 8 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 508753fd50..f58510ae8c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5662,24 +5662,27 @@ (define-public python-pyspnego (define-public python-pygit2 (package (name "python-pygit2") - (version "1.9.1") + (version "1.9.2") (source (origin (method url-fetch) (uri (pypi-uri "pygit2" version)) (sha256 - (base32 "1jdr6z1il03nifwgpcdf95w6xzzbfzdkcqq5dcqjaa0rnv1pjr7g")))) + (base32 "068bwhirigbh2435abyv4shdxgxvyfqf4dxfmhd4hihivwrl9290")))) (build-system python-build-system) (arguments - '(#:tests? #f)) ; tests don't run correctly in our environment + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-v"))))))) (propagated-inputs (list python-cached-property python-cffi libgit2)) (native-inputs (list python-pytest)) (home-page "https://github.com/libgit2/pygit2") (synopsis "Python bindings for libgit2") - (description "Pygit2 is a set of Python bindings to the libgit2 shared -library, libgit2 implements Git plumbing.") + (description "Pygit2 is a set of Python bindings to the libgit2 shared library.") ;; GPL2.0 only, with linking exception. (license license:gpl2))) -- cgit v1.2.3 From ceeb2bfcaeb4380e01d26c8425e28b94ac13558a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jun 2022 22:33:20 -0400 Subject: gnu: offlate: Fix build. * gnu/packages/python-xyz.scm (offlate) [phases]{patch-for-pygit2}: New phase. --- gnu/packages/python-xyz.scm | 8 +++++++- 1 file changed, 7 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 f58510ae8c..2c76ff1922 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24334,7 +24334,13 @@ (define-public offlate (build-system python-build-system) (arguments ;; No tests - `(#:tests? #f)) + `(#:tests? #f + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-for-pygit2 + (lambda _ + (substitute* "offlate/systems/git.py" + (("pygit2.remote.RemoteCallbacks") + "pygit2.RemoteCallbacks"))))))) (propagated-inputs (list python-android-stringslib python-dateutil -- cgit v1.2.3 From 96d47797dce361bd7f3b1ce860b1ec4851e2db5a Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 6 Jun 2022 19:54:34 -0700 Subject: gnu: python-debian: Set version to build reproducibly. * gnu/packages/python-xyz.scm (python-debian)[arguments]: Add 'set-version phase. --- gnu/packages/python-xyz.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2c76ff1922..f3d7fab973 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12465,6 +12465,13 @@ (define-public python-debian (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'set-version + ;; for reproducible builds, otherwise python-debian + ;; generates a _version.py including the date + (lambda _ + (copy-file "lib/debian/_version.py.in" "lib/debian/_version.py") + (substitute* "lib/debian/_version.py" + (("__CHANGELOG_VERSION__") ,version)))) (add-after 'unpack 'remove-debian-specific-tests ;; python-apt, apt and dpkg are not yet available in guix, ;; and these tests heavily depend on them. -- cgit v1.2.3