unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#55814] [PATCH] Updated python-flake8 and inputs to reenable build.
@ 2022-06-06  1:43 Christopher Rodriguez
  2022-06-06  6:13 ` Liliana Marie Prikler
                   ` (5 more replies)
  0 siblings, 6 replies; 16+ messages in thread
From: Christopher Rodriguez @ 2022-06-06  1:43 UTC (permalink / raw)
  To: 55814; +Cc: Christopher Rodriguez

---

Hey all,

I noticed today that `python-flake8` was failing to build, as one of its inputs
(`python-pyflakes`) had been bumped too high for the older version's `check`
phase. Tried to take the initiative and threw together this patch; It builds in
my local tree, and had been linted/styled/tested/etc. I believe I have done
everything by the book, but if I need to fix anything, let me know (I'm still
new to contributing)!

Thanks for Your time!


 gnu/packages/python-xyz.scm | 54 ++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0dfc6ca7e0..77f2c88235 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -6443,23 +6443,21 @@ (define-public python-socksipychain
 (define-public python-pycodestyle
   (package
     (name "python-pycodestyle")
-    (version "2.7.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "pycodestyle" version))
-       (sha256
-        (base32
-         "1vqwmzmjdv331kmfq3q9j3as2x7r2r49lf83r9w4147pdg8c32f3"))))
+    (version "2.8.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "pycodestyle" version))
+              (sha256
+               (base32
+                "0zxyrg8029lzjhima6l5nk6y0z6lm5wfp9qchz3s33j3xx3mipgd"))))
     (build-system python-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda _
-             (invoke "pytest" "-vv"))))))
-    (native-inputs
-     (list python-pytest))
+     `(#:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda (#:keys input output tests? #:allow-other-keys)
+                      (if tests?
+                          (invoke "pytest" "-vv")))))))
+    (native-inputs (list python-pytest))
     (home-page "https://pycodestyle.readthedocs.io/")
     (synopsis "Python style guide checker")
     (description "@code{pycodestyle} (formerly pep8) is a tool to check
@@ -10143,18 +10141,17 @@ (define-public python-pyflakes
   (package
     (name "python-pyflakes")
     (version "2.4.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "pyflakes" version))
-        (sha256
-         (base32
-          "0k5jn8jpxni264wxf6cc3xcd1qckc0pww30bsd77mwzdf8l5ra05"))))
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "pyflakes" version))
+              (sha256
+               (base32
+                "0k5jn8jpxni264wxf6cc3xcd1qckc0pww30bsd77mwzdf8l5ra05"))))
     (build-system python-build-system)
     (home-page "https://github.com/PyCQA/pyflakes")
     (synopsis "Passive checker of Python programs")
     (description
-      "Pyflakes statically checks Python source code for common errors.")
+     "Pyflakes statically checks Python source code for common errors.")
     (license license:expat)))
 
 (define-public python-pyflakes-2.2
@@ -10193,20 +10190,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"))))
+                "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 inputs outputs tests? #:allow-other-keys)
+                      (if 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))
-- 
2.36.1





^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [bug#55814] [PATCH] Updated python-flake8 and inputs to reenable build.
  2022-06-06  1:43 [bug#55814] [PATCH] Updated python-flake8 and inputs to reenable build Christopher Rodriguez
@ 2022-06-06  6:13 ` Liliana Marie Prikler
  2022-06-06  9:31 ` Maxime Devos
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 16+ messages in thread
From: Liliana Marie Prikler @ 2022-06-06  6:13 UTC (permalink / raw)
  To: Christopher Rodriguez, 55814

Am Sonntag, dem 05.06.2022 um 21:43 -0400 schrieb Christopher
Rodriguez:
> It builds in my local tree, and had been linted/styled/tested/etc.
Did you also check that all the packages referring to it build?  The
upgrade to python-pyflakes ignored this important check as well as the
call not to update packages with more than 300 dependents on master.

>  gnu/packages/python-xyz.scm | 54 ++++++++++++++++++-----------------
> --
>  1 file changed, 26 insertions(+), 28 deletions(-)
> 
> diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-
> xyz.scm
> index 0dfc6ca7e0..77f2c88235 100644
> --- a/gnu/packages/python-xyz.scm
> +++ b/gnu/packages/python-xyz.scm
> @@ -6443,23 +6443,21 @@ (define-public python-socksipychain
>  (define-public python-pycodestyle
>    (package
>      (name "python-pycodestyle")
> -    (version "2.7.0")
> -    (source
> -     (origin
> -       (method url-fetch)
> -       (uri (pypi-uri "pycodestyle" version))
> -       (sha256
> -        (base32
> -         "1vqwmzmjdv331kmfq3q9j3as2x7r2r49lf83r9w4147pdg8c32f3"))))
> +    (version "2.8.0")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (pypi-uri "pycodestyle" version))
> +              (sha256
> +               (base32
> +               
> "0zxyrg8029lzjhima6l5nk6y0z6lm5wfp9qchz3s33j3xx3mipgd"))))
Factor out into a single patch.

>      (build-system python-build-system)
>      (arguments
> -     `(#:phases
> -       (modify-phases %standard-phases
> -         (replace 'check
> -           (lambda _
> -             (invoke "pytest" "-vv"))))))
> +     `(#:phases (modify-phases %standard-phases
> +                  (replace 'check
> +                    (lambda (#:keys input output tests? #:allow-
> other-keys)
> +                      (if tests?
> +                          (invoke "pytest" "-vv")))))))
IIUC this is fixing an already existing problem; thus factor out into
its own patch.

> -    (native-inputs
> -     (list python-pytest)) 
> +    (native-inputs (list python-pytest))
I'd recommend not mixing updates and semantic fixes with style fixes.

>      (home-page "https://pycodestyle.readthedocs.io/")
>      (synopsis "Python style guide checker")
>      (description "@code{pycodestyle} (formerly pep8) is a tool to
> check
> @@ -10143,18 +10141,17 @@ (define-public python-pyflakes
>    (package
>      (name "python-pyflakes")
>      (version "2.4.0")
> -    (source
> -      (origin
> -        (method url-fetch)
> -        (uri (pypi-uri "pyflakes" version))
> -        (sha256
> -         (base32
> -          "0k5jn8jpxni264wxf6cc3xcd1qckc0pww30bsd77mwzdf8l5ra05"))))
> +    (source (origin
> +              (method url-fetch)
> +              (uri (pypi-uri "pyflakes" version))
> +              (sha256
> +               (base32
> +               
> "0k5jn8jpxni264wxf6cc3xcd1qckc0pww30bsd77mwzdf8l5ra05"))))
>      (build-system python-build-system)
>      (home-page "https://github.com/PyCQA/pyflakes")
>      (synopsis "Passive checker of Python programs")
>      (description
> -      "Pyflakes statically checks Python source code for common
> errors.")
> +     "Pyflakes statically checks Python source code for common
> errors.")
>      (license license:expat)))
Nothing to do here.

>  (define-public python-pyflakes-2.2
> @@ -10193,20 +10190,21 @@ (define-public python-mccabe
>  (define-public python-flake8
>    (package
>      (name "python-flake8")
> -    (version "3.9.2")
> +    (version "4.0.1")
Note that 4.0.1 is a semver break from 3.9 – also, we still supply 3.8.
Thus, you might want to keep python-flake8-3.9 as a variant.

>      (source (origin
>                (method url-fetch)
>                (uri (pypi-uri "flake8" version))
>                (sha256
>                 (base32
> -               
> "0sspgh2ph7bb5fmf49mrdhi7n5m421kfkxk1n0vn4akgg20q6lh7"))))
> +               
> "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 inputs outputs tests? #:allow-
> other-keys)
> +                      (if tests?
> +                          (add-installed-pythonpath inputs outputs)
> +                          (invoke "pytest" "-v")))))))
Again, should be its own patch.

Cheers




^ permalink raw reply	[flat|nested] 16+ messages in thread

* [bug#55814] [PATCH] Updated python-flake8 and inputs to reenable build.
  2022-06-06  1:43 [bug#55814] [PATCH] Updated python-flake8 and inputs to reenable build Christopher Rodriguez
  2022-06-06  6:13 ` Liliana Marie Prikler
@ 2022-06-06  9:31 ` Maxime Devos
  2022-06-06 17:24 ` [bug#55814] [PATCH v2] " Christopher Rodriguez
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 16+ messages in thread
From: Maxime Devos @ 2022-06-06  9:31 UTC (permalink / raw)
  To: Christopher Rodriguez, 55814

[-- Attachment #1: Type: text/plain, Size: 540 bytes --]

Christopher Rodriguez schreef op zo 05-06-2022 om 21:43 [-0400]:
> +                      (if tests?
> +                          (add-installed-pythonpath inputs outputs)
> +                          (invoke "pytest" "-v")))))))

This does the following:

  * if tests?=#true, do (add-installed-pythonpath ...
  * if tests?=#false, do (invoke ...)

You'll probably need

 (when tests?
    (add-installed-pythonpath ...)
    (invoke ...))

instead.

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [bug#55814] [PATCH v2] Updated python-flake8 and inputs to reenable build.
  2022-06-06  1:43 [bug#55814] [PATCH] Updated python-flake8 and inputs to reenable build Christopher Rodriguez
  2022-06-06  6:13 ` Liliana Marie Prikler
  2022-06-06  9:31 ` Maxime Devos
@ 2022-06-06 17:24 ` Christopher Rodriguez
  2022-06-06 18:33   ` Maxime Devos
  2022-06-07  1:10 ` [bug#55814] [PATCH v3 1/8] Refreshed `python-pycodestyle` to version 2.8.0 Christopher Rodriguez
                   ` (2 subsequent siblings)
  5 siblings, 1 reply; 16+ messages in thread
From: Christopher Rodriguez @ 2022-06-06 17:24 UTC (permalink / raw)
  To: 55814; +Cc: Christopher Rodriguez

---

Maxime,

Thanks for the feedback! Sorry for missing something so basic.

I swapped both of the `if` statements with `when` statements, as they are more
semantically appropriate here anyway.

I also fixed a mistake I found in the lambda call (#:keys instead of #:key), and
uploaded the current version of `python-flake8` (4.0.1) to the software heritage
project. I'm waiting for the save to go through, but after that, the linter will
return no errors.

 gnu/packages/python-xyz.scm | 54 ++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0dfc6ca7e0..ffb7001c03 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -6443,23 +6443,21 @@ (define-public python-socksipychain
 (define-public python-pycodestyle
   (package
     (name "python-pycodestyle")
-    (version "2.7.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "pycodestyle" version))
-       (sha256
-        (base32
-         "1vqwmzmjdv331kmfq3q9j3as2x7r2r49lf83r9w4147pdg8c32f3"))))
+    (version "2.8.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "pycodestyle" version))
+              (sha256
+               (base32
+                "0zxyrg8029lzjhima6l5nk6y0z6lm5wfp9qchz3s33j3xx3mipgd"))))
     (build-system python-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda _
-             (invoke "pytest" "-vv"))))))
-    (native-inputs
-     (list python-pytest))
+     `(#:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda* (#:key input output tests? #:allow-other-keys)
+                      (when tests?
+                        (invoke "pytest" "-vv")))))))
+    (native-inputs (list python-pytest))
     (home-page "https://pycodestyle.readthedocs.io/")
     (synopsis "Python style guide checker")
     (description "@code{pycodestyle} (formerly pep8) is a tool to check
@@ -10143,18 +10141,17 @@ (define-public python-pyflakes
   (package
     (name "python-pyflakes")
     (version "2.4.0")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (pypi-uri "pyflakes" version))
-        (sha256
-         (base32
-          "0k5jn8jpxni264wxf6cc3xcd1qckc0pww30bsd77mwzdf8l5ra05"))))
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "pyflakes" version))
+              (sha256
+               (base32
+                "0k5jn8jpxni264wxf6cc3xcd1qckc0pww30bsd77mwzdf8l5ra05"))))
     (build-system python-build-system)
     (home-page "https://github.com/PyCQA/pyflakes")
     (synopsis "Passive checker of Python programs")
     (description
-      "Pyflakes statically checks Python source code for common errors.")
+     "Pyflakes statically checks Python source code for common errors.")
     (license license:expat)))
 
 (define-public python-pyflakes-2.2
@@ -10193,20 +10190,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"))))
+                "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 inputs outputs 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))

base-commit: 41cf573f0a4fefb0539174b46cfe65e9db128870
-- 
2.36.1





^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [bug#55814] [PATCH v2] Updated python-flake8 and inputs to reenable build.
  2022-06-06 17:24 ` [bug#55814] [PATCH v2] " Christopher Rodriguez
@ 2022-06-06 18:33   ` Maxime Devos
       [not found]     ` <pkmp4e1qw11v98.fsf@crane.ant.amazon.com>
  0 siblings, 1 reply; 16+ messages in thread
From: Maxime Devos @ 2022-06-06 18:33 UTC (permalink / raw)
  To: Christopher Rodriguez, 55814

[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]

Christopher Rodriguez schreef op ma 06-06-2022 om 13:24 [-0400]:
> ---
> 
> Maxime,
> 
> Thanks for the feedback! Sorry for missing something so basic.
> 
> I swapped both of the `if` statements with `when` statements, as they are more
> semantically appropriate here anyway.
> 
> I also fixed a mistake I found in the lambda call (#:keys instead of #:key), and
> uploaded the current version of `python-flake8` (4.0.1) to the software heritage
> project. I'm waiting for the save to go through, but after that, the linter will
> return no errors.
> 
>  gnu/packages/python-xyz.scm | 54 ++++++++++++++++++-------------------
>  1 file changed, 26 insertions(+), 28 deletions(-)

Only a single independent change per patch, otherwise LGTM, haven't
looked at the source diff or build it though.  On Software Heritage:
IIUC, saving something on SWH is not something you can do as individual
(except for git repos), rather, SWH asks a Guix server what sources are
used by packages.  So effectively SWH will wait for the patch to be
applied before archiving it unless I'm misunderstanding things.

Greetings,
Maxime.


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [bug#55814] [PATCH v2] Updated python-flake8 and inputs to reenable build.
       [not found]     ` <pkmp4e1qw11v98.fsf@crane.ant.amazon.com>
@ 2022-06-06 19:05       ` Maxime Devos
  0 siblings, 0 replies; 16+ messages in thread
From: Maxime Devos @ 2022-06-06 19:05 UTC (permalink / raw)
  To: Christopher Rodriguez; +Cc: 55814

[-- Attachment #1: Type: text/plain, Size: 1284 bytes --]

Christopher Rodriguez schreef op ma 06-06-2022 om 14:44 [-0400]:
> Without the changes in this patch, `python-flake8` (and thus, any
> packages that
> depend on it) will not be able to successfully build (I use `python-
> lsp-server`
> in my profile; I believe that is where I ran into an issue with this
> package). Can this, then, be considered a "single independent
> change"? All of
> the changes made were made to support `python-flake8` building, even
> though the
> changes effected 3 separate packages.

They are related changed (same external purpose: make python-flake8),
but each change can stand on its own (different internal purposes:
update this, run tests, respect #:tests?) without causing new build
failures AFAIK.

> If not, I suppose I can split the patch into three separate packages
> like this:
> 
> 1. `python-pycodestyle` changes. (needed for `python-flake8` to build
> with tests)
> 2. `python-pyflakes` changes. (needed for `python-flake8` to build
> with tests)
> 3. `python-flake8` changes. (the package that would not build)

That, and seperate the update and the (when tests? ...).

TBC the just need to be separate patches, but not a seperate patch
series (all six can go to 55814@debbugs.gnu.org).

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

^ permalink raw reply	[flat|nested] 16+ messages in thread

* [bug#55814] [PATCH v3 1/8] Refreshed `python-pycodestyle` to version 2.8.0.
  2022-06-06  1:43 [bug#55814] [PATCH] Updated python-flake8 and inputs to reenable build Christopher Rodriguez
                   ` (2 preceding siblings ...)
  2022-06-06 17:24 ` [bug#55814] [PATCH v2] " Christopher Rodriguez
@ 2022-06-07  1:10 ` Christopher Rodriguez
  2022-06-07  1:10   ` [bug#55814] [PATCH v3 2/8] Refreshed `python-flake8` to 4.0.1 Christopher Rodriguez
                     ` (6 more replies)
  2022-06-07  1:12 ` [bug#55814] Status of Rebuilds for Change Christopher Rodriguez
  2022-06-07 13:22 ` bug#55814: [PATCH] Updated python-flake8 and inputs to reenable build Maxim Cournoyer
  5 siblings, 7 replies; 16+ messages in thread
From: Christopher Rodriguez @ 2022-06-07  1:10 UTC (permalink / raw)
  To: 55814; +Cc: Christopher Rodriguez

[bug: 55814]
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0dfc6ca7e0..e3eeb2ea6e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -6443,14 +6443,14 @@ (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

base-commit: 41cf573f0a4fefb0539174b46cfe65e9db128870
-- 
2.36.1





^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [bug#55814] [PATCH v3 2/8] Refreshed `python-flake8` to 4.0.1.
  2022-06-07  1:10 ` [bug#55814] [PATCH v3 1/8] Refreshed `python-pycodestyle` to version 2.8.0 Christopher Rodriguez
@ 2022-06-07  1:10   ` Christopher Rodriguez
  2022-06-07  1:10   ` [bug#55814] [PATCH v3 3/8] `python-pycodestyle` now respects `#:tests?` Christopher Rodriguez
                     ` (5 subsequent siblings)
  6 siblings, 0 replies; 16+ messages in thread
From: Christopher Rodriguez @ 2022-06-07  1:10 UTC (permalink / raw)
  To: 55814; +Cc: Christopher Rodriguez

[Bug: 55814]
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index e3eeb2ea6e..0c232e9aac 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.2")
+    (version "4.0.1")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "flake8" version))
               (sha256
                (base32
-                "0sspgh2ph7bb5fmf49mrdhi7n5m421kfkxk1n0vn4akgg20q6lh7"))))
+                "03c7mnk34wfz7a0m5zq0273y94awz69fy5iww8alh4a4v96h6vl0"))))
     (build-system python-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
-- 
2.36.1





^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [bug#55814] [PATCH v3 3/8] `python-pycodestyle` now respects `#:tests?`
  2022-06-07  1:10 ` [bug#55814] [PATCH v3 1/8] Refreshed `python-pycodestyle` to version 2.8.0 Christopher Rodriguez
  2022-06-07  1:10   ` [bug#55814] [PATCH v3 2/8] Refreshed `python-flake8` to 4.0.1 Christopher Rodriguez
@ 2022-06-07  1:10   ` Christopher Rodriguez
  2022-06-07  1:10   ` [bug#55814] [PATCH v3 4/8] `python-flake8` now supports `#:tests?` Christopher Rodriguez
                     ` (4 subsequent siblings)
  6 siblings, 0 replies; 16+ messages in thread
From: Christopher Rodriguez @ 2022-06-07  1:10 UTC (permalink / raw)
  To: 55814; +Cc: Christopher Rodriguez

[Bug: 55814]
---
 gnu/packages/python-xyz.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 0c232e9aac..48311c6c33 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -6456,8 +6456,9 @@ (define-public python-pycodestyle
      `(#: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/")
-- 
2.36.1





^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [bug#55814] [PATCH v3 4/8] `python-flake8` now supports `#:tests?`
  2022-06-07  1:10 ` [bug#55814] [PATCH v3 1/8] Refreshed `python-pycodestyle` to version 2.8.0 Christopher Rodriguez
  2022-06-07  1:10   ` [bug#55814] [PATCH v3 2/8] Refreshed `python-flake8` to 4.0.1 Christopher Rodriguez
  2022-06-07  1:10   ` [bug#55814] [PATCH v3 3/8] `python-pycodestyle` now respects `#:tests?` Christopher Rodriguez
@ 2022-06-07  1:10   ` Christopher Rodriguez
  2022-06-07  1:10   ` [bug#55814] [PATCH v3 5/8] Added `python-pyflakes-2.3` as a variant package Christopher Rodriguez
                     ` (3 subsequent siblings)
  6 siblings, 0 replies; 16+ messages in thread
From: Christopher Rodriguez @ 2022-06-07  1:10 UTC (permalink / raw)
  To: 55814; +Cc: Christopher Rodriguez

[Bug: 55814]
---
 gnu/packages/python-xyz.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 48311c6c33..de996826e1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10205,9 +10205,10 @@ (define-public python-flake8
     (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 inputs outputs 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))
-- 
2.36.1





^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [bug#55814] [PATCH v3 5/8] Added `python-pyflakes-2.3` as a variant package.
  2022-06-07  1:10 ` [bug#55814] [PATCH v3 1/8] Refreshed `python-pycodestyle` to version 2.8.0 Christopher Rodriguez
                     ` (2 preceding siblings ...)
  2022-06-07  1:10   ` [bug#55814] [PATCH v3 4/8] `python-flake8` now supports `#:tests?` Christopher Rodriguez
@ 2022-06-07  1:10   ` Christopher Rodriguez
  2022-06-07  1:10   ` [bug#55814] [PATCH v3 6/8] Added `python-pycodestyle-2.7` " Christopher Rodriguez
                     ` (2 subsequent siblings)
  6 siblings, 0 replies; 16+ messages in thread
From: Christopher Rodriguez @ 2022-06-07  1:10 UTC (permalink / raw)
  To: 55814; +Cc: Christopher Rodriguez

[Bug: 55814]
---
 gnu/packages/python-xyz.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index de996826e1..a3a3d7d95f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10158,6 +10158,17 @@ (define-public python-pyflakes
       "Pyflakes statically checks Python source code for common errors.")
     (license license:expat)))
 
+(define-public python-pyflakes-2.3
+  (package
+    (inherit python-pyflakes)
+    (version "2.3.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "pyflakes" version))
+              (sha256
+               (base32
+                "1ny10364ciqh4ripasj4zzv4145l21l3s85m3qlrvfq5pk58xg7m"))))))
+
 (define-public python-pyflakes-2.2
   (package
     (inherit python-pyflakes)
-- 
2.36.1





^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [bug#55814] [PATCH v3 6/8] Added `python-pycodestyle-2.7` as a variant package.
  2022-06-07  1:10 ` [bug#55814] [PATCH v3 1/8] Refreshed `python-pycodestyle` to version 2.8.0 Christopher Rodriguez
                     ` (3 preceding siblings ...)
  2022-06-07  1:10   ` [bug#55814] [PATCH v3 5/8] Added `python-pyflakes-2.3` as a variant package Christopher Rodriguez
@ 2022-06-07  1:10   ` Christopher Rodriguez
  2022-06-07  1:10   ` [bug#55814] [PATCH v3 7/8] Added `python-flake8-3.9` " Christopher Rodriguez
  2022-06-07  1:10   ` [bug#55814] [PATCH v3 8/8] Formatted Code with `guix style` Christopher Rodriguez
  6 siblings, 0 replies; 16+ messages in thread
From: Christopher Rodriguez @ 2022-06-07  1:10 UTC (permalink / raw)
  To: 55814; +Cc: Christopher Rodriguez

[Bug: 55814]
---
 gnu/packages/python-xyz.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a3a3d7d95f..da7bb744e8 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -6468,6 +6468,17 @@ (define-public python-pycodestyle
 @url{http://www.python.org/dev/peps/pep-0008/,PEP 8}.")
     (license license:expat)))
 
+(define-public python-pycodestyle-2.7
+  (package
+    (inherit python-pycodestyle)
+    (version "2.7.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "pycodestyle" version))
+              (sha256
+               (base32
+                "1vqwmzmjdv331kmfq3q9j3as2x7r2r49lf83r9w4147pdg8c32f3"))))))
+
 (define-public python-pycodestyle-2.6
   (package
     (inherit python-pycodestyle)
-- 
2.36.1





^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [bug#55814] [PATCH v3 7/8] Added `python-flake8-3.9` as a variant package.
  2022-06-07  1:10 ` [bug#55814] [PATCH v3 1/8] Refreshed `python-pycodestyle` to version 2.8.0 Christopher Rodriguez
                     ` (4 preceding siblings ...)
  2022-06-07  1:10   ` [bug#55814] [PATCH v3 6/8] Added `python-pycodestyle-2.7` " Christopher Rodriguez
@ 2022-06-07  1:10   ` Christopher Rodriguez
  2022-06-07  1:10   ` [bug#55814] [PATCH v3 8/8] Formatted Code with `guix style` Christopher Rodriguez
  6 siblings, 0 replies; 16+ messages in thread
From: Christopher Rodriguez @ 2022-06-07  1:10 UTC (permalink / raw)
  To: 55814; +Cc: Christopher Rodriguez

[Bug: 55814]
---
 gnu/packages/python-xyz.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index da7bb744e8..837bcc8fde 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10240,6 +10240,20 @@ (define-public python-flake8
      "Flake8 is a wrapper around PyFlakes, pep8 and python-mccabe.")
     (license license:expat)))
 
+(define-public python-flake8-3.9
+  (package
+    (inherit python-flake8)
+    (version "3.9.2")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "flake8" version))
+              (sha256
+               (base32
+                "0sspgh2ph7bb5fmf49mrdhi7n5m421kfkxk1n0vn4akgg20q6lh7"))))
+    (propagated-inputs
+     (list python-pycodestyle-2.7 python-entrypoints python-pyflakes-2.3
+           python-mccabe))))
+
 (define-public python-flake8-3.8
   (package
     (inherit python-flake8)
-- 
2.36.1





^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [bug#55814] [PATCH v3 8/8] Formatted Code with `guix style`.
  2022-06-07  1:10 ` [bug#55814] [PATCH v3 1/8] Refreshed `python-pycodestyle` to version 2.8.0 Christopher Rodriguez
                     ` (5 preceding siblings ...)
  2022-06-07  1:10   ` [bug#55814] [PATCH v3 7/8] Added `python-flake8-3.9` " Christopher Rodriguez
@ 2022-06-07  1:10   ` Christopher Rodriguez
  6 siblings, 0 replies; 16+ messages in thread
From: Christopher Rodriguez @ 2022-06-07  1:10 UTC (permalink / raw)
  To: 55814; +Cc: Christopher Rodriguez

[Bug: 55814]
---
 gnu/packages/python-xyz.scm | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 837bcc8fde..03d40b694f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -6444,23 +6444,20 @@ (define-public python-pycodestyle
   (package
     (name "python-pycodestyle")
     (version "2.8.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "pycodestyle" version))
-       (sha256
-        (base32
-         "0zxyrg8029lzjhima6l5nk6y0z6lm5wfp9qchz3s33j3xx3mipgd"))))
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "pycodestyle" version))
+              (sha256
+               (base32
+                "0zxyrg8029lzjhima6l5nk6y0z6lm5wfp9qchz3s33j3xx3mipgd"))))
     (build-system python-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (when tests?
-               (invoke "pytest" "-vv")))))))
-    (native-inputs
-     (list python-pytest))
+     `(#:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda* (#:key tests? #:allow-other-keys)
+                      (when tests?
+                        (invoke "pytest" "-vv")))))))
+    (native-inputs (list python-pytest))
     (home-page "https://pycodestyle.readthedocs.io/")
     (synopsis "Python style guide checker")
     (description "@code{pycodestyle} (formerly pep8) is a tool to check
@@ -10250,9 +10247,8 @@ (define-public python-flake8-3.9
               (sha256
                (base32
                 "0sspgh2ph7bb5fmf49mrdhi7n5m421kfkxk1n0vn4akgg20q6lh7"))))
-    (propagated-inputs
-     (list python-pycodestyle-2.7 python-entrypoints python-pyflakes-2.3
-           python-mccabe))))
+    (propagated-inputs (list python-pycodestyle-2.7 python-entrypoints
+                             python-pyflakes-2.3 python-mccabe))))
 
 (define-public python-flake8-3.8
   (package
-- 
2.36.1





^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [bug#55814] Status of Rebuilds for Change
  2022-06-06  1:43 [bug#55814] [PATCH] Updated python-flake8 and inputs to reenable build Christopher Rodriguez
                   ` (3 preceding siblings ...)
  2022-06-07  1:10 ` [bug#55814] [PATCH v3 1/8] Refreshed `python-pycodestyle` to version 2.8.0 Christopher Rodriguez
@ 2022-06-07  1:12 ` Christopher Rodriguez
  2022-06-07 13:22 ` bug#55814: [PATCH] Updated python-flake8 and inputs to reenable build Maxim Cournoyer
  5 siblings, 0 replies; 16+ messages in thread
From: Christopher Rodriguez @ 2022-06-07  1:12 UTC (permalink / raw)
  To: 55814

[-- Attachment #1: Type: text/plain, Size: 598 bytes --]

Hey all,

I've just submitted an 8 patch set. I think I've managed to isolate each change.

I'm currently ~65% of the way through rebuilding the following 178 packages in
my local guix repository after the changes. No issues yet; If I encounter any I
will update with a patch to fix it.

Worth mentioning, this list of 178 was what `guix refresh --list-dependent
python-flake8 python-pyflakes python-pycodestyle` said would trigger a rebuild
of all 370 packages that depend on the above 3.

Including the list of packages I am explicitly building here for transparency.

--

Christopher Rodriguez


[-- Attachment #2: List of packages possibly impacted by this change. --]
[-- Type: text/plain, Size: 3641 bytes --]

magic-wormhole@0.12.0 python-autoflake@1.3.1 python-pytest-pycodestyle@2.2.0
tractor@3.13 nyx@2.1.0 onionshare@2.4 python-flake8-todo@0.7 python-fpylll@0.5.2
python-biom-format@2.1.10 python-databases@0.5.5 python-tortoise-orm@0.17.8
docker-compose@1.29.2 repo2docker@2021.08.0 python-celery@5.2.6
emacs-elpy@1.35.0-1.1746e70 python-mt-940@4.23.0 piper@0.6
python-markdownify@0.10.1 cozy@1.2.0 emacs-emms-mode-line-cycle@0.2.5
emacs-helm-emms@1.3-3.37e5aa0 emacs-org-emms@0.1-1.07a8917 gpodder@3.10.21
quodlibet@4.5.0 beets-bandcamp@0.1.4 picard@2.4.4 anki@2.1.16 ytfzf@2.3
curseradio@0-1.1bd4bd0 gfeeds@0.16.2 celluloid@0.23 mpv-mpris@0.6
smplayer@21.10.0 pipe-viewer@0.2.0 python-tweepy@4.4.0 python-hic2cool@0.8.3
python-hicexplorer@2.1.4 c-vise@2.4.0 python-pytest-csv@3.0.0 hangups@0.4.18
python-behave-web-api@1.0.6 python-pyvips@2.2.0 python-jaraco-packaging@6.1
python-woob@3.0 python-mastodon-py@1.5.1 python-flasgger@0.6.3 python-furl@2.1.3
tgcli@0.3.1 scvelo@0.2.4 python-minikanren@1.0.1 conda@4.10.3 fdroidserver@1.1.9
python-photutils@1.3.0 python-astropy-healpix@0.6 python-regions@0.5
python-gwcs@0.18.0 python-iml@0.6.2 python-slurm-magic@0.0-0.73dd1a2
python-pytest-exploratory@0.5 python-ipdb@0.13.9 autokey@0.95.10
python-pyfuse3@3.2.1 python-telethon@1.17.5 emacs-calibredb@2.10.0
python-astroquery@0.4.6 vorta@0.8.3 cura@4.13.1 jrnl@1.9.7 python-harmony@0.7.1
caja-extensions@1.24.1 python-swiftclient@2.6.0 dbxfs@1.0.51 linuxdcpp@1.1.0
ikiwiki@3.20200202.3 breezy@3.2.2 poetry@1.1.12 openconnect-sso@0.7.3
snakemake@7.7.0 electrum@4.2.1 python-trio-websocket@0.9.2
python-bash-kernel@0.7.2 xeus@2.4.1 r-torch@0.7.2 python-pari-jupyter@1.4.1
python-hyperopt@0.2.5 python-ipython-cluster-helper@0.6.4 pgcli@3.2.0
rfcat@1.9.5-1.725bf79 ruby-iruby@0.3 nanosv@1.2.4 tombo@1.5.1
python-pytest-perf@0.12.0 python-nb-clean@2.1.0 pigx-sars-cov-2@0.0.7 pigx@0.0.3
snakemake@6.15.5 tuir@1.29.0 rtv@1.27.0 python-django-taggit@1.3.0
emacs-py-isort@2016.1 abjad-ext-nauert@3.4 abjad-ext-rmakers@3.4 komikku@0.38.0
vdirsyncer@0.18.0 orange@3.31.1 python-mailman-hyperkitty@1.2.0
python-falcon-cors@1.1.7 ibus-theme-tools@4.2.0 postorius@1.3.3
emacs-flycheck-cpplint@0.1-1.1d8a090 giara@0.3 python-scrapy@2.6.1 offlate@0.5
ledger-agent@0.9.0 keepkey-agent@0.9.0 trezor-agent@0.11.0-1
python-psycopg@3.0.8 synapse@1.29.0 python-pyvista@0.34.0 python-pygmsh@7.1.11
r-destiny@3.10.0 python-pytest-check-links@0.3.0 python-nbdime@3.1.1
python-sparqlkernel@1.3.0 python-plotly@5.6.0 python-ipydatawidgets@4.2.0
python-ipympl@0.9.1 python-matplotlib-documentation@3.5.2 scregseg@0.1.1
r-irkernel@1.3 abjad-ext-ipython@3.3 guix-jupyter@0.2.2 python-nbsphinx@0.8.8
python-jupyter-sphinx@0.3.2 python-qstylizer@0.1.10 weasyprint@54.3
python-ajsonrpc@1.2.0 python-flake8-isort@4.1.1 python-textdistance@4.2.1
python-libcst@0.3.8 python-arpeggio@2.0.0 audio-to-midi@2020.7 gdc-client@1.6.0
python-transient@0.12 mdpo@0.3.6 ccwl@0.2.0 python-pygenometracks@3.3
gourmet@0.17.4-0.8af29c8 389-ds-base@1.4.4.17 python-yq@2.11.1 python-tldr@3.1.0
sshoot@1.5.1 python-pyls-black@0.4.7 python-flake8-continuation@1.0.5
weechat-matrix@0.3.0 pantalaimon@0.10.3 python-flask-restx@0.5.1
python-minio@6.0.0 nototools@0.2.16 python-ipython-documentation@8.2.0
python-numpy-documentation@1.21.6 python-hyperkitty@1.3.5 archivebox@0.6.2
mbed-tools@7.53.0 python-flask-combo-jsonapi@1.1.0 electron-cash@4.2.7
python-pystitcher@1.0.4 python-argopt@0.7.0 python-jinja2-cli@0.7.0
python-xenon@0.7.0 python-codespell@2.1.0 python-flake8-pyi@20.10.0
python-flake8-quotes@3.2.0 nikola@8.1.3 python-dolfin-adjoint@2019.1.0
qmpbackup@0.23 sshuttle@0.78.5 qtile@0.18.1

^ permalink raw reply	[flat|nested] 16+ messages in thread

* bug#55814: [PATCH] Updated python-flake8 and inputs to reenable build.
  2022-06-06  1:43 [bug#55814] [PATCH] Updated python-flake8 and inputs to reenable build Christopher Rodriguez
                   ` (4 preceding siblings ...)
  2022-06-07  1:12 ` [bug#55814] Status of Rebuilds for Change Christopher Rodriguez
@ 2022-06-07 13:22 ` Maxim Cournoyer
  5 siblings, 0 replies; 16+ messages in thread
From: Maxim Cournoyer @ 2022-06-07 13:22 UTC (permalink / raw)
  To: Christopher Rodriguez; +Cc: 55814-done

Hi Christopher,

Christopher Rodriguez <yewscion@gmail.com> writes:

> ---
>
> Hey all,
>
> I noticed today that `python-flake8` was failing to build, as one of its inputs
> (`python-pyflakes`) had been bumped too high for the older version's `check`
> phase. Tried to take the initiative and threw together this patch; It builds in
> my local tree, and had been linted/styled/tested/etc. I believe I have done
> everything by the book, but if I need to fix anything, let me know (I'm still
> new to contributing)!

Hehe, it seems at least 3 people noticed and tried fixing the problem,
which is nice!

python-pycodestyle ended up being updated by Petr Hodina in 2660f99b57
and python-flake8 to 4.0.1 in 5022cf8e04 by myself.  I've tested the
dependent packages (those reported by 'guix refresh --list
python-pycodestyle python-flake8' could still build, fixing a few
failing ones).

So I believe we've got that flake8 situation covered :-).

Thank you!

Closing.

Maxim




^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2022-06-07 13:23 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-06  1:43 [bug#55814] [PATCH] Updated python-flake8 and inputs to reenable build Christopher Rodriguez
2022-06-06  6:13 ` Liliana Marie Prikler
2022-06-06  9:31 ` Maxime Devos
2022-06-06 17:24 ` [bug#55814] [PATCH v2] " Christopher Rodriguez
2022-06-06 18:33   ` Maxime Devos
     [not found]     ` <pkmp4e1qw11v98.fsf@crane.ant.amazon.com>
2022-06-06 19:05       ` Maxime Devos
2022-06-07  1:10 ` [bug#55814] [PATCH v3 1/8] Refreshed `python-pycodestyle` to version 2.8.0 Christopher Rodriguez
2022-06-07  1:10   ` [bug#55814] [PATCH v3 2/8] Refreshed `python-flake8` to 4.0.1 Christopher Rodriguez
2022-06-07  1:10   ` [bug#55814] [PATCH v3 3/8] `python-pycodestyle` now respects `#:tests?` Christopher Rodriguez
2022-06-07  1:10   ` [bug#55814] [PATCH v3 4/8] `python-flake8` now supports `#:tests?` Christopher Rodriguez
2022-06-07  1:10   ` [bug#55814] [PATCH v3 5/8] Added `python-pyflakes-2.3` as a variant package Christopher Rodriguez
2022-06-07  1:10   ` [bug#55814] [PATCH v3 6/8] Added `python-pycodestyle-2.7` " Christopher Rodriguez
2022-06-07  1:10   ` [bug#55814] [PATCH v3 7/8] Added `python-flake8-3.9` " Christopher Rodriguez
2022-06-07  1:10   ` [bug#55814] [PATCH v3 8/8] Formatted Code with `guix style` Christopher Rodriguez
2022-06-07  1:12 ` [bug#55814] Status of Rebuilds for Change Christopher Rodriguez
2022-06-07 13:22 ` bug#55814: [PATCH] Updated python-flake8 and inputs to reenable build Maxim Cournoyer

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).