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_major], [0])
m4_define([version_minor], [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_PACKAGE_URL([http://www.cor.za.net/code/ebuild-autogen])
AC_INIT(ebuild-autogen, AC_INIT(ebuild-autogen,

2
ebuild/fetchers/github.scm
View file

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

71
ebuild/fetchers/pypi.scm
View file

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

1
ebuild/repo.scm
View file

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