Merge pull request #283 from hoatle/improvements/#268-use-branch-tag-…

…name-for-docs-version @ #268 | should use vX.X.X from tag release for all the related version labels
teracyhq · Mar 8, 2017 · ef672e0 · ef672e0
2 parents c27a045 + 682194a
commit ef672e0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/.travis/setup.sh b/.travis/setup.sh
@@ -4,10 +4,6 @@
 
 if [[ $TRAVIS_BRANCH == 'master' ]] ; then
     export DEPLOY_HTML_DIR=docs
-elif [[ $TRAVIS_BRANCH == 'develop' ]] ; then
-    export DEPLOY_HTML_DIR=docs/develop
-elif [[ $TRAVIS_BRANCH =~ ^v[0-9.]+$ ]]; then
-    export DEPLOY_HTML_DIR=docs/${TRAVIS_BRANCH:1}
 else
     export DEPLOY_HTML_DIR=docs/$TRAVIS_BRANCH
 fi
diff --git a/docs/conf.py b/docs/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.5'
+version = 'v0.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.5.0-b2-@'
+release = 'v0.5.0-b2-@'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.