From d8785ae0bdc86d135043ecec39babc5c54106ef4 Mon Sep 17 00:00:00 2001 From: mathieui Date: Sun, 31 May 2020 17:46:34 +0200 Subject: [PATCH] Update version to 0.13.1 And remove some annoying logic --- CHANGELOG | 2 +- data/io.poez.Poezio.appdata.xml | 1 + doc/source/conf.py | 4 ++-- launch.sh | 2 +- poezio/version.py | 3 ++- setup.py | 6 ++++-- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 1ea483e0..d2a7691d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,7 +4,7 @@ https://dev.louiz.org/projects/poezio/roadmap * Poezio 0.14 - dev -* Poezio 0.13.1 - dev +* Poezio 0.13.1 # Bug fixes diff --git a/data/io.poez.Poezio.appdata.xml b/data/io.poez.Poezio.appdata.xml index 2ab4f79c..a408a980 100644 --- a/data/io.poez.Poezio.appdata.xml +++ b/data/io.poez.Poezio.appdata.xml @@ -68,6 +68,7 @@ + diff --git a/doc/source/conf.py b/doc/source/conf.py index cadd95f0..af30d8ba 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -53,9 +53,9 @@ copyright = '%s, Mathieu Pasquet - Florent Le Coz - Emmanuel Gil Peyrot' % time. # built documents. # # The short X.Y version. -version = '0.14' +version = '0.13' # The full version, including alpha/beta/rc tags. -release = '0.14-dev' +release = '0.13.1' add_function_parentheses = True diff --git a/launch.sh b/launch.sh index 92f8545a..14d8c071 100755 --- a/launch.sh +++ b/launch.sh @@ -9,7 +9,7 @@ if [ -e .git ] then args=$(git show --format='%h %ci' | head -n1) else - args="0.12-dev" + args="0.13.1-dev" fi if [ -e "$POEZIO_VENV" ] diff --git a/poezio/version.py b/poezio/version.py index 52a06cc4..6defd704 100644 --- a/poezio/version.py +++ b/poezio/version.py @@ -1 +1,2 @@ -__version__ = '0.14' +__version__ = '0.13.1' +__version_info__ = (0, 13, 1) diff --git a/setup.py b/setup.py index 1e7dd8fc..a4714132 100755 --- a/setup.py +++ b/setup.py @@ -19,6 +19,8 @@ except ImportError: current_dir = os.path.dirname(__file__) +from poezio.version import __version__ + def get_relative_dir(folder, stopper): """ Find the path from a directory to a pseudo-root in order to recreate @@ -111,14 +113,14 @@ if os.path.exists(git_dir): except: version = '.dev1' else: - version = '.dev1' + version = '' with open('README.rst', encoding='utf-8') as readme_fd: LONG_DESCRIPTION = readme_fd.read() setup( name="poezio", - version="0.14" + version, + version=__version__ + version, description="A console XMPP client", long_description=LONG_DESCRIPTION, ext_modules=[module_poopt],