Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add latest versions to metkit, fdb packages #33289

Merged
merged 12 commits into from Nov 25, 2022
Merged

Add latest versions to metkit, fdb packages #33289

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b7472e7
Add version 1.20.2 to eckit package
victoria-cherkas Oct 13, 2022
372d49e
Add 1.9.2 version to metkit package
victoria-cherkas Oct 13, 2022
45b0ec7
add master and 5.10.8 versions to the fdb package
victoria-cherkas Oct 13, 2022
95026ca
formatting
victoria-cherkas Oct 13, 2022
6749d6d
formatting
victoria-cherkas Oct 13, 2022
557eb14
formatting
victoria-cherkas Oct 13, 2022
d929c76
move git to class level to fdb package
victoria-cherkas Oct 14, 2022
793311e
remove 1.20.2 version of eckit, as handled in another PR
victoria-cherkas Oct 14, 2022
a42f686
remove unneeded fdb on when clause
victoria-cherkas Oct 14, 2022
470ee63
formatting
victoria-cherkas Oct 14, 2022
27bcc50
Merge branch 'develop' into update_ecmwf_packages
victoria-cherkas Oct 14, 2022
2137523
depends on eccodes+tools when +tools
victoria-cherkas Oct 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions var/spack/repos/builtin/packages/eckit/package.py
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@ class Eckit(CMakePackage):

maintainers = ["skosukhin"]

version("1.20.2", sha256="9c11ddaaf346e40d11312b81ca7f1b510017f26618f4c0f5c5c59c37623fbac8")
version("1.16.0", sha256="9e09161ea6955df693d3c9ac70131985eaf7cf24a9fa4d6263661c6814ebbaf1")

variant("tools", default=True, description="Build the command line tools")
Expand Down
5 changes: 4 additions & 1 deletion var/spack/repos/builtin/packages/fdb/package.py
View file
Open in desktop
Expand Up @@ -15,6 +15,9 @@ class Fdb(CMakePackage):

maintainers = ["skosukhin"]

# master version of fdb is subject to frequent changes and is to be used experimentally.
version("master", git="https://github.com/ecmwf/fdb.git", branch="master")
victoria-cherkas marked this conversation as resolved.
Show resolved Hide resolved
version("5.10.8", sha256="6a0db8f98e13c035098dd6ea2d7559f883664cbf9cba8143749539122ac46099")
version("5.7.8", sha256="6adac23c0d1de54aafb3c663d077b85d0f804724596623b381ff15ea4a835f60")

variant("tools", default=True, description="Build the command line tools")
Expand Down Expand Up @@ -46,7 +49,7 @@ class Fdb(CMakePackage):

# Starting version 1.7.0, metkit installs GribHandle.h to another directory.
# That is accounted for only starting version 5.8.0:
patch("metkit_1.7.0.patch", when="@:5.7.10+tools^metkit@1.7.0:")
patch("metkit_1.7.0.patch", when="fdb@:5.7.10+tools^metkit@1.7.0:")
victoria-cherkas marked this conversation as resolved.
Show resolved Hide resolved

# Download test data before running a test:
patch(
Expand Down
1 change: 1 addition & 0 deletions var/spack/repos/builtin/packages/metkit/package.py
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@ class Metkit(CMakePackage):

maintainers = ["skosukhin"]

version("1.9.2", sha256="35d5f67196197cc06e5c2afc6d1354981e7c85a441df79a2fbd774e0c343b0b4")
version("1.7.0", sha256="8c34f6d8ea5381bd1bcfb22462349d03e1592e67d8137e76b3cecf134a9d338c")

variant("tools", default=True, description="Build the command line tools")
Expand Down