mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
refresh: Add support for partial target versions.
* guix/import/utils.scm (find-version): New procedure. * guix/scripts/refresh.scm (<update-spec>) [partial?]: New field. (update-spec-partial?): New accessor. (update-spec): Add a PARTIAL? optional argument. (update-specification->update-spec) <update-spec>: Call with its new PARTIAL? optional argument when FALLBACK-VERSION is provided, i.e. when '--target-version' was used. (update-package): Remove the PACKAGE and VERSION positional arguments, and replace them with UPDATE-SPEC. Update doc. Call `package-update' with its new #:partial-version? argument. (check-for-package-update) <package-latest-release>: Pass the new #:partial-version? argument to it. (guix-refresh) <update-package>: Adjust call accordingly. (show-help): Udate doc. * guix/upstream.scm (package-latest-release): Add #:partial-version? argument, and apply it to the importer call. (package-update): Add #:partial-version?> argument. Update doc. Pass it to the `package-latest-release' call. * guix/gnu-maintenance.scm (rewrite-url): Add #:partial-version? argument. Update doc. Crawl URL for newer compatible versions when provided. (import-html-release): Add #:partial-version? argument, and pass it to the `rewrite-url' call. Use `find-version' to find the best version. (import-release, import-ftp-release, import-gnu-release) (import-release*): Add #:partial-version? argument and honor it. (import-html-updatable-release): Add #:partial-version? argument, and pass it to the `import-html-release' call. * guix/import/gnome.scm (import-gnome-release) <#:partial-version?>: Add new argument and honor it. * guix/import/texlive.scm (latest-texlive-tag): Rename to... (texlive-tags): ... this, and have it return all tags. (texlive->guix-package): Adjust accordingly. (latest-release): Add a #:partial-version? argument. Update doc. * guix/import/stackage.scm (latest-lts-release): New #:partial-version? argument. * guix/import/pypi.scm (import-release): New #:partial-version? argument; pass it to `pypi-package->upstream-source'. * guix/import/opam.scm (latest-release): New #:partial-version? argument. * guix/import/minetest.scm (latest-minetest-release): New #:partial-version? argument. (pypi-package->upstream-source): New #:partial-version? argument. Update doc. * guix/import/launchpad.scm (latest-released-version): Rename to... (release-versions): ... this, making it return all versions. (import-release) <#:partial-version?>: New argument. * guix/import/kde.scm (import-kde-release) <#:partial-version?>: New argument. Update doc. Refactor to honor argument. * guix/import/hexpm.scm (lookup-hexpm): Update doc. (hexpm-latest-release): Rename to... (hexpm-releases): ... this; return all release strings. (hexpm->guix-package): Adjust accordingly. (import-release): Add and honor a #:partial-version? argument. Update doc. * guix/import/hackage.scm (import-release): New #:partial-version? argument. * guix/import/cpan.scm (latest-release): New #:partial-version? argument. * guix/import/crate.scm (max-crate-version-of-semver): Improve doc. (import-release): Add a #:partial-version? argument and honor it. * guix/import/egg.scm (find-latest-version): Rename to... (get-versions): ... this, returning all versions. (egg-metadata): Adjust accordingly. (egg->guix-package): Likewise. (import-release): Add a new #:partial-version? argument and honor it. * guix/import/elpa.scm (latest-release): New #:partial-version? argument. * guix/import/gem.scm (get-versions): New procedure. (import-release): Add a new #:partial-version? argument and honor it. * guix/import/git.scm (version-mapping): Update doc; streamline a bit. (latest-tag): Rename to... (get-tags): ... this, dropping the #:version keyword and returning the complete tags alist. Update doc. (latest-git-tag-version): Rename to... (get-package-tags): ... this, returning the complete tags alist of the package. Update doc. (import-git-release): Add a new #:partial-version? argument and honor it. Update doc. * guix/import/github.scm (latest-released-version): Rename to... (get-package-tags): ... this, returning all tags. Update doc. (import-release): Add a new #:partial-version? argument and honor it. * guix/import/cran.scm (latest-cran-release) (latest-bioconductor-release): Add #:partial-version? argument. * guix/import/composer.scm (latest-version): Delete procedure. (composer-fetch): Add #:partial-version? keyword and honor it. Update doc. (import-release): Likewise. * guix/import/test.scm (import-release): Add #:partial-version? argument. * tests/guix-refresh.sh: Add test. * tests/gem.scm (test-foo-versions-json): New variable. (package-latest-release): Mock new URL. * tests/import-git.scm (latest-git-tag-version): New procedure. * tests/gnu-maintenance.scm (libuv-dist-html) (libuv-dist-1.46.0-html, libuv-dist-1.44.2-html) (libuv-html-data): New variables. (mock-http-fetch/cached): New procedure. ("rewrite-url, without to-version"): Rewrite using the above. ("rewrite-url, partial to-version"): New test. * doc/guix.texi <"Invoking guix refresh">: Update doc. Series-to: 75871@debbugs.gnu.org Change-Id: I092a58b57ac42e54a2fa55e7761e8c6993af8ad4
This commit is contained in:
parent
79a46d6537
commit
f13f076968
29 changed files with 627 additions and 500 deletions
|
@ -35,6 +35,7 @@
|
|||
#:use-module (ice-9 regex)
|
||||
#:use-module ((ice-9 rdelim) #:select (read-line))
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-2)
|
||||
#:use-module (srfi srfi-26)
|
||||
#:use-module (srfi srfi-34)
|
||||
#:use-module (srfi srfi-35)
|
||||
|
@ -522,11 +523,17 @@ pypi-uri declaration in the generated package. You may need to replace ~s with
|
|||
a substring of the PyPI URI that identifies the package.") pypi-url name))
|
||||
name)))
|
||||
|
||||
(define* (pypi-package->upstream-source pypi-package #:optional version)
|
||||
(define* (pypi-package->upstream-source pypi-package
|
||||
#:optional version partial-version?)
|
||||
"Return the upstream source for the given VERSION of PYPI-PACKAGE, a
|
||||
<pypi-project> record. If VERSION is omitted or #f, use the latest version."
|
||||
<pypi-project> record. If VERSION is omitted or #f, use the latest version.
|
||||
If PARTIAL-VERSION? is #t, use the latest version found that is prefixed by
|
||||
VERSION."
|
||||
(let* ((info (pypi-project-info pypi-package))
|
||||
(version (or version (project-info-version info)))
|
||||
(versions (map (match-lambda
|
||||
((version . _) version))
|
||||
(pypi-project-releases pypi-package)))
|
||||
(version (find-version versions version partial-version?))
|
||||
(dist (source-release pypi-package version))
|
||||
(source-url (distribution-url dist))
|
||||
(wheel-url (and=> (wheel-release pypi-package version)
|
||||
|
@ -661,14 +668,14 @@ source. To build it from source, refer to the upstream repository at
|
|||
(string-prefix? "https://pypi.org/packages" url)
|
||||
(string-prefix? "https://files.pythonhosted.org/packages" url)))))
|
||||
|
||||
(define* (import-release package #:key (version #f))
|
||||
(define* (import-release package #:key version partial-version?)
|
||||
"Return an <upstream-source> for the latest release of PACKAGE. Optionally
|
||||
include a VERSION string to fetch a specific version."
|
||||
(let* ((pypi-name (guix-package->pypi-name package))
|
||||
(pypi-package (pypi-fetch pypi-name)))
|
||||
(and pypi-package
|
||||
(guard (c ((missing-source-error? c) #f))
|
||||
(pypi-package->upstream-source pypi-package version)))))
|
||||
(and-let* ((pypi-name (guix-package->pypi-name package))
|
||||
(pypi-package (pypi-fetch pypi-name)))
|
||||
(guard (c ((missing-source-error? c) #f))
|
||||
(pypi-package->upstream-source pypi-package
|
||||
version partial-version?))))
|
||||
|
||||
(define %pypi-updater
|
||||
(upstream-updater
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue