summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Ryannel <juergen.bocklage-ryannel@pelagicore.com>2016-12-09 10:45:11 +0100
committerJuergen Ryannel <juergen.bocklage-ryannel@pelagicore.com>2016-12-09 10:45:11 +0100
commitf1779abb439ce25d7e552827f536d678a14e0b98 (patch)
treea79eba424b32f8eccd21b45b5db8992066e684f9
parent12ee0211b1fd38bab35d8b5800e5f8155eaf029d (diff)
parent8ad3c0d078c563ed9ee114336d1871d770089d96 (diff)
downloadqtivi-qface-f1779abb439ce25d7e552827f536d678a14e0b98.tar.gz
Merge branch 'release/1.0.0a5'1.0.0a5
-rw-r--r--docs/conf.py3
-rw-r--r--setup.py2
2 files changed, 2 insertions, 3 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 85ebd18..6cc3a99 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -41,7 +41,6 @@ extensions = [
'sphinx.ext.todo',
'sphinx.ext.coverage',
'sphinx.ext.viewcode',
- 'sphinx.ext.githubpages',
'sphinx.ext.inheritance_diagram',
]
@@ -73,7 +72,7 @@ author = 'JRyannel'
# The short X.Y version.
version = '1.0.0'
# The full version, including alpha/beta/rc tags.
-release = '1.0.0a4'
+release = '1.0.0a5'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/setup.py b/setup.py
index c1da39e..8acbf20 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ except (IOError, ImportError):
setup(
name='qface',
- version='1.0.0a4',
+ version='1.0.0a5',
description='QFace - A Generator Framework',
long_description=long_description,
url='https://github.com/Pelagicore/qface',