PyPSA · fneum · Feb 19, 2024 · Feb 19, 2024 · Feb 19, 2024 · Feb 19, 2024
diff --git a/.gitattributes b/.gitattributes
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: : 2017-2024 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: CC0-1.0
 

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: : 2021-2023 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: : 2021-2024 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: CC0-1.0
 

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: : 2017-2024 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: CC0-1.0
 

diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: : 2017-2024 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: CC0-1.0
 

diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -4,33 +4,33 @@ Upstream-Contact: Tom Brown <t.brown@tu-berlin.de>
 Source: https://github.com/pypsa/pypsa-eur
 
 Files: doc/img/*
-Copyright: 2019-2023 The PyPSA-Eur Authors
+Copyright: 2019-2024 The PyPSA-Eur Authors
 License: CC-BY-4.0
 
 Files: doc/data.csv
-Copyright: 2019-2023 The PyPSA-Eur Authors
+Copyright: 2019-2024 The PyPSA-Eur Authors
 License: CC-BY-4.0
 
 Files: doc/configtables/*
-Copyright: 2019-2023 The PyPSA-Eur Authors
+Copyright: 2019-2024 The PyPSA-Eur Authors
 License: CC-BY-4.0
 
 Files: data/*
-Copyright: 2017-2023 The PyPSA-Eur Authors
+Copyright: 2017-2024 The PyPSA-Eur Authors
 License: CC-BY-4.0
 
 Files: .github/*
-Copyright: 2019-2023 The PyPSA-Eur Authors
+Copyright: 2019-2024 The PyPSA-Eur Authors
 License: CC0-1.0
 
 Files: matplotlibrc
-Copyright: 2017-2023 The PyPSA-Eur Authors
+Copyright: 2017-2024 The PyPSA-Eur Authors
 License: CC0-1.0
 
 Files: borg-it
-Copyright: 2017-2023 The PyPSA-Eur Authors
+Copyright: 2017-2024 The PyPSA-Eur Authors
 License: CC0-1.0
 
 Files: graphics/*
-Copyright: 2017-2023 The PyPSA-Eur Authors
+Copyright: 2017-2024 The PyPSA-Eur Authors
 License: CC-BY-4.0
diff --git a/.sync-send b/.sync-send
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: : 2021-2023 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: : 2021-2024 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: CC0-1.0
 

diff --git a/CITATION.cff b/CITATION.cff
@@ -6,7 +6,7 @@ cff-version: 1.1.0
 message: "If you use this package, please cite it in the following way."
 title: "PyPSA-Eur: An open sector-coupled optimisation model of the European energy system"
 repository: https://github.com/pypsa/pypsa-eur
-version: 0.9.0
+version: 0.10.0
 license: MIT
 authors:
   - family-names: Brown

diff --git a/LICENSES/MIT.txt b/LICENSES/MIT.txt
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright 2017-2023 The PyPSA-Eur Authors
+Copyright 2017-2024 The PyPSA-Eur Authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <!--
-SPDX-FileCopyrightText: 2017-2023 The PyPSA-Eur Authors
+SPDX-FileCopyrightText: 2017-2024 The PyPSA-Eur Authors
 SPDX-License-Identifier: CC-BY-4.0
 -->
 

diff --git a/Snakefile b/Snakefile
@@ -18,6 +18,7 @@ conf_default_file = os.path.join(workflow.current_basedir, "config/config.defaul
 if not exists(conf_file) and exists(conf_default_file):
     copyfile(conf_default_file, conf_file)
 
+
 configfile: "config/config.default.yaml"
 configfile: "config/config.yaml"
 

diff --git a/config/config.default.yaml b/config/config.default.yaml
@@ -1,9 +1,9 @@
-# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: : 2017-2024 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: CC0-1.0
 
 # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#top-level-configuration
-version: 0.9.0
+version: 0.10.0
 tutorial: false
 
 logging:
@@ -662,7 +662,7 @@ industry:
 # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#costs
 costs:
   year: 2030
-  version: v0.7.0
+  version: v0.8.0
   rooftop_share: 0.14  # based on the potentials, assuming  (0.1 kW/m2 and 10 m2/person)
   social_discountrate: 0.02
   fill_values:

diff --git a/config/config.entsoe-all.yaml b/config/config.entsoe-all.yaml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2017-2023 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: 2017-2024 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: CC0-1.0
 

diff --git a/config/config.perfect.yaml b/config/config.perfect.yaml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: : 2017-2024 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: CC0-1.0
 run:

diff --git a/config/config.validation.yaml b/config/config.validation.yaml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: : 2017-2024 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: CC0-1.0
 run:

diff --git a/config/test/config.electricity.yaml b/config/test/config.electricity.yaml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: : 2017-2024 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: CC0-1.0
 

diff --git a/config/test/config.myopic.yaml b/config/test/config.myopic.yaml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: : 2017-2024 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: CC0-1.0
 

diff --git a/config/test/config.overnight.yaml b/config/test/config.overnight.yaml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: : 2017-2024 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: CC0-1.0
 

diff --git a/config/test/config.perfect.yaml b/config/test/config.perfect.yaml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: : 2017-2023 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: : 2017-2024 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: CC0-1.0
 

diff --git a/doc/Makefile b/doc/Makefile
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2017-2023 The PyPSA-Eur Authors
+# SPDX-FileCopyrightText: 2017-2024 The PyPSA-Eur Authors
 #
 # SPDX-License-Identifier: MIT
 

diff --git a/doc/conf.py b/doc/conf.py
@@ -72,17 +72,17 @@
 
 # General information about the project.
 project = "PyPSA-Eur"
-copyright = "2017-2023 Tom Brown (KIT, TUB, FIAS), Jonas Hoersch (KIT, FIAS), Fabian Hofmann (TUB, FIAS), Fabian Neumann (TUB, KIT), Marta Victoria (Aarhus University), Lisa Zeyen (KIT, TUB)"
+copyright = "2017-2024 Tom Brown (KIT, TUB, FIAS), Jonas Hoersch (KIT, FIAS), Fabian Hofmann (TUB, FIAS), Fabian Neumann (TUB, KIT), Marta Victoria (Aarhus University), Lisa Zeyen (KIT, TUB)"
 author = "Tom Brown (KIT, TUB, FIAS), Jonas Hoersch (KIT, FIAS), Fabian Hofmann (TUB, FIAS), Fabian Neumann (TUB, KIT), Marta Victoria (Aarhus University), Lisa Zeyen (KIT, TUB)"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = "0.9"
+version = "0.10"
 # The full version, including alpha/beta/rc tags.
-release = "0.9.0"
+release = "0.10.0"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/doc/configuration.rst b/doc/configuration.rst
@@ -1,5 +1,5 @@
 ..
-  SPDX-FileCopyrightText: 2019-2023 The PyPSA-Eur Authors
+  SPDX-FileCopyrightText: 2019-2024 The PyPSA-Eur Authors
 
   SPDX-License-Identifier: CC-BY-4.0
 

diff --git a/doc/contributing.rst b/doc/contributing.rst
@@ -1,5 +1,5 @@
 ..
-  SPDX-FileCopyrightText: 2019-2023 The PyPSA-Eur Authors
+  SPDX-FileCopyrightText: 2019-2024 The PyPSA-Eur Authors
 
   SPDX-License-Identifier: CC-BY-4.0
 

diff --git a/doc/costs.rst b/doc/costs.rst
@@ -1,5 +1,5 @@
 ..
-  SPDX-FileCopyrightText: 2019-2023 The PyPSA-Eur Authors
+  SPDX-FileCopyrightText: 2019-2024 The PyPSA-Eur Authors
 
   SPDX-License-Identifier: CC-BY-4.0
 

diff --git a/doc/foresight.rst b/doc/foresight.rst
@@ -1,5 +1,5 @@
 ..
-  SPDX-FileCopyrightText: 2021-2023 The PyPSA-Eur Authors
+  SPDX-FileCopyrightText: 2021-2024 The PyPSA-Eur Authors
 
   SPDX-License-Identifier: CC-BY-4.0
 

diff --git a/doc/index.rst b/doc/index.rst
@@ -1,5 +1,5 @@
 ..
-  SPDX-FileCopyrightText: 2019-2023 The PyPSA-Eur Authors
+  SPDX-FileCopyrightText: 2019-2024 The PyPSA-Eur Authors
 
   SPDX-License-Identifier: CC-BY-4.0
 

diff --git a/doc/installation.rst b/doc/installation.rst
@@ -1,5 +1,5 @@
 ..
-  SPDX-FileCopyrightText: 2019-2023 The PyPSA-Eur Authors
+  SPDX-FileCopyrightText: 2019-2024 The PyPSA-Eur Authors
 
   SPDX-License-Identifier: CC-BY-4.0
 
@@ -79,31 +79,9 @@ Nevertheless, you can still use open-source solvers for smaller problems.
     `Instructions how to install a solver in the documentation of PyPSA <https://pypsa.readthedocs.io/en/latest/installation.html#getting-a-solver-for-linear-optimisation>`_
 
 .. note::
-    The rules :mod:`cluster_network` and :mod:`simplify_network` solve a quadratic optimisation problem for clustering.
-    The open-source solvers Cbc and GlPK cannot handle this. A fallback to Ipopt is implemented in this case, but requires
-    it to be installed. For an open-source solver setup install in your ``conda`` environment on OSX/Linux
-
-    .. code:: bash
-
-        mamba activate pypsa-eur
-        mamba install -c conda-forge ipopt coincbc
-
-    and on Windows
-
-    .. code:: bash
-
-        mamba activate pypsa-eur
-        mamba install -c conda-forge ipopt glpk
-
-    For HiGHS, run
-
-    .. code:: bash
-
-        mamba activate pypsa-eur
-        mamba install -c conda-forge ipopt
-        pip install highspy
-
-    For Gurobi, run
+    The rules :mod:`cluster_network` and :mod:`simplify_network` solve a mixed-integer quadratic optimisation problem for clustering.
+    The open-source solvers HiGHS, Cbc and GlPK cannot handle this. A fallback to SCIP is implemented in this case.
+    For an open-source solver setup install in your ``conda`` environment on OSX/Linux. To install the default solver Gurobi, run
 
     .. code:: bash
 

diff --git a/doc/introduction.rst b/doc/introduction.rst
@@ -1,5 +1,5 @@
 ..
-  SPDX-FileCopyrightText: 2019-2023 The PyPSA-Eur Authors
+  SPDX-FileCopyrightText: 2019-2024 The PyPSA-Eur Authors
 
   SPDX-License-Identifier: CC-BY-4.0
 

diff --git a/doc/licenses.rst b/doc/licenses.rst
@@ -1,5 +1,5 @@
 ..
-  SPDX-FileCopyrightText: 2023 The PyPSA-Eur Authors
+  SPDX-FileCopyrightText: 2023-2024 The PyPSA-Eur Authors
 
   SPDX-License-Identifier: CC-BY-4.0
 

diff --git a/doc/limitations.rst b/doc/limitations.rst
@@ -1,5 +1,5 @@
 ..
-  SPDX-FileCopyrightText: 2019-2023 The PyPSA-Eur Authors
+  SPDX-FileCopyrightText: 2019-2024 The PyPSA-Eur Authors
 
   SPDX-License-Identifier: CC-BY-4.0
 

diff --git a/doc/make.bat b/doc/make.bat
@@ -1,4 +1,4 @@
-REM SPDX-FileCopyrightText: 2019-2023 The PyPSA-Eur Authors
+REM SPDX-FileCopyrightText: 2019-2024 The PyPSA-Eur Authors
 REM SPDX-License-Identifier: MIT
 
 @ECHO OFF

diff --git a/doc/plotting.rst b/doc/plotting.rst
@@ -1,5 +1,5 @@
 ..
-  SPDX-FileCopyrightText: 2019-2023 The PyPSA-Eur Authors
+  SPDX-FileCopyrightText: 2019-2024 The PyPSA-Eur Authors
 
   SPDX-License-Identifier: CC-BY-4.0
 

diff --git a/doc/preparation.rst b/doc/preparation.rst
@@ -1,5 +1,5 @@
 ..
-  SPDX-FileCopyrightText: 2019-2023 The PyPSA-Eur Authors
+  SPDX-FileCopyrightText: 2019-2024 The PyPSA-Eur Authors
 
   SPDX-License-Identifier: CC-BY-4.0
 

diff --git a/doc/publications.bib b/doc/publications.bib
@@ -1,5 +1,5 @@
 @Comment{
-SPDX-FileCopyrightText: 2023 The PyPSA-Eur Authors
+SPDX-FileCopyrightText: 2023-2024 The PyPSA-Eur Authors
 
 SPDX-License-Identifier: CC0-1.0
 }

diff --git a/doc/publications.rst b/doc/publications.rst
@@ -1,5 +1,5 @@
 ..
-  SPDX-FileCopyrightText: 2023 The PyPSA-Eur Authors
+  SPDX-FileCopyrightText: 2023-2024 The PyPSA-Eur Authors
 
   SPDX-License-Identifier: CC-BY-4.0