prepare release v0.1.0 (#117)

README.md

@@ -3,7 +3,7 @@
 [![Documentation](https://readthedocs.org/projects/pypsa-eur/badge/?version=latest)](https://pypsa-eur.readthedocs.io/en/latest/?badge=latest)
 ![GitHub](https://img.shields.io/github/license/pypsa/pypsa-eur)
 ![Size](https://img.shields.io/github/repo-size/pypsa/pypsa-eur)
-[![Zenodo](https://zenodo.org/badge/DOI/10.5281/zenodo.1246852.svg)](https://doi.org/10.5281/zenodo.1246852)
+[![Zenodo](https://zenodo.org/badge/DOI/10.5281/zenodo.3520875.svg)](https://doi.org/10.5281/zenodo.3520875)
 [![Gitter](https://badges.gitter.im/PyPSA/community.svg)](https://gitter.im/PyPSA/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 # PyPSA-Eur: An Open Optimisation Model of the European Transmission System
@@ -44,4 +44,4 @@ 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://zenodo.org/record/1246851).
+repository](https://doi.org/10.5281/zenodo.3601882).

Snakefile

@@ -20,6 +20,11 @@ rule cluster_all_elec_networks:
         expand("networks/elec_s{simpl}_{clusters}.nc",
                **config['scenario'])
 
+rule extra_components_all_elec_networks:
+    input:
+        expand("networks/elec_s{simpl}_{clusters}_ec.nc",
+               **config['scenario'])
+
 rule prepare_all_elec_networks:
     input:
         expand("networks/elec_s{simpl}_{clusters}_ec_l{ll}_{opts}.nc",

config.default.yaml

@@ -1,4 +1,4 @@
-version: 0.1
+version: 0.1.0
 tutorial: false
 
 logging:
@@ -11,7 +11,7 @@ scenario:
   sectors: [E]
   simpl: ['']
   ll: ['copt']
-  clusters: [37, 100]
+  clusters: [37, 128, 256, 512, 1024]
   opts: [Co2L-3H]
 
 countries: ['AL', 'AT', 'BA', 'BE', 'BG', 'CH', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GB', 'GR', 'HR', 'HU', 'IE', 'IT', 'LT', 'LU', 'LV', 'ME', 'MK', 'NL', 'NO', 'PL', 'PT', 'RO', 'RS', 'SE', 'SI', 'SK']
@@ -22,7 +22,7 @@ snapshots:
   closed: 'left' # end is not inclusive
 
 enable:
-  prepare_links_p_nom: false
+  prepare_links_p_nom: true
   retrieve_databundle: true
   build_cutout: false
   build_natura_raster: false
@@ -34,7 +34,7 @@ electricity:
   agg_p_nom_limits: data/agg_p_nom_minmax.csv
 
   extendable_carriers:
-    Generator: [OCGT]
+    Generator: []
     StorageUnit: [battery, H2]
     Store: [] # battery, H2
     Link: []
@@ -45,14 +45,13 @@ electricity:
 
   powerplants_filter: false # use pandas query strings here, e.g. Country not in ['Germany']
   custom_powerplants: false # use pandas query strings here, e.g. Country in ['Germany']
-  conventional_carriers: [] # nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass]
+  conventional_carriers: [nuclear, oil, OCGT, CCGT, coal, lignite, geothermal, biomass]
 
   # estimate_renewable_capacities_from_capacity_stats:
   #   # Wind is the Fueltype in ppm.data.Capacity_stats, onwind, offwind-{ac,dc} the carrier in PyPSA-Eur
   #   Wind: [onwind, offwind-ac, offwind-dc]
   #   Solar: [solar]
 
-
 atlite:
   nprocesses: 4
   cutouts:

config.tutorial.yaml

@@ -1,4 +1,4 @@
-version: 0.1
+version: 0.1.0
 tutorial: true
 logging:
   level: INFO

doc/conf.py

@@ -62,7 +62,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'PyPSA-Eur'
-copyright = u'2017-2019 Jonas Hoersch (KIT, FIAS), Fabian Hofmann (FIAS), David Schlachtberger (FIAS), Tom Brown (KIT, FIAS); 2019 Fabian Neumann (KIT)'
+copyright = u'2017-2020 Jonas Hoersch (KIT, FIAS), Fabian Hofmann (FIAS), David Schlachtberger (FIAS), Tom Brown (KIT, FIAS); 2019-2020 Fabian Neumann (KIT)'
 author = u'Jonas Hoersch (KIT, FIAS), Fabian Hofmann (FIAS), David Schlachtberger (FIAS), Tom Brown (KIT, FIAS), Fabian Neumann (KIT)'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -70,7 +70,7 @@ author = u'Jonas Hoersch (KIT, FIAS), Fabian Hofmann (FIAS), David Schlachtberge
 # built documents.
 #
 # The short X.Y version.
-version = u'0.1.0'
+version = u'0.1'
 # The full version, including alpha/beta/rc tags.
 release = u'0.1.0'
 

doc/configtables/toplevel.csv

@@ -1,5 +1,5 @@
 ,Unit,Values,Description
-version,--,0.1,"Version of PyPSA-Eur"
+version,--,0.x.x,"Version of PyPSA-Eur"
 tutorial,bool,"{true, false}","Switch to retrieve the tutorial data set instead of the full data set."
 logging,,,
 -- level,--,"Any of {'INFO', 'WARNING', 'ERROR'}","Restrict console outputs to all infos, warning or errors only"
@@ -9,6 +9,6 @@ countries,--,"Subset of {'AL', 'AT', 'BA', 'BE', 'BG', 'CH', 'CZ', 'DE', 'DK', '
 focus_weights,--,"Keys should be two-digit country codes (e.g. DE) and values should range between 0 and 1","Ratio of total clusters for particular countries. the remaining weight is distributed according to mean load. An example: ``focus_weights: DE: 0.6 FR: 0.2``."
 enable,,,
 -- prepare_links_p_nom,bool,"{true, false}","Switch to retrieve current HVDC projects from `Wikipedia <https://en.wikipedia.org/wiki/List_of_HVDC_projects>`_"
--- retrieve_databundle,bool,"{true, false}","Switch to retrieve databundle from zenodo via the rule :mod:`retrieve_databundle` or whether to keep a custom databundle located in the corresponding folder.
+-- retrieve_databundle,bool,"{true, false}","Switch to retrieve databundle from zenodo via the rule :mod:`retrieve_databundle` or whether to keep a custom databundle located in the corresponding folder."
 -- build_cutout,bool,"{true, false}","Switch to build cutouts via the rule :mod:`build_cutout` or whether to retrieve the data from zenodo with :mod:`retrieve_cutout`."
 -- build_natura_raster,bool,"{true, false}","Switch to create raster ``natura.tiff`` via the rule :mod:`build_natura_raster` or whether to retrieve ``natura.tiff`` from zenodo with :mod:`retrieve_natura_raster`."

doc/configuration.rst

@@ -13,7 +13,7 @@ Top-level configuration
 
 .. literalinclude:: ../config.default.yaml
    :language: yaml
-   :lines: 1-8,17
+   :lines: 1-8,17,24-28
 
 .. csv-table::
    :header-rows: 1
@@ -75,7 +75,7 @@ Specifies the temporal range to build an energy system model for as arguments to
 
 .. literalinclude:: ../config.default.yaml
    :language: yaml
-   :lines: 30-47
+   :lines: 30-48
 
 .. csv-table::
    :header-rows: 1
@@ -171,7 +171,7 @@ Specifies the temporal range to build an energy system model for as arguments to
 
 .. literalinclude:: ../config.default.yaml
    :language: yaml
-   :lines: 133-150
+   :lines: 143-150
 
 .. csv-table::
    :header-rows: 1

doc/contributing.rst

@@ -7,4 +7,6 @@ be it with new ideas, suggestions, by filing bug reports or contributing code.
 
 You are invited to submit pull requests and file issues to the `GitHub repository <https://github.com/PyPSA/PyPSA-Eur>`_.
 
-If you are unfamiliar with pull requests, the GitHub help pages have a nice `guide <https://help.github.com/en/articles/about-pull-requests>`_.
+If you are unfamiliar with pull requests, the GitHub help pages have a nice `guide <https://help.github.com/en/articles/about-pull-requests>`_.
+
+To ask and answer general usage questions, join the `PyPSA and PyPSA-Eur mailing list <https://groups.google.com/forum/#!forum/pypsa>`_.

doc/index.rst

@@ -17,8 +17,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.1246852.svg
+.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3520875.svg
-    :target: https://doi.org/10.5281/zenodo.1246852
+    :target: https://doi.org/10.5281/zenodo.3520875
 
 .. image:: https://badges.gitter.im/PyPSA/community.svg
     :target: https://gitter.im/PyPSA/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge
@@ -141,9 +141,25 @@ 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.1246852.svg
+.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3520875.svg
-   :target: https://doi.org/10.5281/zenodo.1246852
+   :target: https://doi.org/10.5281/zenodo.3520875
 
+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
+
+The included ``.nc`` files are PyPSA network files which can be imported with PyPSA via:
+
+.. code:: python
+    
+    import pypsa
+
+    filename = "elec_s_1024_ec.nc" # example
+    n = pypsa.Network(filename)
 
 Licence
 =======

doc/release_notes.rst

@@ -2,10 +2,10 @@
 Release Notes
 ##########################################
 
-PyPSA-Eur 0.1.0 (DATE)
+PyPSA-Eur 0.1.0 (9th January 2020)
-======================
+==================================
 
-This is the first release of PyPSA-Eur:
+This is the first release of PyPSA-Eur, a model of the European power system at the transmission network level. Recent changes include:
 
 * Documentation on installation, workflows and configuration settings is now available online at `pypsa-eur.readthedocs.io <pypsa-eur.readthedocs.io>`_ (`#65 <https://github.com/PyPSA/pypsa-eur/pull/65>`_).
 
@@ -32,3 +32,29 @@ This is the first release of PyPSA-Eur:
 * Logfiles for all rules of the ``snakemake`` workflow are now written in the folder ``log/`` (`#102 <https://github.com/PyPSA/pypsa-eur/pull/102>`_). 
 
 * The new function ``_helpers.mock_snakemake`` creates a ``snakemake`` object which mimics the actual ``snakemake`` object produced by workflow by parsing the ``Snakefile`` and setting all paths for inputs, outputs, and logs. This allows running all scripts within a (I)python terminal (or just by calling ``python <script-name>``) and thereby facilitates developing and debugging scripts significantly (`#107 <https://github.com/PyPSA/pypsa-eur/pull/107>`_).
+
+Release Process
+===============
+
+* Checkout a new release branch ``git checkout -b release-v0.x.x``.
+
+* Finalise release notes at ``doc/release_notes.rst``.
+
+* Update ``environment.fixedversions.yaml`` via
+  ``conda env export -n pypsa-eur -f environment.fixedversions.yaml --no-builds``
+  from an up-to-date `pypsa-eur` environment.
+
+* Update version number in ``doc/conf.py`` and ``*config.*.yaml``.
+
+* Open, review and merge pull request for branch ``release-v0.x.x``.
+  Make sure to close issues and PRs or the release milestone with it (e.g. closes #X).
+
+* 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 <https://doi.org/10.5281/zenodo.3520875>`_ with `GNU GPL 3.0 <https://www.gnu.org/licenses/gpl-3.0.en.html>`_ license.
+
+* Create pre-built networks for ``config.default.yaml`` by running ``snakemake extra_components_all_elec_networks``.
+
+* Upload pre-built networks to `zenodo data repository <https://doi.org/10.5281/zenodo.3601882>`_ with `CC BY 4.0 <https://creativecommons.org/licenses/by/4.0/>`_ license.
+
+* Send announcement on the `PyPSA and PyPSA-Eur mailing list <https://groups.google.com/forum/#!forum/pypsa>`_.

doc/tutorial.rst

@@ -44,41 +44,41 @@ Likewise, the example's temporal scope can be restricted (e.g. to a single month
 
 .. literalinclude:: ../config.tutorial.yaml
    :language: yaml
-   :lines: 17-20
+   :lines: 18-21
 
 It is also possible to allow less or more carbon-dioxide emissions. Here, we limit the emissions of Germany 100 Megatonnes per year.
 
 .. literalinclude:: ../config.tutorial.yaml
    :language: yaml
-   :lines: 30
+   :lines: 31
 
 PyPSA-Eur also includes a database of existing conventional powerplants.
 We can select which types of powerplants we like to be included with fixed capacities:
 
 .. literalinclude:: ../config.tutorial.yaml
    :language: yaml
-   :lines: 43
+   :lines: 45
 
 To accurately model the temporal and spatial availability of renewables such as wind and solar energy, we rely on historical weather data.
 It is advisable to adapt the required range of coordinates to the selection of countries.
 
 .. literalinclude:: ../config.tutorial.yaml
    :language: yaml
-   :lines: 45-53
+   :lines: 47-55
 
 We can also decide which weather data source should be used to calculate potentials and capacity factor time-series for each carrier.
 For example, we may want to use the ERA-5 dataset for solar and not the default SARAH-2 dataset.
 
 .. literalinclude:: ../config.tutorial.yaml
    :language: yaml
-   :lines: 55,98-99
+   :lines: 57,100-101
 
 Finally, it is possible to pick a solver. For instance, this tutorial uses the open-source solvers CBC and Ipopt and does not rely
 on the commercial solvers Gurobi or CPLEX (for which free academic licenses are available).
 
 .. literalinclude:: ../config.tutorial.yaml
    :language: yaml
-   :lines: 154,163-164
+   :lines: 156,165-166
 
 .. note::
 

environment.docs.yaml

@@ -5,7 +5,7 @@ channels:
 dependencies:
   #- python
   - pip
-  - pypsa>=0.15
+  - pypsa>=0.16
   - atlite
 
   # Dependencies of the workflow itself

environment.fixedversions.yaml

@@ -8,21 +8,20 @@ dependencies:
   - _libgcc_mutex=0.1
   - affine=2.3.0
   - appdirs=1.4.3
-  - asn1crypto=1.2.0
   - atlite=0.0.2
-  - atomicwrites=1.3.0
   - attrs=19.3.0
   - backcall=0.1.0
+  - beautifulsoup4=4.8.2
   - blosc=1.17.0
-  - bokeh=1.3.4
+  - bokeh=1.4.0
   - boost-cpp=1.70.0
-  - bottleneck=1.2.1
+  - bottleneck=1.3.1
   - bzip2=1.0.8
-  - ca-certificates=2019.9.11
+  - ca-certificates=2019.11.28
   - cairo=1.16.0
   - cartopy=0.17.0
-  - certifi=2019.9.11
+  - certifi=2019.11.28
-  - cffi=1.13.1
+  - cffi=1.13.2
   - cfitsio=3.470
   - cftime=1.0.4.2
   - chardet=3.0.4
@@ -31,31 +30,34 @@ dependencies:
   - cligj=0.5.0
   - cloudpickle=1.2.2
   - configargparse=0.13.0
-  - cryptography=2.7
+  - cryptography=2.8
   - curl=7.65.3
   - cycler=0.10.0
-  - cytoolz=0.10.0
+  - cytoolz=0.10.1
-  - dask=2.6.0
+  - dask=2.9.1
-  - dask-core=2.6.0
+  - dask-core=2.9.1
   - datrie=0.8
   - dbus=1.13.6
   - decorator=4.4.1
-  - distributed=2.6.0
+  - distributed=2.9.1
   - docutils=0.15.2
+  - entsoe-py=0.2.10
   - expat=2.2.5
   - fiona=1.8.6
   - fontconfig=2.13.1
   - freetype=2.10.0
   - freexl=1.0.5
-  - fsspec=0.5.2
+  - fsspec=0.6.2
   - gdal=2.4.1
-  - geopandas=0.6.1
+  - geographiclib=1.50
+  - geopandas=0.6.2
+  - geopy=1.20.0
   - geos=3.7.2
   - geotiff=1.4.3
   - gettext=0.19.8.1
   - giflib=5.1.7
   - gitdb2=2.0.6
-  - gitpython=3.0.4
+  - gitpython=3.0.5
   - glib=2.58.3
   - gst-plugins-base=1.14.5
   - gstreamer=1.14.5
@@ -64,27 +66,29 @@ dependencies:
   - heapdict=1.0.1
   - icu=58.2
   - idna=2.8
-  - importlib_metadata=0.23
+  - importlib_metadata=1.3.0
-  - ipython=7.9.0
+  - ipython=7.11.1
   - ipython_genutils=0.2.0
-  - jedi=0.15.1
+  - jedi=0.15.2
   - jinja2=2.10.3
-  - joblib=0.14.0
+  - joblib=0.14.1
   - jpeg=9c
   - json-c=0.13.1
-  - jsonschema=3.1.1
+  - jsonschema=3.2.0
   - kealib=1.4.10
   - kiwisolver=1.1.0
-  - krb5=1.16.3
+  - krb5=1.16.4
+  - ld_impl_linux-64=2.33.1
   - libblas=3.8.0
   - libcblas=3.8.0
   - libcurl=7.65.3
   - libdap4=3.20.4
   - libedit=3.1.20170329
   - libffi=3.2.1
-  - libgcc-ng=9.1.0
+  - libgcc-ng=9.2.0
   - libgdal=2.4.1
   - libgfortran-ng=7.3.0
+  - libgomp=9.2.0
   - libiconv=1.15
   - libkml=1.3.0
   - liblapack=3.8.0
@@ -95,8 +99,8 @@ dependencies:
   - libspatialindex=1.9.3
   - libspatialite=4.3.0a
   - libssh2=1.8.2
-  - libstdcxx-ng=9.1.0
+  - libstdcxx-ng=9.2.0
-  - libtiff=4.0.10
+  - libtiff=4.1.0
   - libuuid=2.32.1
   - libxcb=1.13
   - libxml2=2.9.9
@@ -106,91 +110,100 @@ dependencies:
   - markupsafe=1.1.1
   - matplotlib=3.1.1
   - matplotlib-base=3.1.1
-  - memory_profiler=0.55.0
+  - memory_profiler=0.56.0
   - mock=3.0.5
-  - more-itertools=7.2.0
+  - more-itertools=8.0.2
   - msgpack-python=0.6.2
-  - munch=2.3.2
+  - munch=2.5.0
   - ncurses=6.1
   - netcdf4=1.5.1.2
-  - numexpr=2.7.0
+  - networkx=2.4
+  - nose=1.3.7
+  - numexpr=2.7.1
   - numpy=1.17.3
   - olefile=0.46
   - openjpeg=2.3.1
-  - openssl=1.1.1c
+  - openmp_impl=4.5
-  - owslib=0.18.0
+  - openssl=1.1.1d
-  - packaging=19.2
+  - owslib=0.19.0
-  - pandas=0.25.2
+  - packaging=20.0
-  - parso=0.5.1
+  - pandas=0.25.3
-  - partd=1.0.0
+  - parso=0.5.2
+  - partd=1.1.0
   - patsy=0.5.1
   - pcre=8.43
   - pexpect=4.7.0
   - pickleshare=0.7.5
-  - pillow=6.2.1
+  - pillow=7.0.0
   - pip=19.3.1
   - pixman=0.38.0
   - pluggy=0.13.0
+  - ply=3.11
   - poppler=0.67.0
   - poppler-data=0.4.9
   - postgresql=11.5
+  - powerplantmatching=0.4.3
   - progressbar2=3.47.0
   - proj4=5.2.0
-  - prompt_toolkit=2.0.10
+  - prompt_toolkit=3.0.2
-  - psutil=5.6.3
+  - psutil=5.6.7
   - pthread-stubs=0.4
   - ptyprocess=0.6.0
-  - py=1.8.0
+  - py=1.8.1
   - pycountry=19.8.18
   - pycparser=2.19
   - pyepsg=0.4.0
-  - pygments=2.4.2
+  - pygments=2.5.2
   - pykdtree=1.3.1
-  - pyopenssl=19.0.0
+  - pyomo=5.6.8
-  - pyparsing=2.4.2
+  - pyopenssl=19.1.0
+  - pyparsing=2.4.6
   - pyproj=1.9.6
+  - pypsa=0.16.0
   - pyqt=5.9.2
-  - pyrsistent=0.15.4
+  - pyrsistent=0.15.7
   - pyshp=2.1.0
   - pysocks=1.7.1
-  - pytables=3.6.0
+  - pytables=3.6.1
-  - pytest=5.2.2
+  - pytest=5.3.2
-  - pytest-runner=5.1
+  - pytest-runner=5.2
-  - python=3.7.3
+  - python=3.7.6
-  - python-dateutil=2.8.0
+  - python-dateutil=2.8.1
   - python-utils=2.3.0
   - pytz=2019.3
-  - pyyaml=5.1.2
+  - pyutilib=5.7.3
+  - pyyaml=5.3
   - qt=5.9.7
   - rasterio=1.0.25
   - ratelimiter=1.2.0
   - readline=8.0
   - requests=2.22.0
-  - rtree=0.8.3
+  - rtree=0.9.3
-  - scikit-learn=0.21.3
+  - scikit-learn=0.22.1
-  - scipy=1.3.1
+  - scipy=1.4.1
   - seaborn=0.9.0
-  - setuptools=41.4.0
+  - setuptools=44.0.0
   - shapely=1.6.4
   - sip=4.19.8
-  - six=1.12.0
+  - six=1.13.0
   - smmap2=2.0.5
-  - snakemake-minimal=5.7.4
+  - snakemake-minimal=5.9.1
   - snuggs=1.4.7
   - sortedcontainers=2.1.0
+  - soupsieve=1.9.4
   - sqlite=3.30.1
-  - statsmodels=0.10.1
+  - statsmodels=0.10.2
-  - tblib=1.4.0
+  - tblib=1.6.0
-  - tk=8.6.9
+  - tk=8.6.10
   - toolz=0.10.0
   - tornado=6.0.3
   - traitlets=4.3.3
   - tzcode=2019a
-  - urllib3=1.25.6
+  - urllib3=1.25.7
-  - wcwidth=0.1.7
+  - wcwidth=0.1.8
   - wheel=0.33.6
   - wrapt=1.11.2
-  - xarray=0.14.0
+  - xarray=0.14.1
   - xerces-c=3.2.2
   - xlrd=1.2.0
   - xorg-kbproto=1.0.7
@@ -205,28 +218,16 @@ dependencies:
   - xorg-xextproto=7.3.0
   - xorg-xproto=7.0.31
   - xz=5.2.4
-  - yaml=0.1.7
+  - yaml=0.2.2
   - zict=1.0.0
   - zipp=0.6.0
   - zlib=1.2.11
-  - zstd=1.4.3
+  - zstd=1.4.4
   - pip:
-    - beautifulsoup4==4.8.1
+    - cdsapi==0.2.5
-    - cdsapi==0.2.3
     - countrycode==0.2
     - descartes==1.1.0
-    - entsoe-py==0.2.10
-    - geographiclib==1.50
     - geokit==1.1.2
-    - geopy==1.20.0
     - glaes==1.1.2
-    - networkx==2.4
+    - tqdm==4.41.1
-    - nose==1.3.7
-    - ply==3.11
-    - powerplantmatching==0.4.1
-    - pyomo==5.6.6
-    - pypsa==0.14.1
-    - pyutilib==5.7.1
-    - soupsieve==1.9.4
-    - tqdm==4.36.1
     - vresutils==0.3

environment.yaml

@@ -6,7 +6,7 @@ dependencies:
   - python
   - pip
 
-  - pypsa>=0.15
+  - pypsa>=0.16
   - atlite
 
   # Dependencies of the workflow itself

scripts/base_network.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 """
-Creates the network topology from the ENTSO-E map extracts as a PyPSA network.
+Creates the network topology from a `ENTSO-E map extract <https://github.com/PyPSA/GridKit/tree/master/entsoe>`_ (25 May 2018) as a PyPSA network.
 
 Relevant Settings
 -----------------
@@ -37,7 +37,7 @@ Relevant Settings
 Inputs
 ------
 
-- ``data/entsoegridkit``:  Extract from the geographical vector data of the online `ENTSO-E Interactive Map <https://www.entsoe.eu/data/map/>`_ by the `GridKit <https://github.com/pypsa/gridkit>`_ toolkit.
+- ``data/entsoegridkit``:  Extract from the geographical vector data of the online `ENTSO-E Interactive Map <https://www.entsoe.eu/data/map/>`_ by the `GridKit <https://github.com/pypsa/gridkit>`_ toolkit dating back to 25 May 2018.
 - ``data/parameter_corrections.yaml``: Corrections for ``data/entsoegridkit``
 - ``data/links_p_nom.csv``: confer :ref:`links`
 - ``data/links_tyndp.csv``: List of projects in the `TYNDP 2018 <https://tyndp.entsoe.eu/tyndp2018/>`_ that are at least *in permitting* with fields for start- and endpoint (names and coordinates), length, capacity, construction status, and project reference ID.

scripts/retrieve_cutout.py

@@ -1,4 +1,4 @@
-## Copyright 2019 Fabian Hofmann (FIAS)
+## Copyright 2019-2020 Fabian Hofmann (FIAS)
 
 """
 .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3517949.svg

scripts/retrieve_databundle.py

@@ -1,4 +1,4 @@
-## Copyright 2019 Fabian Hofmann (FIAS)
+## Copyright 2019-2020 Fabian Hofmann (FIAS)
 """
 .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3517935.svg
    :target: https://doi.org/10.5281/zenodo.3517935

scripts/retrieve_natura_raster.py

@@ -1,4 +1,4 @@
-## Copyright 2019 Fabian Hofmann (FIAS)
+## Copyright 2019-2020 Fabian Hofmann (FIAS)
 
 """
 .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3518215.svg

test/config.test1.yaml

@@ -1,4 +1,4 @@
-version: 0.1
+version: 0.1.0
 tutorial: true
 logging:
   level: INFO