Release v0.6.10

calliope-project · Jan 18, 2023 · aad664f · aad664f
1 parent 7828782
commit aad664f
Show file tree

Hide file tree

Showing 15 changed files with 4,847 additions and 4,643 deletions.
diff --git a/calliope/_version.py b/calliope/_version.py
@@ -1 +1 @@
-__version__ = "0.6.10-dev"
+__version__ = "0.6.10"
diff --git a/calliope/postprocess/plotting/flows.py b/calliope/postprocess/plotting/flows.py
@@ -208,7 +208,7 @@ def _production_data(model, timesteps, timestep):
             techs_production = locs_techs_carriers_production.sel(
                 carriers=carrier, locs=location
             ).to_pandas()
-            for tech, prod in techs_production.loc[:, timestep].iteritems():
+            for tech, prod in techs_production.loc[:, timestep].items():
                 if prod and prod > 0:
                     # if some energy is at stake
 

diff --git a/changelog.rst b/changelog.rst
@@ -3,8 +3,8 @@
 Release History
 ===============
 
-0.6.10 (dev)
-------------
+0.6.10 (2023-01-18)
+-------------------
 
 |changed| |backwards-incompatible| Updated to Numpy v1.23, Pandas v1.5, Pyomo v6.4, Ruamel.yaml v0.17, Scikit-learn v1.2, Xarray v2022.3, GLPK v5. This enables Calliope to be installed on Apple Silicon devices, but changes the result of algorithmic timeseries clustering. `In scikit-learn version 0.24.0, the method of random sampling for K-Means clustering was changed <https://scikit-learn.org/stable/whats_new/v0.24.html#changed-models>`_. This change will lead to different optimisation results if using `K-Means clustering <https://calliope.readthedocs.io/en/v0.6.10/user/advanced_features.html#time-resolution-adjustment>`_ in your model.
 

diff --git a/doc/_static/notebooks/calliope_model_object.ipynb b/doc/_static/notebooks/calliope_model_object.ipynb
diff --git a/doc/_static/notebooks/milp.ipynb b/doc/_static/notebooks/milp.ipynb
diff --git a/doc/_static/notebooks/national_scale.ipynb b/doc/_static/notebooks/national_scale.ipynb
diff --git a/doc/_static/notebooks/urban_scale.ipynb b/doc/_static/notebooks/urban_scale.ipynb
diff --git a/doc/_static/plot_summary.html b/doc/_static/plot_summary.html
diff --git a/doc/user/develop.rst b/doc/user/develop.rst
@@ -36,7 +36,7 @@ Then install all development requirements for Calliope into a new environment, c
    $ conda env update -f requirements.yml -n calliope_dev # to install the calliope non-python dependencies and testing/coverage python packages
    $ conda env update -f requirements.txt -n calliope_dev # to install the pinned calliope python dependencies
    $ conda activate calliope_dev
-   $ pip install -e calliope
+   $ pip install -e . # installs from your local clone of the calliope repository
 
 Only calliope itself should be installed from pip, the rest will have been installed from conda and will be marked as `Requirement already satisfied` on running the above command.
 
@@ -257,13 +257,15 @@ Create release
 * Commit with message "Release vXXXX", then add a "vXXXX" tag, push both to GitHub
 * Create a release through the GitHub web interface, using the same tag, titling it "Release vXXXX" (required for Zenodo to pull it in)
 * Upload new release to PyPI: ``make all-dist``
