Merge branch 'main' of github.com:arfc/osier into joss

CHANGELOG.md

@@ -6,6 +6,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [0.3.0] - 2024-04-04
+### Added
+- Adds tests and examples
+- Adds more objectives and methods in the `equations` module.
+- Adds more helper functions in `utils`.
+
+## Fixed
+- Updates the `README` to instruct users on current installation procedures.
+
 ## [0.2.1] - 2022-11-01
 ### Fixed
 - Fixes a bug where storage constraints were not initialized in the `DispatchModel`.

README.md

@@ -11,7 +11,7 @@ Open source multi-objective energy system framework
 
 `osier` is available through [PyPI](https://pypi.org/project/osier/). It may be installed with 
 ```bash
-pip install osier
+python -m pip install osier pyomo==6.4.1
 ``` 
 or by cloning this repository and building from source:
 
@@ -60,4 +60,4 @@ Contributions to `osier` are welcome. For details on how to make bug reports, pu
 
 
 ## Credits
-Some of the documentation infrastructure was inspired by and borrowed from the [`watts` documentation](https://watts.readthedocs.io/en/latest/index.html).
+Some of the documentation infrastructure was inspired by and borrowed from the [`watts` documentation](https://watts.readthedocs.io/en/latest/index.html).

setup.py

@@ -6,8 +6,8 @@
 
 # Format expected by setup.py and doc/source/conf.py: string of form "X.Y.Z"
 _version_major = 0
-_version_minor = 2
-_version_micro = 1  # use '' for first of series, number for 1 and above
+_version_minor = 3
+_version_micro = 0  # use '' for first of series, number for 1 and above
 # _version_extra = 'dev'
 _version_extra = ''  # Uncomment this for full releases