GNU bug report logs - #58792
[PATCH] gnu: python-filelock: Update to 3.8.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 58792 in the body.
You can then email your comments to 58792 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: Tanguy Le Carrour <tanguy <at> bioneland.org>
To: guix-patches <at> gnu.org
Cc: Tanguy Le Carrour <tanguy <at> bioneland.org>
Subject: [PATCH] gnu: python-filelock: Update to 3.8.0.
Date: Wed, 26 Oct 2022 09:13:12 +0200

Hi Guix,

This patch is trivial, but it triggers 5,000+ package rebuilds.
I need it in order to upgrade `python-virtualenv` (I'm still working on it)
… which I need to upgrade `poetry`.

Regards,


* gnu/packages/python-xyz.scm (python-filelock): Update to 3.8.0.
---
 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 08a33061a9..eacb54d406 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1978,14 +1978,14 @@ (define-public python-fb-re2
 (define-public python-filelock
   (package
     (name "python-filelock")
-    (version "3.0.12")
+    (version "3.8.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "filelock" version))
        (sha256
         (base32
-         "0ngzlvb5j8gqs2nxlp2b0jhzii792h66wsn694qm8kqixr225n0q"))))
+         "1p2f1il288abcrjx002w25dzl9jd1392cfminv2rh8bgcsm7qi2m"))))
     (build-system python-build-system)
     (home-page
      "https://github.com/benediktschmitt/py-filelock")
-- 
2.38.0

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

From: Tanguy LE CARROUR <tanguy <at> bioneland.org>
To: 58792 <at> debbugs.gnu.org
Subject: Re: bug#58792: Acknowledgement ([PATCH] gnu: python-filelock: Update
 to 3.8.0.)
Date: Wed, 26 Oct 2022 10:03:18 +0200

Hi Guix,

Contrary to what I said, this patch might not be trivial!

The resulting package exposes version 0.0.0, which seems to break every
package that depends on it!
The issue has been reported upstream [1][]. The solution would be to use
a different build system.

[1]: https://github.com/tox-dev/py-filelock/issues/133)

I'm working on it…

-- 
Tanguy

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

From: Tanguy Le Carrour <tanguy <at> bioneland.org>
To: 58792 <at> debbugs.gnu.org
Cc: Tanguy Le Carrour <tanguy <at> bioneland.org>
Subject: [PATCH v2 1/2] gnu: python-filelock: Update to 3.8.0.
Date: Wed, 26 Oct 2022 15:44:34 +0200

Hi Guix,

This was less trivial than what I expected, indeed.
I'm adding python-virtualenv to the patch set as it now builds.

Unfortunately, I couldn't make it up to Poetry, because, for
unknown reasons (to me), building poetry with updated python-filelock
and python-virtualenv triggers a **LOT** of rebuilds! I `Ctrl+c` the
process when it started building things related to wayland and to
modem-manager!? If someone was kind enough to tell me why, it would be
very much appreciated!

Thanks

