Skip to content

Commit

Permalink
Merge pull request #7 from nismod/packaging
Browse files Browse the repository at this point in the history
Added markdown support, changed author to Sven, corrected title
  • Loading branch information
eggimasv committed Feb 22, 2017
2 parents b973f3a + c18a64c commit 7e55b5c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 6 deletions.
10 changes: 9 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@
# documentation root, use os.path.abspath to make it absolute, like shown here.
# sys.path.insert(0, os.path.abspath('.'))

# Support markdown
from recommonmark.parser import CommonMarkParser

source_parsers = {
'.md': CommonMarkParser,
}


on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
if on_rtd:
import inspect
Expand Down Expand Up @@ -52,7 +60,7 @@
templates_path = ['_templates']

# The suffix of source filenames.
source_suffix = '.rst'
source_suffix = ['.rst', '.md']

# The encoding of source files.
# source_encoding = 'utf-8-sig'
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Add your requirements here like:
numpy
# scipy>=0.9
yaml
recommonmark
8 changes: 4 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[metadata]
name = energy_demand
name = HIgh Resolution Energy (HIRE)
summary = ITRC-MISRTAL Energy Demand Model
author = Will Usher
author-email = william.usher@ouce.ox.ac.uk
author = Sven Eggimann
author-email = sven.eggimann@ouce.ox.ac.uk
license = mit
home-page = http://www.itrc.org
description-file = README.rst
description-file = README.md
# Add here all kinds of additional classifiers as defined under
# https://pypi.python.org/pypi?%3Aaction=list_classifiers
classifier =
Expand Down

0 comments on commit 7e55b5c

Please sign in to comment.