Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating Development Branch #232

Merged
merged 129 commits into from
Sep 21, 2024
Merged

Updating Development Branch #232

merged 129 commits into from
Sep 21, 2024

Conversation

trevorb1
Copy link
Member

Description

Just updating the development branch to sync it up with master

trevorb1 and others added 30 commits April 24, 2023 21:42
Docs build fix for v1.0.3
In previous versions of otoole, the internal read and write strategies
were exposed to the user. This was not ideal as it meant that the user
had to know the internal structure of the model. This commit adds a
public API to convert and convert_results methods. These methods
are used to convert between different file formats.

This commit also:

- adds tests for the convert and convert_results methods
- adds a new module to the otoole package called convert.py
- adds a test fixture for the super_simple model
- fixes typing errors
Pin pydantic to less than v2
trevorb1 and others added 29 commits December 7, 2023 20:55
Remove description from Zenodo config file so release notes are automatically copied over
Modified citation file with template for JOSS article
Calculate CapitalInvestment using discount rate with/without technology index
Added instructions to install graphviz, if needed.
@trevorb1 trevorb1 merged commit ac5c475 into develop Sep 21, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants