summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Buquet <pep@bouah.net>2020-05-31 17:56:09 +0200
committerMaxime Buquet <pep@bouah.net>2020-05-31 17:56:09 +0200
commite662bdee055d25cb609b5ed229e077e3d557bbe0 (patch)
tree0d3b2dfd36ec2f9b3ceb98fa56af59324283f19e
parent7650591c6b921096ca270d626276e94479c271ab (diff)
parentd8785ae0bdc86d135043ecec39babc5c54106ef4 (diff)
downloadpoezio-e662bdee055d25cb609b5ed229e077e3d557bbe0.tar.gz
poezio-e662bdee055d25cb609b5ed229e077e3d557bbe0.tar.bz2
poezio-e662bdee055d25cb609b5ed229e077e3d557bbe0.tar.xz
poezio-e662bdee055d25cb609b5ed229e077e3d557bbe0.zip
Merge branch 'release-0.13.1' into 'master'
Update version to 0.13.1 See merge request poezio/poezio!142
-rw-r--r--CHANGELOG2
-rw-r--r--data/io.poez.Poezio.appdata.xml1
-rw-r--r--doc/source/conf.py4
-rwxr-xr-xlaunch.sh2
-rw-r--r--poezio/version.py3
-rwxr-xr-xsetup.py6
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 @@
</provides>
<releases>
+ <release version="0.13.1" date="2020-05-31"/>
<release version="0.13" date="2020-05-24"/>
<release version="0.12.1" date="2018-09-12"/>
<release version="0.12" date="2018-08-13"/>
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],