Updated with pull

nismod · Feb 23, 2017 · 5ff6594 · 5ff6594
2 parents a1224a2 + 7e55b5c
commit 5ff6594
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -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
@@ -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'

diff --git a/requirements.txt b/requirements.txt
@@ -3,3 +3,5 @@ numpy
 yaml
 # energy_demand
 # smif
+recommonmark
+
diff --git a/setup.cfg b/setup.cfg
@@ -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 =