Merge remote-tracking branch 'origin/pypi-release'

* origin/pypi-release:
  convert markdown readme to rst for PyPI
  update docs to reflect 1.10 support

CONTRIBUTING.md

@@ -14,7 +14,7 @@ Working on your first open source contribution? We are so excited to have you! Y
 
 ## Coding style
 
-We are adhering to [Django's coding style guide](https://docs.djangoproject.com/en/1.9/internals/contributing/writing-code/coding-style/), including a maximum line length of 119 characters. You'll find relevant configuration in [`setup.cfg`](https://github.com/SexualHealthInnovations/callisto-core/blob/master/setup.cfg).
+We are adhering to [Django's coding style guide](https://docs.djangoproject.com/en/1.10/internals/contributing/writing-code/coding-style/), including a maximum line length of 119 characters. You'll find relevant configuration in [`setup.cfg`](https://github.com/SexualHealthInnovations/callisto-core/blob/master/setup.cfg).
 
 As Django's style guide explains, you can use `isort` to automatically sort imports. Before opening your pull request, sort imports by running `isort -rc .` in the root directory of the project. Travis builds of your PR fail if imports aren't sorted correctly.
 
@@ -41,6 +41,7 @@ deactivate # exit virtualenv
 Django
 - 1.8
 - 1.9
+- 1.10
 
 Python
 - 2.7

HISTORY.rst

@@ -3,7 +3,7 @@
 History
 -------
 
-0.1.0 (2016-06-07)
+0.1.1 (2016-10-24)
 ++++++++++++++++++
 
 * First release on PyPI.

README.md

@@ -15,7 +15,7 @@ Learn more about information escrows:
 <a href="https://www.youtube.com/watch?v=mYV6_OaZeEs" target="_blank"><img src="https://www.projectcallisto.org/assets/img/pwl-video-still.png" alt="information escrow talk at Papers We Love" width="640"></a>
 
 ### Requirements
-`callisto-core` supports Django 1.8 and Django 1.9, running on Python 3.3, 3.4, or 3.5. Python 2.7 is provisionally supported, pending [further testing](https://github.com/SexualHealthInnovations/callisto-core/issues/19).
+`callisto-core` supports Django 1.8, 1.9, and 1.10, running on Python 3.3, 3.4, or 3.5. Python 2.7 is provisionally supported, pending [further testing](https://github.com/SexualHealthInnovations/callisto-core/issues/19).
 
 `callisto-core` is built on top of [`django-wizard-builder`](https://github.com/SexualHealthInnovations/django-wizard-builder), another open source Django package maintained by Sexual Health Innovations. If you're interested in contributing to Callisto, please check out that repo as well.
 

callisto/delivery/__init__.py

@@ -1 +1 @@
-__version__ = '0.1.0'
+__version__ = '0.1.1'

requirements_dev.txt

@@ -4,4 +4,7 @@ wheel==0.29.0
 # Coding style compliance
 autopep8>=1.2.4
 
+# releasing to PyPI
+pypandoc==1.2.0
+
 -r requirements-test.txt

setup.py

@@ -40,7 +40,13 @@ def get_version(*file_paths):
     os.system("git push --tags")
     sys.exit()
 
-readme = open('README.md').read()
+print("Converting README from markdown to restructured text")
+try:
+    import pypandoc
+    readme = pypandoc.convert_file('README.md', 'rst')
+except (IOError, ImportError):
+    print("Please install PyPandoc to allow conversion of the README")
+    readme = open('README.md').read()
 history = open('HISTORY.rst').read().replace('.. :changelog:', '')
 license = open('LICENSE').read()
 
@@ -67,6 +73,7 @@ def get_version(*file_paths):
         'Framework :: Django',
         'Framework :: Django :: 1.8',
         'Framework :: Django :: 1.9',
+        'Framework :: Django :: 1.10',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',