mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-06 21:20:33 +02:00
import/pypi: Improve renaming procedure.
PyPI canonicalizes dashes to underscores, while the former tests for converting to Guix-compliant name compared using dashes. Solve this by canonicalizing to dashes prior to comparing. * guix/import/pypi.scm (python->package-name): Canonicalize names prior to testing. Change-Id: Iba2003720adba82a7f6e3f6319b2699e369163ed
This commit is contained in:
@@ -183,13 +183,14 @@ or #f if there isn't any."
|
||||
(define (python->package-name name)
|
||||
"Given the NAME of a package on PyPI, return a Guix-compliant name for the
|
||||
package."
|
||||
(cond
|
||||
((string-prefix? "python-" name) (snake-case name))
|
||||
((string-suffix? "-python" name)
|
||||
(string-append "python-" (string-drop-right name 7)))
|
||||
((or (string=? "trytond" name)
|
||||
(string-prefix? "trytond-" name)) (snake-case name))
|
||||
(else (string-append "python-" (snake-case name)))))
|
||||
(let ((name (snake-case name)))
|
||||
(cond
|
||||
((string-prefix? "python-" name) name)
|
||||
((string-suffix? "-python" name)
|
||||
(string-append "python-" (string-drop-right name 7)))
|
||||
((or (string=? "trytond" name)
|
||||
(string-prefix? "trytond-" name)) name)
|
||||
(else (string-append "python-" name)))))
|
||||
|
||||
(define (guix-package->pypi-name package)
|
||||
"Given a Python PACKAGE built from pypi.org, return the name of the
|
||||
|
||||
Reference in New Issue
Block a user