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

switch docs theme to alabaster, rework index and data model pages #277

Merged
merged 18 commits into from
Oct 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*csv
*xlsx
*png
*jpg
*pdf

# Apple file system
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Have a question? Get in touch!
.. _Slack: https://slack.com


Interested in Contributing? Welcome to the team!
------------------------------------------------
Interested in contributing? Join to the team!
---------------------------------------------

The pyam package has been developed with the explicit aim to facilitate
open and collaborative analysis of integrated assessment and climate models.
Expand Down
1 change: 1 addition & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

# Next Release

- [#277](https://github.com/IAMconsortium/pyam/pull/277) Restructure and extend the docs pages, switch to RTD-supported theme
- [#275](https://github.com/IAMconsortium/pyam/pull/275) Completely removes all features related to region plotting, notably `region_plot()` and `read_shapefile()`
- [#270](https://github.com/IAMconsortium/pyam/pull/270) Include variables with zeros in `stack_plot` (see [#266](https://github.com/IAMconsortium/pyam/issues/266))
- [#269](https://github.com/IAMconsortium/pyam/pull/269) Ensure append doesn't accidentally swap indexes
Expand Down
2 changes: 1 addition & 1 deletion doc/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ dependencies:
- pillow==5.4.1
- sphinxcontrib-bibtex
- sphinxcontrib-programoutput
- sphinxcontrib-fulltoc
- nbsphinx

12 changes: 12 additions & 0 deletions doc/source/_bib/data.bib
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
@misc{Huppmann:2019:scenario-data,
author = {Huppmann, Daniel and Kriegler, Elmar and Krey, Volker and
Riahi, Keywan and Rogelj, Joeri and Calvin, Katherine and
Humpenoeder, Florian and Popp, Alexander and Rose, Steven K. and
Weyant, John and et al.},
doi = {10.5281/zenodo.3363345},
howpublished = {Integrated Assessment Modeling Consortium & International Institute for Applied Systems Analysis},
publisher = {Integrated Assessment Modeling Consortium & International Institute for Applied Systems Analysis},
title = {{IAMC 1.5 °C Scenario Explorer and Data hosted by IIASA (release 2.0)}},
url = {https://data.ene.iiasa.ac.at/iamc-1.5c-explorer},
year = {2019}
}
11 changes: 11 additions & 0 deletions doc/source/_bib/index.bib
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
@article{Gidden:2019:pyam,
author = {Gidden, Matthew and Huppmann, Daniel},
title = {{pyam: a Python package for the analysis and visualization of models
of the interaction of climate, human, and environmental Systems}},
journal = {Journal of Open Source Software (JOSS)},
volume = {4},
number = {33},
pages = {1095},
year = {2019},
doi = {10.21105/joss.01095},
}
1 change: 0 additions & 1 deletion doc/source/refs.bib → doc/source/_bib/install.bib
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

@Misc{numpy,
author = {Travis Oliphant},
title = {{NumPy}: A guide to {NumPy}},
Expand Down
Binary file added doc/source/_static/iamc_logo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added doc/source/_static/iamc_template.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
45 changes: 0 additions & 45 deletions doc/source/_themes/LICENSE

This file was deleted.

25 changes: 0 additions & 25 deletions doc/source/_themes/README.rst

This file was deleted.

86 changes: 0 additions & 86 deletions doc/source/_themes/flask_theme_support.py

This file was deleted.

16 changes: 0 additions & 16 deletions doc/source/_themes/kr/layout.html

This file was deleted.

19 changes: 0 additions & 19 deletions doc/source/_themes/kr/relations.html

This file was deleted.

Loading