GNU bug report logs - #66788
[PATCH 0/2] Update python-black to 23.1.0

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 66788 in the body.
You can then email your comments to 66788 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: guix-patches <at> gnu.org
Cc: ngraves <at> ngraves.fr
Subject: [PATCH 0/2] Update python-black to 23.1.0
Date: Sat, 28 Oct 2023 11:45:34 +0200

This patch series updates python-black to 23.1.0.

Nicolas Graves (2):
  gnu: python-packaging: Update to 22.0.
  gnu: python-black: Update to 23.1.0.

 gnu/packages/python-xyz.scm | 65 +++++++++++++++----------------------
 1 file changed, 27 insertions(+), 38 deletions(-)

-- 
2.41.0

Message #8 received at 66788 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Nicolas Graves <ngraves <at> ngraves.fr>
Cc: 66788 <at> debbugs.gnu.org
Subject: Re: [bug#66788] [PATCH 0/2] Update python-black to 23.1.0
Date: Mon, 04 Dec 2023 21:56:42 +0100

Hi,

Nicolas Graves <ngraves <at> ngraves.fr> skribis:

> This patch series updates python-black to 23.1.0.
>
> Nicolas Graves (2):
>   gnu: python-packaging: Update to 22.0.
>   gnu: python-black: Update to 23.1.0.

Looks like you forgot to send the actual patches, no?

Ludo’.

Message #11 received at 66788 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 66788 <at> debbugs.gnu.org
Cc: ludo <at> gnu.org, ngraves <at> ngraves.fr
Subject: [PATCH 1/2] gnu: python-black: Update to 23.1.0.
Date: Sun,  4 Feb 2024 13:54:38 +0100

* gnu/packages/python-xyz.scm (python-black): Update to 23.1.0.
---
 gnu/packages/python-xyz.scm | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c68b17b0ab..5ffea67fc9 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7496,43 +7496,41 @@ (define-public python-language-server
 (define-public python-black
   (package
     (name "python-black")
-    (version "22.3.0")
+    (version "23.1.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "black" version))
        (sha256
-        (base32
-         "0yfahlqc7dsdp1js0cbv706apldnfnlbal9b53cww8n0hs40n0im"))))
-    (build-system python-build-system)
+        (base32 "1b4jjv3fw2wgssnw2v1x0w09s7rz9sj5g4i1lwmmlgwhm2z9ggdh"))))
+    (build-system pyproject-build-system)
+    ;; These tests fail because Guix replaces the file shebangs.
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'patch-source-shebangs 'use-absolute-file-names
-           (lambda* (#:key native-inputs inputs #:allow-other-keys)
-             (let* ((inpts (or native-inputs inputs))
-                    (python3 (search-input-file inpts "/bin/python3")))
-               (substitute* (find-files "tests" "\\.py$")
-                 (("#!/usr/bin/env python3(\\.[0-9]+)?" _ minor-version)
-                  (string-append "#!" python3 (if (string? minor-version)
-                                                  minor-version
-                                                  "")))))))
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests? (invoke "pytest" "-vv")))))))
+     '(#:test-flags `("-k" ,(string-append
+                             "not test_infer_target_version "
+                             "and not test_simple_format[fmtonoff] "
+                             "and not test_simple_format[function] "
+                             "and not test_simple_format[string_prefixes] "
+                             "and not test_python_39[python39]"))))
     (propagated-inputs
      (list python-click
            python-attrs
            python-appdirs
            python-pathspec
            python-mypy-extensions
+           python-packaging
            python-platformdirs
            python-regex
            python-tomli
            python-typed-ast
            python-typing-extensions))
     (native-inputs
-     (list python-pytest python-pytest-aiohttp python-setuptools-scm))
+     (list python-hatchling
+           python-hatch-vcs
+           python-hatch-fancy-pypi-readme
+           python-pytest
+           python-pytest-aiohttp
+           python-setuptools-scm))
     (home-page "https://github.com/psf/black")
     (synopsis "The uncompromising code formatter")
     (description "Black is the uncompromising Python code formatter.")
-- 
2.41.0

Message #14 received at 66788 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 66788 <at> debbugs.gnu.org
Cc: ludo <at> gnu.org, ngraves <at> ngraves.fr
Subject: [PATCH 2/2] gnu: python-packaging: Update to 22.0.
Date: Sun,  4 Feb 2024 13:54:39 +0100

* gnu/packages/python-xyz.scm (python-packaging): Update to 22.0.
---
 gnu/packages/python-xyz.scm | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 5ffea67fc9..b1d2923595 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23500,25 +23500,16 @@ (define-public python-gtts
 (define-public python-packaging
   (package/inherit python-packaging-bootstrap
     (name "python-packaging")
-    (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (replace 'check
-                    (lambda* (#:key tests? #:allow-other-keys)
-                      (if tests?
-                          (invoke "pytest" "-vv")
-                          (format #t "test suite not run~%")))))))
-    (native-inputs (list python-pretend python-pytest))
-    (propagated-inputs (list python-pyparsing python-six))
-    (home-page "https://github.com/pypa/packaging")
-    (synopsis "Core utilities for Python packages")
-    (description "Packaging is a Python module for dealing with Python packages.
-     It offers an interface for working with package versions, names, and dependency
-     information.")
-    ;; From 'LICENSE': This software is made available under the terms of
-    ;; *either* of the licenses found in LICENSE.APACHE or LICENSE.BSD.
-    ;; Contributions to this software is made under the terms of *both* these
-    ;; licenses.
-    (license (list license:asl2.0 license:bsd-2))))
+    (version "22.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "packaging" version))
+       (sha256
+        (base32 "1lygw8fw9qj8md86g0ckzp16y1qlhw60zq0pjy7pn0acplhfr611"))))
+    (build-system pyproject-build-system)
+    (native-inputs (list python-pretend python-pytest python-flit-core))
+    (propagated-inputs (list python-pyparsing python-six))))
 
 (define-public python-relatorio
   (package
-- 
2.41.0

Message #17 received at 66788 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 66788 <at> debbugs.gnu.org
Subject: Re: [bug#66788] [PATCH 0/2] Update python-black to 23.1.0
Date: Sun, 04 Feb 2024 13:55:24 +0100

On 2023-12-04 21:56, Ludovic Courtès wrote:

> Hi,
>
> Nicolas Graves <ngraves <at> ngraves.fr> skribis:
>
>> This patch series updates python-black to 23.1.0.
>>
>> Nicolas Graves (2):
>>   gnu: python-packaging: Update to 22.0.
>>   gnu: python-black: Update to 23.1.0.
>
> Looks like you forgot to send the actual patches, no?

Indeed, I've sent them now, sorry.
>
> Ludo’.
>
>
>

-- 
Best regards,
Nicolas Graves

Message #20 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: Nicolas Graves via Guix-patches via <guix-patches <at> gnu.org>,
 66788 <at> debbugs.gnu.org
Subject: Re: [bug#66788] [PATCH 0/2] Update python-black to 23.1.0
Date: Fri, 10 May 2024 11:48:43 +0200

On 2023-10-28 11:45, Nicolas Graves via Guix-patches via wrote:

> This patch series updates python-black to 23.1.0.
>
> Nicolas Graves (2):
>   gnu: python-packaging: Update to 22.0.
>   gnu: python-black: Update to 23.1.0.
>
>  gnu/packages/python-xyz.scm | 65 +++++++++++++++----------------------
>  1 file changed, 27 insertions(+), 38 deletions(-)

This patch series will probably have to be rebased entirely after the
work done on python-team branch. Closing the issue.

-- 
Best regards,
Nicolas Graves

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.