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

Docclean #161

Merged
merged 7 commits into from
Dec 19, 2018
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
*pdf

# Apple file system
*.DS_STORE
Expand Down
21 changes: 13 additions & 8 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
Contributor Guidelines
======================

Have a question? Get in touch!
------------------------------

- Report bugs, suggest features or view the source code `on GitHub`_.
- For less well defined questions or ideas, use the `mailing list`_.

.. _mailing list: https://groups.google.com/forum/#!forum/pyam
.. _on GitHub: http://github.com/IAMconsortium/pyam


Interested in Contributing? Welcome 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.
We appreciate contributions to the code base and development of new features.

The community mailing list for questions and discussions on new features is
hosted by Googlegroups. Please join at `groups.google.com/d/forum/pyam`_
and use <[email protected]> to send an email to the *pyam* community.

Please use the GitHub *Issues* feature to raise questions concerning potential
bugs or to propose new features, but search and read resolved/closed topics on
similar subjects before raising a new issue.
Expand All @@ -23,6 +30,4 @@ believe that when posting ideas or submitting code to an open-source project,
it should be obvious and self-evident that any such contributions
are made in the spirit of open collaborative development.

.. _`groups.google.com/d/forum/pyam` : https://groups.google.com/d/forum/pyam

.. _`pep8`: https://www.python.org/dev/peps/pep-0008/
1 change: 1 addition & 0 deletions doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
'sphinxcontrib.programoutput',
'sphinx.ext.mathbase',
'sphinx_gallery.gen_gallery',
'sphinxcontrib.bibtex',
]

sphinx_gallery_conf = {
Expand Down
17 changes: 2 additions & 15 deletions doc/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ Release v\ |version|.
The **pyam** Python package provides a range of diagnostic tools and functions
for analyzing and visualizing data from your favorite assessment model(s).

The *community mailing* list for questions and discussions on new features is
hosted by Googlegroups. Please join at `groups.google.com/d/forum/pyam`_
and use <[email protected]> to send an email to the *pyam* community.

The source code for **pyam** is available on `Github`_.

.. _`Github`:
Expand Down Expand Up @@ -79,20 +75,11 @@ Documentation
examples/index
api


Get in touch
------------

- Report bugs, suggest features or view the source code `on GitHub`_.
- For less well defined questions or ideas, use the `mailing list`_.

.. _mailing list: https://groups.google.com/forum/#!forum/pyam
.. _on GitHub: http://github.com/IAMconsortium/pyam
.. include:: ../../CONTRIBUTING.rst

License
-------

:code:`pyam` is available under the open source `Apache License`_.

.. _Apache LIcense: http://www.apache.org/licenses/LICENSE-2.0.html

.. _Apache License: http://www.apache.org/licenses/LICENSE-2.0.html
16 changes: 16 additions & 0 deletions doc/source/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@ From Source
Depedencies
~~~~~~~~~~~

Like any software project, we stand on the shoulders of giants. Our particular
giants include :code:`numpy` :cite:`numpy`, :code:`matplotlib`
:cite:`matplotlib`, and :code:`pandas` :cite:`pandas`. Explicit requirements are
fully enumerated below.

The required depedencies for :code:`pyam` are:

.. program-output:: python -c 'import sys; sys.path.append("../.."); import requirements; requirements.display()'

The optional depedencies for :code:`pyam` are:

.. include:: ../../requirements.txt
Expand All @@ -38,3 +47,10 @@ The depedencies for building this documentation are:
.. include:: ../requirements.txt
:start-line: 0
:literal:

References
**********

.. bibliography:: refs.bib
:style: plain
:all:
33 changes: 33 additions & 0 deletions doc/source/refs.bib
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@

@Misc{numpy,
author = {Travis Oliphant},
title = {{NumPy}: A guide to {NumPy}},
year = {2006--},
howpublished = {USA: Trelgol Publishing},
url = "http://www.numpy.org/"
}

@Article{matplotlib,
Author = {Hunter, J. D.},
Title = {Matplotlib: A 2D graphics environment},
Journal = {Computing In Science \& Engineering},
Volume = {9},
Number = {3},
Pages = {90--95},
abstract = {Matplotlib is a 2D graphics package used for Python
for application development, interactive scripting, and
publication-quality image generation across user
interfaces and operating systems.},
publisher = {IEEE COMPUTER SOC},
doi = {10.1109/MCSE.2007.55},
year = 2007
}

@InProceedings{pandas,
author = {Wes McKinney},
title = {Data Structures for Statistical Computing in Python},
booktitle = {Proceedings of the 9th Python in Science Conference},
pages = {51 - 56},
year = {2010},
editor = {Stefan van der Walt and Jarrod Millman}
}
17 changes: 17 additions & 0 deletions requirements.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
install_requirements = [
"argparse",
"numpy",
"requests",
"pandas >=0.21.0",
"PyYAML",
"xlrd",
"xlsxwriter",
"matplotlib",
"seaborn",
"six",
]


def display():
for x in install_requirements:
print(x)
15 changes: 3 additions & 12 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
from setuptools import setup, Command
from subprocess import call

import requirements

# Thanks to http://patorjk.com/software/taag/
logo = r"""
______ __ __ ______ __ __
Expand Down Expand Up @@ -64,18 +66,7 @@ def main():
package_data = {
'pyam': ['region_mappings/*'],
}
install_requirements = [
"argparse",
"numpy",
"requests",
"pandas >=0.21.0",
"PyYAML",
"xlrd",
"xlsxwriter",
"matplotlib",
"seaborn",
"six",
]
install_requirements = requirements.install_requirements
extra_requirements = {
'tests': ['coverage', 'pytest', 'pytest-cov', 'pytest-mpl'],
'docs': ['sphinx', 'sphinx_rtd_theme'],
Expand Down