cor/ebuild-autogen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix pypi no version found error.

Browse source 
Add pypi .whl file handling ability.
Fix git update from correct folder.
This commit is contained in:
Cor Legemaat 2025-08-18 14:50:57 +02:00
parent 6071222b67
commit 9d15518c46
4 changed files with 42 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -15,7 +15,7 @@ ebuild-autogen. If not, see <https://www.gnu.org/licenses/>.
m4_define([version_major], [0])
m4_define([version_minor], [0])
m4_define([version_revision], [2])
m4_define([version_revision], [3])
AC_PACKAGE_URL([http://www.cor.za.net/code/ebuild-autogen])
AC_INIT(ebuild-autogen,

2
ebuild/fetchers/github.scm
View file

@ -52,7 +52,7 @@
"?per_page=100&page="
(number->string page)))
(curl-easy-setopt curl-handle 'useragent curl-useragent)
(if (string<> token "")
(if (and token (string<> token ""))
(curl-easy-setopt curl-handle
'httpheader
(list (string-append "Authorization: token "

71
ebuild/fetchers/pypi.scm
View file

@ -53,40 +53,47 @@
"\n")))))))
(define-public fetch-pypi
(lambda* (pkg #:key (file-types (list "tar.gz")) (display-data #f))
(lambda* (parms #:key (file-types (list ".tar.gz")) (display-data #f))
""
(let* ((data (fetch-pypi-pkg pkg display-data))
(let* ((data (fetch-pypi-pkg (assoc-ref parms 'name) display-data))
(versions (vector->list (assoc-ref data "versions")))
(files (assoc-ref data "files")))
(map (lambda (version)
(list (cons "version" version)
;;TODO handle not found.
(car (car ((dql (select (filter (where (lambda (file-name)
(if (string? file-name)
(string-contains file-name
(string-append "-"
version
"."
(car file-types)))
#f))
"filename"))
(parm-as "date" "upload-time")))
files)))
(cons "assets"
(map (lambda (type)
(append (car ((dql (select (filter (where (lambda (file-name)
(if (string? file-name)
(string-contains file-name
(string-append "-"
version
"."
type))
#f))
"filename"))
(parm-as "uri" "url")
(parm-as "name" "filename")
(parm "hashes" "sha256")))
files))
(list (cons "type" type))))
file-types))))
(let ((upload-date (car ((dql (select (filter (where (lambda (file-name)
(if (string? file-name)
(string-contains file-name
(string-append "-"
version
(car file-types)))
#f))
"filename"))
(parm-as "date" "upload-time")))
files))))
(if (nil? upload-date)
(if (>= (assoc-ref parms 'verbosity)
verbosity-error)
(begin (display "Upload file \"")
(display (string-append "-"
version
(car file-types)))
(display "\" not found, skipping release!")
(newline)))
(list (cons "version" version)
(car upload-date)
(cons "assets"
(map (lambda (type)
(append (car ((dql (select (filter (where (lambda (file-name)
(if (string? file-name)
(string-contains file-name
(string-append "-"
version
type))
#f))
"filename"))
(parm-as "uri" "url")
(parm-as "name" "filename")
(parm "hashes" "sha256")))
files))
(list (cons "type" type))))
file-types))))))
versions))))

1
ebuild/repo.scm
View file

@ -89,6 +89,7 @@
(old-cwd (getcwd)))
;;Not working for updates only init?
;;(submodule-update repo)
(chdir path)
(system* "/usr/bin/git" "submodule" "update" "autogen")
(chdir (string-join (list path "autogen")
file-name-separator-string))