Skip to content

Commit aad664f

Browse files
author
brynpickering
committed
Release v0.6.10
1 parent 7828782 commit aad664f

15 files changed

+4847
-4643
lines changed

calliope/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.6.10-dev"
1+
__version__ = "0.6.10"

calliope/postprocess/plotting/flows.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ def _production_data(model, timesteps, timestep):
208208
techs_production = locs_techs_carriers_production.sel(
209209
carriers=carrier, locs=location
210210
).to_pandas()
211-
for tech, prod in techs_production.loc[:, timestep].iteritems():
211+
for tech, prod in techs_production.loc[:, timestep].items():
212212
if prod and prod > 0:
213213
# if some energy is at stake
214214

changelog.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
Release History
44
===============
55

6-
0.6.10 (dev)
7-
------------
6+
0.6.10 (2023-01-18)
7+
-------------------
88

99
|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.
1010

doc/_static/notebooks/calliope_model_object.ipynb

Lines changed: 1559 additions & 1485 deletions
Large diffs are not rendered by default.

doc/_static/notebooks/milp.ipynb

Lines changed: 768 additions & 728 deletions
Large diffs are not rendered by default.

doc/_static/notebooks/national_scale.ipynb

Lines changed: 1029 additions & 988 deletions
Large diffs are not rendered by default.

doc/_static/notebooks/urban_scale.ipynb

Lines changed: 1439 additions & 1392 deletions
Large diffs are not rendered by default.

doc/_static/plot_summary.html

Lines changed: 13 additions & 13 deletions
Large diffs are not rendered by default.

doc/user/develop.rst

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Then install all development requirements for Calliope into a new environment, c
3636
$ conda env update -f requirements.yml -n calliope_dev # to install the calliope non-python dependencies and testing/coverage python packages
3737
$ conda env update -f requirements.txt -n calliope_dev # to install the pinned calliope python dependencies
3838
$ conda activate calliope_dev
39-
$ pip install -e calliope
39+
$ pip install -e . # installs from your local clone of the calliope repository
4040
4141
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.
4242

@@ -257,13 +257,15 @@ Create release
257257
* Commit with message "Release vXXXX", then add a "vXXXX" tag, push both to GitHub
258258
* Create a release through the GitHub web interface, using the same tag, titling it "Release vXXXX" (required for Zenodo to pull it in)
259259
* Upload new release to PyPI: ``make all-dist``
260-
* Update the conda-forge package:
261-
* Fork `conda-forge/calliope-feedstock <https://github.com/conda-forge/calliope-feedstock>`_, and update ``recipe/meta.yaml`` with:
262-
* Version number: ``{% set version = "XXXX" %}``
263-
* SHA256 of latest version from PyPI: ``{% set sha256 = "XXXX" %}``
264-
* Reset ``build: number: 0`` if it is not already at zero
265-
* If necessary, carry over any changed requirements from ``setup.py`` or ``requirements/base.yml``
266-
* 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
260+
* Update the conda-forge package using the `Calliope feedstock <https://github.com/conda-forge/calliope-feedstock>`_:
261+
* Wait for the the `regro-cf-autotick-bot` to open a pull request automatically (can take several hours)
262+
* Check that ``recipe/meta.yaml`` in the pull request is up-to-date with:
263+
* Version number: ``{% set version = "XXXX" %}`` (should be automatically updated)
264+
* SHA256 of latest version from PyPI: ``{% set sha256 = "XXXX" %}`` (should be automatically updated)
265+
* Reset ``build: number: 0`` if it is not already at zero (should be automatically updated)
266+
* Range of python versions supported
267+
* Requirement version pinning, to match any changes in ``requirements.txt`` and ``requirements.yml``
268+
^ 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.
267269

268270
Post-release
269271
------------

doc/user/images/clustered_plot_timeseries.html

Lines changed: 5 additions & 5 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)