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

Docs examples #45

Merged
merged 47 commits into from
Mar 18, 2024
Merged
Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
8c00cbd
adds new install page
samgdotson May 19, 2023
85c5750
Merge branch 'main' of github.com:samgdotson/osier into docs-examples
samgdotson Jan 27, 2024
f23cc8a
adds instructions to install lp solvers
samgdotson Jan 27, 2024
39bd170
adds more sphinx extensions
samgdotson Jan 27, 2024
cb23d64
adds nbsphinx and a first notebook tutorial
samgdotson Jan 28, 2024
236f98d
adds pandoc
samgdotson Feb 15, 2024
ac21b7b
adds line in the tech tutorial
samgdotson Feb 15, 2024
dbd8d4f
removes problematic build command
samgdotson Feb 15, 2024
18d0f08
updates navigation
samgdotson Feb 19, 2024
82e12ea
adds dispatch model tutorial
samgdotson Feb 20, 2024
be92b2e
updates the dispatch model tutorial
samgdotson Feb 20, 2024
adf4fe8
adds capacity expansion notebook
samgdotson Feb 21, 2024
3cfeb3a
adds cap expansion tutorial to navigation
samgdotson Feb 21, 2024
1b98dfb
updates dispatch model tutorial
samgdotson Feb 21, 2024
44284cc
Merge branch 'docs-examples' of github.com:samgdotson/osier into docs…
samgdotson Feb 21, 2024
9d7f22a
add pandoc to setup.py
samgdotson Feb 22, 2024
5ba384e
changes initial problem to sizing natural gas and a battery
samgdotson Feb 22, 2024
98fce2d
updates dispatch tutorial
samgdotson Feb 26, 2024
e6900de
adds sphinx-autobuild to doc reqs
samgdotson Feb 27, 2024
f6546ee
finishes tech_tutorial
samgdotson Feb 28, 2024
3cb1911
adds solver param to capacityexpansion
samgdotson Feb 29, 2024
67ed5f9
updates tutorials
samgdotson Feb 29, 2024
9335de1
Merge branch 'docs-examples' of github.com:samgdotson/osier into docs…
samgdotson Feb 29, 2024
39bb696
updates capacity expansion tutorial
samgdotson Feb 29, 2024
4f91686
completes the capacity expansion notebook
samgdotson Feb 29, 2024
d4b7102
removes pyomo from setup.py and adds guidance to readme
samgdotson Feb 29, 2024
6301b9e
tries to format note
samgdotson Feb 29, 2024
ebcae1d
links issue
samgdotson Feb 29, 2024
4e6c451
installs pyomo in github workflow
samgdotson Feb 29, 2024
c235735
fixes line too long
samgdotson Feb 29, 2024
cb069e6
specifies correct pyomo version, awkward
samgdotson Feb 29, 2024
7327179
now is the line short enough?
samgdotson Feb 29, 2024
014c349
accidentally deleted pymoo instead of pyomo, awkward x2
samgdotson Feb 29, 2024
f77c83b
tells readthedocs to install pyomo
samgdotson Feb 29, 2024
2d0073b
tries another readthedocs cfg
samgdotson Feb 29, 2024
ffb1dc1
take 8 come on docs
samgdotson Feb 29, 2024
f377187
increases toc depth
samgdotson Feb 29, 2024
3759275
adds @smpark7 suggestions
samgdotson Mar 2, 2024
fe5d620
updates dispatch and tech tutorials
samgdotson Mar 2, 2024
e2d5e11
clarifies the ordering of the wind profile creation
samgdotson Mar 2, 2024
fcbafca
addresses some review comments from @yardasol and @ZoeRichter
samgdotson Mar 4, 2024
1264e2d
Merge branch 'main' of github.com:arfc/osier into docs-examples
samgdotson Mar 4, 2024
246f30b
fixes note rendering
samgdotson Mar 5, 2024
e2976f6
removes extra note statement, it will render on readthedocs but not r…
samgdotson Mar 5, 2024
ff2361e
Merge branch 'main' of github.com:samgdotson/osier into docs-examples
samgdotson Mar 5, 2024
00ccb4c
Merge branch 'main' of github.com:samgdotson/osier into docs-examples
samgdotson Mar 6, 2024
0841bff
adds .gitattributes
samgdotson Mar 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install flake8 pytest
pip install flake8 pytest pyomo==6.4.1
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Install CBC
run: |
Expand Down
5 changes: 4 additions & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ build:
os: "ubuntu-20.04"
tools:
python: "3.9"
jobs:
post_install:
- pip install pyomo==6.4.1

sphinx:
configuration: docs/source/conf.py
Expand All @@ -13,4 +16,4 @@ python:
- method: pip
path: .
extra_requirements:
- doc
- doc
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,17 @@ cd osier
pip install .
# to also install the documentation dependencies
pip install .[doc]

# followed by
pip install pyomo==6.4.1
```

> [!NOTE]
> Although `pyomo` is a dependency, the current version of `pyomo` (6.7.1, as of 2/29/24) has a bug
that prints erroneous errors during an `osier` simulation. Therefore, users are recommended to
install a specific version of `pyomo` after the main installation of `osier`. There is an open issue [#50](https://github.com/arfc/osier/issues/50)
related to this concern.
samgdotson marked this conversation as resolved.
Show resolved Hide resolved
samgdotson marked this conversation as resolved.
Show resolved Hide resolved

## Documentation
The documentation for `osier` can be viewed [here](https://osier.readthedocs.io/en/latest/).
You can also build the docs locally with:
Expand Down
3 changes: 3 additions & 0 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
extensions = [
"myst_parser",
"sphinx.ext.napoleon",
"sphinx.ext.duration",
"sphinx.ext.autosectionlabel",
"sphinx.ext.autodoc",
"sphinx.ext.autosummary",
"sphinx.ext.intersphinx",
Expand All @@ -41,6 +43,7 @@
"sphinx_design",
"sphinx.ext.mathjax",
"sphinx.ext.coverage",
"nbsphinx",
]

# Add any paths that contain templates here, relative to this directory.
Expand Down
915 changes: 915 additions & 0 deletions docs/source/examples/capacity_expansion_tutorial.ipynb

Large diffs are not rendered by default.

522 changes: 522 additions & 0 deletions docs/source/examples/dispatch_tutorial.ipynb

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions docs/source/examples/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# `Osier` Examples


This section has examples that guide users from basic usage to more advanced topics.


## Guides
```{toctree}
:maxdepth: 3

tech_tutorial
dispatch_tutorial
capacity_expansion_tutorial
samgdotson marked this conversation as resolved.
Show resolved Hide resolved
```
Loading
Loading