[bug#71266] [PATCH 0/2] Update pre-commit to 3.7.1

[bug#71266] [PATCH 0/2] Update pre-commit to 3.7.1

[Noé Lopez]

Hi Guix,

These two patches update pre-commit to version 3.7.1 and its dependency
python-identify to 2.5.36. This allows pre-commit to be used with more recent
hooks, like clang-format 18.

Good evening,
Noé Lopez

Noé Lopez (2):
  gnu: pre-commit: Update to 3.7.1
  gnu: python-identify: Update to 2.5.36

 gnu/packages/python-xyz.scm      | 8 +++++---
 gnu/packages/version-control.scm | 5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)


base-commit: 6f72ad465c1e2df965e8d73b209497b4ef456527
prerequisite-patch-id: 75f6ba7d50cdb966f5d5ee00f03f0061bcf76bb6
-- 
2.41.0

[bug#71266] [PATCH 1/2] gnu: pre-commit: Update to 3.7.1

[Noé Lopez]

* gnu/packages/version-control.scm (pre-commit): Update to 3.7.1

Change-Id: I85e7f8d6ff1dd13b444ba2c06193e66344cafa37
---
 gnu/packages/version-control.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index c01eb9decd..6189fdaa52 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -2014,7 +2014,7 @@ (define-public gitile
 (define-public pre-commit
   (package
     (name "pre-commit") ;formerly known as python-pre-commit
-    (version "3.3.3")
+    (version "3.7.1")
     (source
      (origin
        (method git-fetch)               ; no tests in PyPI release
@@ -2023,7 +2023,7 @@ (define-public pre-commit
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1spkg3ld3s6l7wz24lcywlf1z2ywp751bcdlxjfdsln76bi9ylp8"))
+        (base32 "1m2cs21xq2j1x80s7bh47fm2nsbnfxgscxfijaqwdsi2rrf4vlzv"))
        (modules '((guix build utils)))
        (snippet '(substitute* "setup.cfg"
                    (("virtualenv>=20.10.0") ;our virtualenv (20.3.1) is fine
@@ -2072,6 +2072,7 @@ (define-public pre-commit
                        "--ignore=tests/languages/perl_test.py"
                        "--ignore=tests/languages/rust_test.py"
                        "--ignore=tests/languages/swift_test.py"
+                       "--ignore=tests/languages/haskell_test.py"
                        "-k"
                        (string-append
                         ;; TODO: these tests fail with AssertionError.  It may
-- 
2.41.0

[bug#71266] [PATCH 2/2] gnu: python-identify: Update to 2.5.36

[Noé Lopez]

* gnu/packages/python-xyz.scm (python-identify): Update to 2.5.36

Change-Id: I040c7571fc69c194d98d89685e5d468092f515c0
---
 gnu/packages/python-xyz.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 9d3066cab4..279ffd2ec6 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -27254,7 +27254,7 @@ (define-public python-requests-file
 (define-public python-identify
   (package
     (name "python-identify")
-    (version "1.4.25")
+    (version "2.5.36")
     (source
      (origin
        ;; There are no tests in the PyPI tarball.
@@ -27264,7 +27264,7 @@ (define-public python-identify
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1fqgci6skckcq0x5pnxh6k2qjzn1ndsrgha1j6wwv1ld4g9bd3hz"))))
+        (base32 "1il0d1zh31jx36m0lvhpiykx95i95dcfrgrfbz2x6la884zsmvq8"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -27274,7 +27274,9 @@ (define-public python-identify
          (replace 'check
            (lambda* (#:key tests? #:allow-other-keys)
              (when tests?
-               (invoke "pytest" "-vv")))))))
+               (invoke "pytest"
+                       "-k" "not test_license" ; dependency on ukkonen
+                       "-vv")))))))
     (native-inputs
      (list python-coverage python-pytest))
     (propagated-inputs
-- 
2.41.0

[bug#71266] [PATCH 0/2] Update pre-commit to 3.7.1

[Vinicius Monego]

Em qui, 2024-05-30 às 00:41 +0200, Noé Lopez escreveu:
> Hi Guix,
> 

Hi Noé,

> These two patches update pre-commit to version 3.7.1 and its
> dependency
> python-identify to 2.5.36. This allows pre-commit to be used with
> more recent
> hooks, like clang-format 18.
> 
> Good evening,
> Noé Lopez
> 
> Noé Lopez (2):
>   gnu: pre-commit: Update to 3.7.1
>   gnu: python-identify: Update to 2.5.36
> 
>  gnu/packages/python-xyz.scm      | 8 +++++---
>  gnu/packages/version-control.scm | 5 +++--
>  2 files changed, 8 insertions(+), 5 deletions(-)
> 
> 
> base-commit: 6f72ad465c1e2df965e8d73b209497b4ef456527
> prerequisite-patch-id: 75f6ba7d50cdb966f5d5ee00f03f0061bcf76bb6

There is an open patch at 69980. However, pre-commit now has over 300
dependents because of python-jupytext, so this or 69980 may need to go
to staging. pre-commit should really be removed from jupytext native-
inputs as it's only used for a few unit tests.

[bug#71266] [PATCH 0/2] Update pre-commit to 3.7.1

[Noé Lopez via Guix-patches via]

Vinicius Monego <monego@posteo.net> writes:

> Em qui, 2024-05-30 às 00:41 +0200, Noé Lopez escreveu:
>> Hi Guix,
>> 
>
> Hi Noé,
>
>> These two patches update pre-commit to version 3.7.1 and its
>> dependency
>> python-identify to 2.5.36. This allows pre-commit to be used with
>> more recent
>> hooks, like clang-format 18.
>> 
>> Good evening,
>> Noé Lopez
>> 
>> Noé Lopez (2):
>>   gnu: pre-commit: Update to 3.7.1
>>   gnu: python-identify: Update to 2.5.36
>> 
>>  gnu/packages/python-xyz.scm      | 8 +++++---
>>  gnu/packages/version-control.scm | 5 +++--
>>  2 files changed, 8 insertions(+), 5 deletions(-)
>> 
>> 
>> base-commit: 6f72ad465c1e2df965e8d73b209497b4ef456527
>> prerequisite-patch-id: 75f6ba7d50cdb966f5d5ee00f03f0061bcf76bb6
>
> There is an open patch at 69980. However, pre-commit now has over 300
> dependents because of python-jupytext, so this or 69980 may need to go
> to staging. pre-commit should really be removed from jupytext native-
> inputs as it's only used for a few unit tests.
>

Hi Vinicius,

Thanks for the answer, 69980 seems much more complete. Is there anything
blocking it from being merged? I could look into it.

[bug#71266] [PATCH 0/2] Update pre-commit to 3.7.1

[Vinicius Monego]

Em sex, 2024-05-31 às 15:03 +0200, Noé Lopez escreveu:
> Vinicius Monego <monego@posteo.net> writes:
> 
> > Em qui, 2024-05-30 às 00:41 +0200, Noé Lopez escreveu:
> > > Hi Guix,
> > > 
> > 
> > Hi Noé,
> > 
> > > These two patches update pre-commit to version 3.7.1 and its
> > > dependency
> > > python-identify to 2.5.36. This allows pre-commit to be used with
> > > more recent
> > > hooks, like clang-format 18.
> > > 
> > > Good evening,
> > > Noé Lopez
> > > 
> > > Noé Lopez (2):
> > >   gnu: pre-commit: Update to 3.7.1
> > >   gnu: python-identify: Update to 2.5.36
> > > 
> > >  gnu/packages/python-xyz.scm      | 8 +++++---
> > >  gnu/packages/version-control.scm | 5 +++--
> > >  2 files changed, 8 insertions(+), 5 deletions(-)
> > > 
> > > 
> > > base-commit: 6f72ad465c1e2df965e8d73b209497b4ef456527
> > > prerequisite-patch-id: 75f6ba7d50cdb966f5d5ee00f03f0061bcf76bb6
> > 
> > There is an open patch at 69980. However, pre-commit now has over
> > 300
> > dependents because of python-jupytext, so this or 69980 may need to
> > go
> > to staging. pre-commit should really be removed from jupytext
> > native-
> > inputs as it's only used for a few unit tests.
> > 
> 
> Hi Vinicius,
> 
> Thanks for the answer, 69980 seems much more complete. Is there
> anything
> blocking it from being merged? I could look into it.

There are no blockers other than python-jupytext having 300+
dependents. I'd like to merge 69980 but I'm not sure if I can do it on
master, or if it'd have to be done on staging or python-team. I only
work on the master branch.

Vinicius