summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2014-02-22 14:27:31 +0100
committermathieui <mathieui@mathieui.net>2014-02-22 14:28:08 +0100
commitd165f13a81d407fe3272da3830452cdbea01cea9 (patch)
treee7599fff749537c5e280c278356b8a3de5f054bc
parentf87ab6e39b185a69bd88f2615670215a1b28ae56 (diff)
downloadpoezio-d165f13a81d407fe3272da3830452cdbea01cea9.tar.gz
poezio-d165f13a81d407fe3272da3830452cdbea01cea9.tar.bz2
poezio-d165f13a81d407fe3272da3830452cdbea01cea9.tar.xz
poezio-d165f13a81d407fe3272da3830452cdbea01cea9.zip
Bump dev version
-rw-r--r--CHANGELOG2
-rw-r--r--doc/source/conf.py4
-rwxr-xr-xlaunch.sh8
-rw-r--r--setup.py4
-rw-r--r--src/args.py2
5 files changed, 14 insertions, 6 deletions
diff --git a/CHANGELOG b/CHANGELOG
index b14b9917..a0159d61 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@ This file describes the new features in each poezio release.
For more detailed changelog, see the roadmap:
http://dev.louiz.org/projects/poezio/roadmap
+* Poezio 0.8.3 - dev
+
* Poezio 0.8
- Allow in-band password changing with /password
- Force c2s encryption until configured otherwise
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 179fd50d..69fbbae3 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -53,9 +53,9 @@ copyright = '%s, Mathieu Pasquet - Florent Le Coz' % time.strftime('%Y')
# built documents.
#
# The short X.Y version.
-version = '0.8'
+version = '0.8.3'
# The full version, including alpha/beta/rc tags.
-release = '0.8'
+release = '0.8.3-dev'
add_function_parentheses = True
diff --git a/launch.sh b/launch.sh
index 73c21f1b..5919e814 100755
--- a/launch.sh
+++ b/launch.sh
@@ -1,4 +1,10 @@
#!/bin/sh
-exec python3 -OO src/poezio.py -v 0.8 "$@"
+if [ -d "$PWD/.git" ]
+then
+ args=$(git show --format='%h %ci' | head -n1)
+else
+ args="0.8.3-dev"
+fi
+exec python3 -OO src/poezio.py -v "$args" "$@"
diff --git a/setup.py b/setup.py
index 930e44d9..36170530 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ if not os.path.exists(os.path.join(current_dir, 'src', 'default_config.cfg')):
os.path.join(current_dir, 'src', 'default_config.cfg'))
setup(name="poezio",
- version="0.8",
+ version="0.8.3-dev",
description="A console XMPP client",
long_description=
"""
@@ -30,7 +30,7 @@ setup(name="poezio",
maintainer = 'Mathieu Pasquet',
maintainer_email = 'mathieui@mathieui.net',
- classifiers = ['Development Status :: 5 - Production/Stable',
+ classifiers = ['Development Status :: 2 - Pre-Alpha',
'Environment :: Console :: Curses',
'Intended Audience :: End Users/Desktop',
'License :: OSI Approved :: zlib/libpng License',
diff --git a/src/args.py b/src/args.py
index 4691a224..33d4f6e6 100644
--- a/src/args.py
+++ b/src/args.py
@@ -20,7 +20,7 @@ def parse_args(CONFIG_PATH=''):
parser.add_option("-d", "--debug", dest="debug",
help="The file where debug will be written", metavar="DEBUG_FILE")
parser.add_option("-v", "--version", dest="version",
- help=SUPPRESS, metavar="VERSION", default="0.8-dev")
+ help=SUPPRESS, metavar="VERSION", default="0.8.3-dev")
(options, args) = parser.parse_args()
else:
parser = ArgumentParser()