* gnu/packages/python-xyz.scm (python-filelock): Update to 3.8.0.
[arguments]<#:phases>: Build the package PyPA's style.
[native-inputs]: Add python-pypa-build, python-setuptools,
python-setuptools-scm.
---
 gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 08a33061a9..655d4501b0 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1978,15 +1978,47 @@ (define-public python-fb-re2
 (define-public python-filelock
   (package
     (name "python-filelock")
-    (version "3.0.12")
+    (version "3.8.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "filelock" version))
        (sha256
         (base32
-         "0ngzlvb5j8gqs2nxlp2b0jhzii792h66wsn694qm8kqixr225n0q"))))
+         "1p2f1il288abcrjx002w25dzl9jd1392cfminv2rh8bgcsm7qi2m"))))
     (build-system python-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+                  (add-after 'unpack 'compatibility-fixes
+                    (lambda _
+                      ;; We have an outdated version of setuptools-scm
+                      (substitute* "pyproject.toml" (("7.0.5") "6.3.2"))))
+                  (replace 'build
+                    (lambda _
+                      (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)
+                      ;; 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))))
+                  (delete 'check))))  ; pytest causes a circular dependency (?)
+    (native-inputs (list python-pypa-build python-setuptools python-setuptools-scm))
     (home-page
      "https://github.com/benediktschmitt/py-filelock")
     (synopsis "Platform independent file lock")
-- 
2.38.0

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

From: Tanguy Le Carrour <tanguy <at> bioneland.org>
To: 58792 <at> debbugs.gnu.org
Cc: Tanguy Le Carrour <tanguy <at> bioneland.org>
Subject: [PATCH v2 2/2] gnu: python-virtualenv: Update to 20.16.5.
Date: Wed, 26 Oct 2022 15:44:35 +0200

Regarding this patch, I tried and failed updating python-distlib.
I ran into a GPG key issue that I didn't know how to solve.

* gnu/packages/python-xyz.scm (python-virtualenv): Update to 20.16.5.
[arguments]<#:phases>: Add phase compatibility-fixes.
[propagated-inputs]: Add python-platformdirs.
---
 gnu/packages/python-xyz.scm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 655d4501b0..0fc6a2c885 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4056,19 +4056,26 @@ (define-public python-vine
 (define-public python-virtualenv
   (package
     (name "python-virtualenv")
-    (version "20.3.1")
+    (version "20.16.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "virtualenv" version))
        (sha256
         (base32
-         "1nbhnpzswcf3lmzn5xabmfdd7ki8r2w2i37y6wml54di6qi1l48c"))))
+         "1nl09v092ap469krvgl5x9r78v99xy1k7fkp36imxp2gk6ws2zi2"))))
     (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'compatibility-fixes
+           (lambda _
+             ;; We have an outdated version of distlib
+             (substitute* "setup.cfg" (("0.3.5") "0.3.1")))))))
     (native-inputs
      (list python-mock python-pytest python-setuptools-scm))
     (propagated-inputs
-     (list python-appdirs python-distlib python-filelock python-six))
+     (list python-appdirs python-distlib python-filelock python-platformdirs python-six))
     (home-page "https://virtualenv.pypa.io/")
     (synopsis "Virtual Python environment builder")
     (description
-- 
2.38.0

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

From: Tanguy Le Carrour <tanguy <at> bioneland.org>
To: 58792 <at> debbugs.gnu.org
Cc: Tanguy Le Carrour <tanguy <at> bioneland.org>
Subject: [PATCH v3 1/2] gnu: python-filelock: Update to 3.8.0.
Date: Sat,  5 Nov 2022 12:24:34 +0100

* gnu/packages/python-xyz.scm (python-filelock): Update to 3.8.0.
[build-system]: Use pyproject-build-system.
[arguments]: Add a phase to fix compatibility issues with
python-setuptools-scm. [native-inputs]: Add python-setuptools-scm.
---
 gnu/packages/python-xyz.scm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 75e1dcc0cb..83e86b21fd 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -2114,15 +2114,25 @@ (define-public python-fb-re2
 (define-public python-filelock
   (package
     (name "python-filelock")
-    (version "3.0.12")
+    (version "3.8.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "filelock" version))
        (sha256
         (base32
-         "0ngzlvb5j8gqs2nxlp2b0jhzii792h66wsn694qm8kqixr225n0q"))))
-    (build-system python-build-system)
+         "1p2f1il288abcrjx002w25dzl9jd1392cfminv2rh8bgcsm7qi2m"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+                  (add-after 'unpack 'compatibility-fixes
+                    (lambda _
+                      ;; We have an outdated version of setuptools-scm
+                      (substitute* "pyproject.toml" (("7.0.5") "6.3.2")))))))
+    ;; Required for the version to be properly defined in METADATA
+    (native-inputs (list python-setuptools-scm))
     (home-page
      "https://github.com/benediktschmitt/py-filelock")
     (synopsis "Platform independent file lock")
-- 
2.38.0

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

From: Tanguy Le Carrour <tanguy <at> bioneland.org>
To: 58792 <at> debbugs.gnu.org
Cc: Tanguy Le Carrour <tanguy <at> bioneland.org>
Subject: [PATCH v3 2/2] gnu: python-virtualenv: Update to 20.16.5.
Date: Sat,  5 Nov 2022 12:24:35 +0100

* gnu/packages/python-xyz.scm (python-virtualenv): Update to 20.16.5.
[arguments]<#:phases>: Add phase compatibility-fixes.
[propagated-inputs]: Add python-platformdirs.
---
 gnu/packages/python-xyz.scm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 83e86b21fd..d6efd92bcf 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4149,19 +4149,26 @@ (define-public python-vine
 (define-public python-virtualenv
   (package
     (name "python-virtualenv")
-    (version "20.3.1")
+    (version "20.16.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "virtualenv" version))
        (sha256
         (base32
-         "1nbhnpzswcf3lmzn5xabmfdd7ki8r2w2i37y6wml54di6qi1l48c"))))
+         "1nl09v092ap469krvgl5x9r78v99xy1k7fkp36imxp2gk6ws2zi2"))))
     (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'compatibility-fixes
+           (lambda _
+             ;; We have an outdated version of distlib
+             (substitute* "setup.cfg" (("0.3.5") "0.3.1")))))))
     (native-inputs
      (list python-mock python-pytest python-setuptools-scm))
     (propagated-inputs
-     (list python-appdirs python-distlib python-filelock python-six))
+     (list python-appdirs python-distlib python-filelock python-platformdirs python-six))
     (home-page "https://virtualenv.pypa.io/")
     (synopsis "Virtual Python environment builder")
     (description
-- 
2.38.0

Message #25 received at 58792-done <at> debbugs.gnu.org (full text, mbox):

From: Tanguy LE CARROUR <tanguy <at> bioneland.org>
To: 58792-done <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: python-filelock: Update to 3.8.0.
Date: Thu, 29 Feb 2024 09:20:09 +0100

Hi Guix,

I’m closing this old bug, because:

- the patch set probably does not apply anymore;
- even if the affected packages still need to be updated,
  I don’t need them anymore as —long story short—,
  I’m not trying to make Poetry available in Guix.

Regards,

-- 
Tanguy

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

From: Tanguy LE CARROUR <tanguy <at> bioneland.org>
To: 58792 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: python-filelock: Update to 3.8.0.
Date: Thu, 29 Feb 2024 09:32:49 +0100

Hi Guix,

I’m closing this old bug, because:

- the patch set probably does not apply anymore;
- even if the affected packages still need to be updated,
  I don’t need them anymore as —long story short—,
  I’m not trying to make Poetry available in Guix.

Regards,

-- 
Tanguy

Previous Next

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