-* Update the conda-forge package:
-    * Fork `conda-forge/calliope-feedstock <https://github.com/conda-forge/calliope-feedstock>`_, and update ``recipe/meta.yaml`` with:
-        * Version number: ``{% set version = "XXXX" %}``
-        * SHA256 of latest version from PyPI: ``{% set sha256 = "XXXX" %}``
-        * Reset ``build: number: 0`` if it is not already at zero
-        * If necessary, carry over any changed requirements from ``setup.py`` or ``requirements/base.yml``
-    * Submit a pull request from an appropriately named branch in your fork (e.g. ``vXXXX``) to the `conda-forge/calliope-feedstock <https://github.com/conda-forge/calliope-feedstock>`_ repository
+* Update the conda-forge package using the `Calliope feedstock <https://github.com/conda-forge/calliope-feedstock>`_:
+    * Wait for the the `regro-cf-autotick-bot` to open a pull request automatically (can take several hours)
+    * Check that ``recipe/meta.yaml`` in the pull request is up-to-date with:
+        * Version number: ``{% set version = "XXXX" %}`` (should be automatically updated)
+        * SHA256 of latest version from PyPI: ``{% set sha256 = "XXXX" %}`` (should be automatically updated)
+        * Reset ``build: number: 0`` if it is not already at zero (should be automatically updated)
+        * Range of python versions supported
+        * Requirement version pinning, to match any changes in ``requirements.txt`` and ``requirements.yml``
+    ^ Any necessary updates can be made direclty on the PR by pushing directly to the bot's branch or by using the GIthub interactive editing interface.
 
 Post-release
 ------------

diff --git a/doc/user/images/clustered_plot_timeseries.html b/doc/user/images/clustered_plot_timeseries.html
diff --git a/doc/user/images/plot_capacity.html b/doc/user/images/plot_capacity.html
diff --git a/doc/user/images/plot_flows.html b/doc/user/images/plot_flows.html
diff --git a/doc/user/images/plot_timeseries.html b/doc/user/images/plot_timeseries.html
diff --git a/doc/user/images/plot_transmission.html b/doc/user/images/plot_transmission.html
@@ -1,16 +1,16 @@
 <div>
 
 
-            <div id="c207bd56-319d-4e76-bc64-8da5b6154cbc" class="plotly-graph-div" style="height:100%; width:100%;"></div>
+            <div id="d5b16e25-cc10-4656-9b5c-a9748c6e085b" class="plotly-graph-div" style="height:100%; width:100%;"></div>
             <script type="text/javascript">
 
                     window.PLOTLYENV=window.PLOTLYENV || {};
                     window.PLOTLYENV.BASE_URL='https://plot.ly';
 
