diff --git a/README.md b/README.md index c281e5898..426ad5597 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ SPDX-License-Identifier: CC-BY-4.0 [![Build Status](https://travis-ci.org/PyPSA/pypsa-eur.svg?branch=master)](https://travis-ci.org/PyPSA/pypsa-eur) [![Documentation](https://readthedocs.org/projects/pypsa-eur/badge/?version=latest)](https://pypsa-eur.readthedocs.io/en/latest/?badge=latest) ![Size](https://img.shields.io/github/repo-size/pypsa/pypsa-eur) -[![Zenodo](https://zenodo.org/badge/DOI/10.5281/zenodo.3520875.svg)](https://doi.org/10.5281/zenodo.3520875) +[![Zenodo](https://zenodo.org/badge/DOI/10.5281/zenodo.3520874.svg)](https://doi.org/10.5281/zenodo.3520874) [![Gitter](https://badges.gitter.im/PyPSA/community.svg)](https://gitter.im/PyPSA/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Snakemake](https://img.shields.io/badge/snakemake-≥5.0.0-brightgreen.svg?style=flat)](https://snakemake.readthedocs.io) [![REUSE status](https://api.reuse.software/badge/github.com/pypsa/pypsa-eur)](https://api.reuse.software/info/github.com/pypsa/pypsa-eur) @@ -61,7 +61,7 @@ The dataset consists of: - Geographical potentials for wind and solar generators based on land use (CORINE) and excluding nature reserves (Natura2000) are computed with the [vresutils library](https://github.com/FRESNA/vresutils) and the [glaes library](https://github.com/FZJ-IEK3-VSA/glaes). Already-built versions of the model can be found in the accompanying [Zenodo -repository](https://doi.org/10.5281/zenodo.3601882). +repository](https://doi.org/10.5281/zenodo.3601881). A version of the model that adds building heating, transport and industry sectors to the model, as well as gas networks, can be found diff --git a/doc/index.rst b/doc/index.rst index 2ff0cd1c3..02b02ce27 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -19,8 +19,8 @@ PyPSA-Eur: An Open Optimisation Model of the European Transmission System .. image:: https://img.shields.io/github/repo-size/pypsa/pypsa-eur :alt: GitHub repo size -.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3520875.svg - :target: https://doi.org/10.5281/zenodo.3520875 +.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3520874.svg + :target: https://doi.org/10.5281/zenodo.3520874 .. image:: https://badges.gitter.im/PyPSA/community.svg :target: https://gitter.im/PyPSA/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge @@ -171,16 +171,16 @@ Please use the following BibTeX: :: If you want to cite a specific PyPSA-Eur version, each release of PyPSA-Eur is stored on Zenodo with a release-specific DOI. This can be found linked from the overall PyPSA-Eur Zenodo DOI: -.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3520875.svg - :target: https://doi.org/10.5281/zenodo.3520875 +.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3520874.svg + :target: https://doi.org/10.5281/zenodo.3520874 Pre-Built Networks as a Dataset =============================== There are pre-built networks available as a dataset on Zenodo as well for every release of PyPSA-Eur. -.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3601882.svg - :target: https://doi.org/10.5281/zenodo.3601882 +.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3601881.svg + :target: https://doi.org/10.5281/zenodo.3601881 The included ``.nc`` files are PyPSA network files which can be imported with PyPSA via: diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 72e82ac2e..e678f669b 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -193,10 +193,10 @@ Release Process * Tag a release on Github via ``git tag v0.x.x``, ``git push``, ``git push --tags``. Include release notes in the tag message. -* Upload code to `zenodo code repository `_ with `GNU GPL 3.0 `_ license. +* Upload code to `zenodo code repository `_ with `GNU GPL 3.0 `_ license. * Create pre-built networks for ``config.default.yaml`` by running ``snakemake -j 1 extra_components_all_networks``. -* Upload pre-built networks to `zenodo data repository `_ with `CC BY 4.0 `_ license. +* Upload pre-built networks to `zenodo data repository `_ with `CC BY 4.0 `_ license. * Send announcement on the `PyPSA and PyPSA-Eur mailing list `_.