Merge branch 'release/0.2.1'

maceoutliner · Oct 16, 2018 · 0a4f83a · 0a4f83a
2 parents 9a52fcc + 3f33be0
commit 0a4f83a
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 3 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -0,0 +1,15 @@
+[bumpversion]
+current_version = 0.2.1
+commit = True
+tag = False
+
+[bumpversion:file:fiction_outlines_api/__init__.py]
+
+[bumpversion:file:HISTORY.rst]
+search = 
+	**unreleased**
+	++++++++++++++
+replace = 
+	{new_version} ({now:%Y-%m-%d})
+	+++++++++++++++++++++++++++
+
diff --git a/.gitignore b/.gitignore
@@ -50,3 +50,5 @@ output/*/index.html
 
 # Sphinx
 docs/_build
+
+.python-version
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,6 +3,11 @@
 History
 -------
 
+0.2.1 (2018-10-16)
++++++++++++++++++++++++++++
+
+* Support for both python 3.6 and 3.7
+
 0.2.0 (2018-08-08)
 ++++++++++++++++++
 

diff --git a/fiction_outlines_api/__init__.py b/fiction_outlines_api/__init__.py
@@ -1,2 +1,2 @@
-__version__ = '0.2.0'
+__version__ = '0.2.1'
 default_app_config = 'fiction_outlines_api.apps.FictionOutlinesApiConfig'
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-django-fiction-outlines>=0.3
+django-fiction-outlines>=0.3.1
 django-rest-framework-rules
 djangorestframework
 coreapi

diff --git a/tox.ini b/tox.ini
@@ -1,8 +1,9 @@
 [tox]
 envlist =
-        {py37}-django{20,21}
+        {py36,py37}-django{20,21}
         flake8-py3
         docs
+skip_missing_interpreters = True
 
 [testenv:docs]
 passenv = TRAVIS TRAVIS_* COVERALLS_REPO_TOKEN CIRCLECI*
@@ -38,3 +39,4 @@ commands =
 [travis]
 python =  
        3.7: py37
+       3.6: py36