-                if (document.getElementById("c207bd56-319d-4e76-bc64-8da5b6154cbc")) {
+                if (document.getElementById("d5b16e25-cc10-4656-9b5c-a9748c6e085b")) {
                     Plotly.newPlot(
-                        'c207bd56-319d-4e76-bc64-8da5b6154cbc',
-                        [{"hoverinfo": "none", "lat": [51.4450766, 51.4596158, null], "legendgroup": "heat_pipes", "line": {"color": "#823739"}, "lon": [-0.1247183, -0.1613446, null], "mode": "lines", "name": "District heat distribution", "opacity": 0.8, "showlegend": true, "type": "scattergeo", "uid": "853d5533-e7df-4fae-9d52-c6c9896ddca6"}, {"hoverinfo": "none", "lat": [51.4450766, 51.4652373, null], "legendgroup": "heat_pipes", "line": {"color": "#823739"}, "lon": [-0.1247183, -0.1141548, null], "mode": "lines", "name": "District heat distribution", "opacity": 0.8, "showlegend": false, "type": "scattergeo", "uid": "c7148fb6-b8a7-4ac7-8f3d-0dfc94607c9a"}, {"hoverinfo": "none", "lat": [51.4450766, 51.4287016, null], "legendgroup": "heat_pipes", "line": {"color": "#823739"}, "lon": [-0.1247183, -0.1310635, null], "mode": "lines", "name": "District heat distribution", "opacity": 0.8, "showlegend": false, "type": "scattergeo", "uid": "b5885f80-3731-4af1-b11d-ceb1cfe29056"}, {"hoverinfo": "text", "lat": [51.4523462, 51.45515695, 51.4368891], "legendgroup": "heat_pipes", "lon": [-0.14303145, -0.11943655, -0.1278909], "marker": {"color": "#823739"}, "mode": "markers", "opacity": 0, "showlegend": false, "text": ["heat_pipes capacity: 598", "heat_pipes capacity: 190", "heat_pipes capacity: 10"], "type": "scattergeo", "uid": "92c22e96-a141-4437-9dd6-d293a4d5b787"}, {"hoverinfo": "none", "lat": [51.4596158, 51.4652373, null], "legendgroup": "power_lines", "line": {"color": "#6783E3"}, "lon": [-0.1613446, -0.1141548, null], "mode": "lines", "name": "Electrical power distribution", "opacity": 0.8, "showlegend": true, "type": "scattergeo", "uid": "67fa0ff1-cef7-4deb-b528-3549ba4b5a5d"}, {"hoverinfo": "none", "lat": [51.4596158, 51.4287016, null], "legendgroup": "power_lines", "line": {"color": "#6783E3"}, "lon": [-0.1613446, -0.1310635, null], "mode": "lines", "name": "Electrical power distribution", "opacity": 0.8, "showlegend": false, "type": "scattergeo", "uid": "0fcde22f-5225-4043-8912-f36c19d127cc"}, {"hoverinfo": "text", "lat": [51.46242655, 51.4441587], "legendgroup": "power_lines", "lon": [-0.1377497, -0.14620405], "marker": {"color": "#6783E3"}, "mode": "markers", "opacity": 0, "showlegend": false, "text": ["power_lines capacity: 274", "power_lines capacity: 45"], "type": "scattergeo", "uid": "c6bef505-6d90-4e60-b6a4-17bd6546821c"}, {"hoverinfo": "text", "lat": [51.4450766, 51.4596158, 51.4652373, 51.4287016], "legendgroup": "locations", "lon": [-0.1247183, -0.1613446, -0.1141548, -0.1310635], "marker": {"color": "grey", "size": 8, "symbol": "square"}, "mode": "markers", "name": "Locations", "text": ["N1", "X1", "X2", "X3"], "type": "scattergeo", "uid": "2ba3bc37-0c0e-4a05-a5f6-6cd7f27f1db0"}],
+                        'd5b16e25-cc10-4656-9b5c-a9748c6e085b',
+                        [{"hoverinfo": "none", "lat": [51.4450766, 51.4596158, null], "legendgroup": "heat_pipes", "line": {"color": "#823739"}, "lon": [-0.1247183, -0.1613446, null], "mode": "lines", "name": "District heat distribution", "opacity": 0.8, "showlegend": true, "type": "scattergeo", "uid": "b8fb5e79-c1a6-4c5d-a880-34dea39b3a1c"}, {"hoverinfo": "none", "lat": [51.4450766, 51.4652373, null], "legendgroup": "heat_pipes", "line": {"color": "#823739"}, "lon": [-0.1247183, -0.1141548, null], "mode": "lines", "name": "District heat distribution", "opacity": 0.8, "showlegend": false, "type": "scattergeo", "uid": "2de5c054-66d3-47ee-b95a-196b701dccd5"}, {"hoverinfo": "none", "lat": [51.4450766, 51.4287016, null], "legendgroup": "heat_pipes", "line": {"color": "#823739"}, "lon": [-0.1247183, -0.1310635, null], "mode": "lines", "name": "District heat distribution", "opacity": 0.8, "showlegend": false, "type": "scattergeo", "uid": "f1253898-0cfc-4eda-a598-2c9cc36e5de0"}, {"hoverinfo": "text", "lat": [51.4523462, 51.45515695, 51.4368891], "legendgroup": "heat_pipes", "lon": [-0.14303145, -0.11943655, -0.1278909], "marker": {"color": "#823739"}, "mode": "markers", "opacity": 0, "showlegend": false, "text": ["heat_pipes capacity: 598", "heat_pipes capacity: 190", "heat_pipes capacity: 10"], "type": "scattergeo", "uid": "c9a11907-1e8d-433c-9c2e-12034b58b6ea"}, {"hoverinfo": "none", "lat": [51.4596158, 51.4652373, null], "legendgroup": "power_lines", "line": {"color": "#6783E3"}, "lon": [-0.1613446, -0.1141548, null], "mode": "lines", "name": "Electrical power distribution", "opacity": 0.8, "showlegend": true, "type": "scattergeo", "uid": "3eac91db-0839-4e62-a7b5-b5ed318147a2"}, {"hoverinfo": "none", "lat": [51.4596158, 51.4287016, null], "legendgroup": "power_lines", "line": {"color": "#6783E3"}, "lon": [-0.1613446, -0.1310635, null], "mode": "lines", "name": "Electrical power distribution", "opacity": 0.8, "showlegend": false, "type": "scattergeo", "uid": "ca91c4fa-a2d7-438b-a82d-979218cb5e74"}, {"hoverinfo": "text", "lat": [51.46242655, 51.4441587], "legendgroup": "power_lines", "lon": [-0.1377497, -0.14620405], "marker": {"color": "#6783E3"}, "mode": "markers", "opacity": 0, "showlegend": false, "text": ["power_lines capacity: 274", "power_lines capacity: 45"], "type": "scattergeo", "uid": "ab40eea2-5614-4947-9086-4ff499d6dd7c"}, {"hoverinfo": "text", "lat": [51.4450766, 51.4596158, 51.4652373, 51.4287016], "legendgroup": "locations", "lon": [-0.1247183, -0.1613446, -0.1141548, -0.1310635], "marker": {"color": "grey", "size": 8, "symbol": "square"}, "mode": "markers", "name": "Locations", "text": ["N1", "X1", "X2", "X3"], "type": "scattergeo", "uid": "e93e6d05-09b2-49ee-b132-85a59646594c"}],
                         {"autosize": true, "geo": {"countrycolor": "green", "countrywidth": 0.5, "landcolor": "rgba(240, 240, 240, 0.8)", "lataxis": {"range": [51.42504803, 51.468890869999996]}, "lonaxis": {"range": [-0.16606358000000002, -0.10943582]}, "oceancolor": "#aec6cf", "projection": {"scale": 1, "type": "mercator"}, "resolution": 50, "scope": "world", "showcountries": true, "showlakes": true, "showland": true, "showocean": true, "showrivers": true, "showsubunits": true, "subunitcolor": "blue", "subunitwidth": 0.5}, "hovermode": "closest", "showlegend": true},
                         {"displaylogo": false, "modeBarButtonsToRemove": ["sendDataToCloud"], "showLink": false, "linkText": "Export to plot.ly", "responsive": true, "plotlyServerURL": "https://plot.ly"}
                     )

diff --git a/doc/user/images/plot_transmission_token.html b/doc/user/images/plot_transmission_token.html
@@ -1,16 +1,16 @@
 <div>
 
 
-            <div id="1e1314b8-4c3a-475a-abd2-4ca3755f14a8" class="plotly-graph-div" style="height:100%; width:100%;"></div>
+            <div id="6f3ec963-61de-4847-9f9e-22c2fa75e264" class="plotly-graph-div" style="height:100%; width:100%;"></div>
             <script type="text/javascript">
 
                     window.PLOTLYENV=window.PLOTLYENV || {};
                     window.PLOTLYENV.BASE_URL='https://plot.ly';
 
-                if (document.getElementById("1e1314b8-4c3a-475a-abd2-4ca3755f14a8")) {
+                if (document.getElementById("6f3ec963-61de-4847-9f9e-22c2fa75e264")) {
                     Plotly.newPlot(
-                        '1e1314b8-4c3a-475a-abd2-4ca3755f14a8',
-                        [{"hoverinfo": "none", "lat": [51.4450766, 51.4596158, null], "legendgroup": "heat_pipes", "line": {"color": "#823739"}, "lon": [-0.1247183, -0.1613446, null], "mode": "lines", "name": "District heat distribution", "opacity": 0.8, "showlegend": true, "type": "scattermapbox", "uid": "4164dcd4-d1e0-4335-a3e4-8e0cee8467f0"}, {"hoverinfo": "none", "lat": [51.4450766, 51.4652373, null], "legendgroup": "heat_pipes", "line": {"color": "#823739"}, "lon": [-0.1247183, -0.1141548, null], "mode": "lines", "name": "District heat distribution", "opacity": 0.8, "showlegend": false, "type": "scattermapbox", "uid": "dce1218e-b77c-42ac-95e5-37fc30ec8075"}, {"hoverinfo": "none", "lat": [51.4450766, 51.4287016, null], "legendgroup": "heat_pipes", "line": {"color": "#823739"}, "lon": [-0.1247183, -0.1310635, null], "mode": "lines", "name": "District heat distribution", "opacity": 0.8, "showlegend": false, "type": "scattermapbox", "uid": "0bc17456-254d-4613-80cb-41a8dd17a256"}, {"hoverinfo": "text", "lat": [51.4523462, 51.45515695, 51.4368891], "legendgroup": "heat_pipes", "lon": [-0.14303145, -0.11943655, -0.1278909], "marker": {"color": "#823739"}, "mode": "markers", "opacity": 0, "showlegend": false, "text": ["heat_pipes capacity: 598", "heat_pipes capacity: 190", "heat_pipes capacity: 10"], "type": "scattermapbox", "uid": "43ff0ceb-7abb-45ec-b3bb-8ca24c2aebf5"}, {"hoverinfo": "none", "lat": [51.4596158, 51.4652373, null], "legendgroup": "power_lines", "line": {"color": "#6783E3"}, "lon": [-0.1613446, -0.1141548, null], "mode": "lines", "name": "Electrical power distribution", "opacity": 0.8, "showlegend": true, "type": "scattermapbox", "uid": "19fb1a43-46ae-4cd7-98dd-42b52b44839d"}, {"hoverinfo": "none", "lat": [51.4596158, 51.4287016, null], "legendgroup": "power_lines", "line": {"color": "#6783E3"}, "lon": [-0.1613446, -0.1310635, null], "mode": "lines", "name": "Electrical power distribution", "opacity": 0.8, "showlegend": false, "type": "scattermapbox", "uid": "b38bc860-d750-4c08-8823-69cb2bcdc3e3"}, {"hoverinfo": "text", "lat": [51.46242655, 51.4441587], "legendgroup": "power_lines", "lon": [-0.1377497, -0.14620405], "marker": {"color": "#6783E3"}, "mode": "markers", "opacity": 0, "showlegend": false, "text": ["power_lines capacity: 274", "power_lines capacity: 45"], "type": "scattermapbox", "uid": "729e61aa-d82e-426e-a997-66ad83e5a388"}, {"hoverinfo": "text", "lat": [51.4450766, 51.4596158, 51.4652373, 51.4287016], "legendgroup": "locations", "lon": [-0.1247183, -0.1613446, -0.1141548, -0.1310635], "marker": {"color": "grey", "size": 8, "symbol": "square"}, "mode": "markers", "name": "Locations", "text": ["N1", "X1", "X2", "X3"], "type": "scattermapbox", "uid": "e9faa2cf-c6f2-4bb8-81f0-75a17b253211"}],
+                        '6f3ec963-61de-4847-9f9e-22c2fa75e264',
+                        [{"hoverinfo": "none", "lat": [51.4450766, 51.4596158, null], "legendgroup": "heat_pipes", "line": {"color": "#823739"}, "lon": [-0.1247183, -0.1613446, null], "mode": "lines", "name": "District heat distribution", "opacity": 0.8, "showlegend": true, "type": "scattermapbox", "uid": "db799ee7-3dd9-4519-aa96-86f1ed1eba27"}, {"hoverinfo": "none", "lat": [51.4450766, 51.4652373, null], "legendgroup": "heat_pipes", "line": {"color": "#823739"}, "lon": [-0.1247183, -0.1141548, null], "mode": "lines", "name": "District heat distribution", "opacity": 0.8, "showlegend": false, "type": "scattermapbox", "uid": "78b92889-f1df-4361-aedc-6909478f63e3"}, {"hoverinfo": "none", "lat": [51.4450766, 51.4287016, null], "legendgroup": "heat_pipes", "line": {"color": "#823739"}, "lon": [-0.1247183, -0.1310635, null], "mode": "lines", "name": "District heat distribution", "opacity": 0.8, "showlegend": false, "type": "scattermapbox", "uid": "ddce3f3f-a6bb-45ce-bcbd-05aa68319c75"}, {"hoverinfo": "text", "lat": [51.4523462, 51.45515695, 51.4368891], "legendgroup": "heat_pipes", "lon": [-0.14303145, -0.11943655, -0.1278909], "marker": {"color": "#823739"}, "mode": "markers", "opacity": 0, "showlegend": false, "text": ["heat_pipes capacity: 598", "heat_pipes capacity: 190", "heat_pipes capacity: 10"], "type": "scattermapbox", "uid": "05101b9a-f77b-4a24-8aaa-239928cba99f"}, {"hoverinfo": "none", "lat": [51.4596158, 51.4652373, null], "legendgroup": "power_lines", "line": {"color": "#6783E3"}, "lon": [-0.1613446, -0.1141548, null], "mode": "lines", "name": "Electrical power distribution", "opacity": 0.8, "showlegend": true, "type": "scattermapbox", "uid": "9a1ebe02-e9a4-4c8c-95f7-3de0ef8ac870"}, {"hoverinfo": "none", "lat": [51.4596158, 51.4287016, null], "legendgroup": "power_lines", "line": {"color": "#6783E3"}, "lon": [-0.1613446, -0.1310635, null], "mode": "lines", "name": "Electrical power distribution", "opacity": 0.8, "showlegend": false, "type": "scattermapbox", "uid": "a095f5fa-6fd8-4064-991c-c2b7fb7d2863"}, {"hoverinfo": "text", "lat": [51.46242655, 51.4441587], "legendgroup": "power_lines", "lon": [-0.1377497, -0.14620405], "marker": {"color": "#6783E3"}, "mode": "markers", "opacity": 0, "showlegend": false, "text": ["power_lines capacity: 274", "power_lines capacity: 45"], "type": "scattermapbox", "uid": "1c3b308c-df6f-404e-a239-413143241cf5"}, {"hoverinfo": "text", "lat": [51.4450766, 51.4596158, 51.4652373, 51.4287016], "legendgroup": "locations", "lon": [-0.1247183, -0.1613446, -0.1141548, -0.1310635], "marker": {"color": "grey", "size": 8, "symbol": "square"}, "mode": "markers", "name": "Locations", "text": ["N1", "X1", "X2", "X3"], "type": "scattermapbox", "uid": "353c1493-a9cc-405e-9e01-a04214d5dcb6"}],
                         {"autosize": true, "hovermode": "closest", "mapbox": {"accesstoken": "pk.eyJ1IjoiY2FsbGlvcGUtcHJvamVjdCIsImEiOiJjamVwd280ODkwYzh6Mnhxbm1qYnU4bWI4In0.mv2O1aDqQEkOUwAIcVoUMA", "center": {"lat": 51.44696945, "lon": -0.1377497}, "style": "light", "zoom": 11}, "showlegend": true},
                         {"displaylogo": false, "modeBarButtonsToRemove": ["sendDataToCloud"], "showLink": false, "linkText": "Export to plot.ly", "responsive": true, "plotlyServerURL": "https://plot.ly"}
                     )