diff --git a/.copier-answers.yml b/.copier-answers.yml index a604b25..7390163 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,13 +1,18 @@ # Changes here will be overwritten by Copier # !!!!! DO NOT MANUALLY MODIFY THIS FILE !!!!! -_commit: v1.0.2 -_src_path: https://github.com/calliope-project/data-module-template.git -author_email: i.ruizmanuel@tudelft.nl -author_family_name: Ruiz Manuel -author_given_name: Ivan +_commit: v1.0.3 +_src_path: https://github.com/modelblocks-org/data-module-template.git +authors: +- email: i.ruizmanuel@tudelft.nl + family_name: Ruiz Manuel + given_name: Ivan github_org: modelblocks-org license: Apache-2.0 +maintainers: +- email: i.ruizmanuel@tudelft.nl + family_name: Ruiz Manuel + given_name: Ivan +module_code_name: module_hydropower module_description: A module to calculate hydropower inflow timeseries for facilities around the globe, based on Euro-Calliope methods. -module_long_name: Hydropower module -module_short_name: module_hydropower +module_human_name: Hydropower timeseries diff --git a/AUTHORS b/AUTHORS index b0ce4fa..89141ef 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,6 +2,7 @@ This is the list of contributors for copyright purposes. This does not necessarily list everyone who has contributed to this software's code or documentation. For a full contributor list, see: + Ivan Ruiz Manuel, diff --git a/CITATION.cff b/CITATION.cff index 782d79b..0a90a5b 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -3,9 +3,10 @@ # https://citation-file-format.github.io/ cff-version: 1.2.0 message: If you use this software or data produced by it, please cite it using the metadata from this file. -title: "Modelblocks - module_hydropower: Hydropower module" +title: "Modelblocks - module_hydropower: Hydropower timeseries" repository: "https://github.com/modelblocks-org/module_hydropower" license: Apache-2.0 authors: - - given-names: Ivan - family-names: Ruiz Manuel + - given-names: "Ivan" + family-names: "Ruiz Manuel" + email: "i.ruizmanuel@tudelft.nl" diff --git a/LICENSE b/LICENSE index 3946dd7..261eeb9 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2026 AUTHORS + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index 0f80a09..392d037 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Hydropower module +# Hydropower timeseries A module to calculate hydropower inflow timeseries for facilities around the globe, based on Euro-Calliope methods. diff --git a/pixi.toml b/pixi.toml index 500f3bf..fbf10e6 100644 --- a/pixi.toml +++ b/pixi.toml @@ -52,9 +52,13 @@ cmd = "pixi workspace export conda-environment --environment '{{ env }}' '{{ out [tasks._export-snakemake-pin] description = "Export one Pixi environment/platform as a Snakemake-compatible pin file" -args = ["env", "platform", { arg = "outdir", default = "workflow/envs" }] -cmd = """ -set -e -pixi workspace export conda-explicit-spec --environment '{{ env }}' --platform '{{ platform }}' '{{ outdir }}' -mv '{{ outdir }}/{{ env }}_{{ platform }}_conda_spec.txt' '{{ outdir }}/{{ env }}.{{ platform }}.pin.txt' -""" +args = ["env", "platform", "outdir"] +depends-on = [ + { task = "_export-conda-explicit-spec", args = ["{{ env }}", "{{ platform }}", "{{ outdir }}"] }, +] +cmd = "mv '{{ outdir }}/{{ env }}_{{ platform }}_conda_spec.txt' '{{ outdir }}/{{ env }}.{{ platform }}.pin.txt'" + +[tasks._export-conda-explicit-spec] +description = "Export one Pixi environment/platform as an explicit conda spec file" +args = ["env", "platform", "outdir"] +cmd = "pixi workspace export conda-explicit-spec --environment '{{ env }}' --platform '{{ platform }}' '{{ outdir }}'"