Skip to content

Development updates to Sphinx and notebooks#173

Merged
emiliom merged 17 commits intoODM2:developmentfrom
emiliom:development
May 11, 2019
Merged

Development updates to Sphinx and notebooks#173
emiliom merged 17 commits intoODM2:developmentfrom
emiliom:development

Conversation

@emiliom
Copy link
Member

@emiliom emiliom commented May 11, 2019

docs brought in from master branch plus recent updates (polish, updated / re-ran notebooks, etc)

emiliom and others added 17 commits September 23, 2018 23:43
…easurement results, plus a conda environment file for this notebook.
Updated Examples content

I'll self merge my PR. It only impacts the Examples folder, not any of the odm2api code proper. 

Unlike changes to odm2api code proper, I'm merging into master (rather than the development branch) so the changes are immediately accessible to everyone.
…ar River, plus its associated ODM2 SQLite database. Made small, mostly cosmetic changes to the measurements-results notebook
Update Examples: new time series notebook, plus more cleanups
Updates to sphinx docs

Self merging, as this PR only impacts the documentation, not the code base.
Re-ran against the latest development branch
@emiliom emiliom merged commit c6782b5 into ODM2:development May 11, 2019
@emiliom emiliom deleted the development branch May 11, 2019 05:07
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.

2 participants

Comments