Merge tag '0.10.1.1' into develop

Fixing TravisCI
swappsco · Mar 19, 2018 · 86727c5 · 86727c5
2 parents 8d27529 + 14a528e
commit 86727c5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,6 @@ python:
 env:
   matrix:
    - DJANGO="Django>=1.11,<1.12
-   - DJANGO="Django>=2"
 
 branches:
   only:
@@ -19,9 +18,6 @@ install:
   - pip install python-coveralls
   - pip install coverage
 
-before_script:
-  - if [[ "$DJANGO" >= "2" ]]; then pip install django-markdown-app==0.9.4.1; fi
-
 script: "coverage run manage.py test"
 
 after_success:

diff --git a/docs/conf.py b/docs/conf.py
@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.10.1'
+version = '0.10.1.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.10.1'
+release = '0.10.1.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@ def get_requirements():
 
 setup(
     name='django-qa',
-    version='0.10.1',
+    version='0.10.1.1',
     description='Pluggable django app for Q&A',
     long_description=get_long_description(),
     author='arjunkomath, cdvv7788, sebastian-code, jlariza, swappsco',