bug#73314: PyPI importer gives null at home-page for some packages

bug#73314: PyPI importer gives null at home-page for some packages

[Evgeny Pisemsky]

For example, this command:

guix import pypi snitun@0.35.0

bug#73314: PyPI importer gives null at home-page for some packages

[Simon Tournier]

Hi,

On mar., 17 sept. 2024 at 14:23, Evgeny Pisemsky <mail@pisemsky.site> wrote:
> For example, this command:
>
> guix import pypi snitun@0.35.0

That’s probably because the JSON file metadata stored in PyPI does not
have the information.

Well, do you prefer #false in order to be consistent with the rest, as
license for instance?

Cheers,
simon

bug#73314: PyPI importer gives null at home-page for some packages

[Evgeny Pisemsky]

Hi, actually I was thinking about empty string, because the package
record type definition in (guix packages) has explicit comment:

     (home-page package-home-page)                   ; string

But #f also works, and grep'ing shows that a lot of packages and even
tests use it, so let it be #f, with changing the comment above to:

string | #f

bug#73314: [PATCH] Fix null at home-page in PyPI importer

[Evgeny Pisemsky]

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

Here is the fix that works for me.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-null-at-home-page-in-PyPI-importer.patch --]
[-- Type: text/x-patch, Size: 1965 bytes --]

From b3a7c4fb23dafe9ae3103c206a1cfc0a6676a0fc Mon Sep 17 00:00:00 2001
Message-ID: <b3a7c4fb23dafe9ae3103c206a1cfc0a6676a0fc.1732292783.git.mail@pisemsky.site>
From: Evgeny Pisemsky <mail@pisemsky.site>
Date: Fri, 22 Nov 2024 19:19:50 +0300
Subject: [PATCH] Fix null at home-page in PyPI importer

Change-Id: I501582988cf58b00bd201c12ad47e9b095988fae
---
 guix/import/pypi.scm | 4 ++--
 guix/packages.scm    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 7b9f54a200..397ae5d5fd 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -114,8 +114,8 @@ (define-json-mapping <project-info> make-project-info project-info?
   (license      project-info-license)             ;string
   (download-url project-info-download-url         ;string | #f
                 "download_url" non-empty-string-or-false)
-  (home-page    project-info-home-page            ;string
-                "home_page")
+  (home-page    project-info-home-page            ;string | #f
+                "home_page" non-empty-string-or-false)
   (url          project-info-url "project_url")   ;string
   (release-url  project-info-release-url "release_url") ;string
   (version      project-info-version))            ;string
diff --git a/guix/packages.scm b/guix/packages.scm
index f373136d22..950e262274 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -648,7 +648,7 @@ (define-record-type* <package>
                (sanitize validate-texinfo))       ; one or two paragraphs
   (license package-license                        ; (list of) <license>
            (sanitize validate-license))
-  (home-page package-home-page)                   ; string
+  (home-page package-home-page)                   ; string | #f
   (supported-systems package-supported-systems    ; list of strings
                      (default %supported-systems))
 

base-commit: 2fec407b2745898d0a304c172a27dfe0a8787122
-- 
2.46.0