From ce7ae7a6066d0bf3949a32680dd1a80a0697713c Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 18 Sep 2018 22:10:17 -0400 Subject: [PATCH] Prepare release 3.1.1. Signed-off-by: Roberto Rosario --- __init__.py.tmpl | 2 +- docker/version | 2 +- generate_setup.py | 2 +- mayan/__init__.py | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/__init__.py.tmpl b/__init__.py.tmpl index 1a1ec22dd5..9cb84762e2 100644 --- a/__init__.py.tmpl +++ b/__init__.py.tmpl @@ -2,7 +2,7 @@ from __future__ import unicode_literals __title__ = 'Mayan EDMS' __version__ = '{{ version }}' -__build__ = 0x030100 +__build__ = 0x030101 __build_string__ = '{{ build_string }}' __author__ = 'Roberto Rosario' __author_email__ = 'roberto.rosario@mayan-edms.com' diff --git a/docker/version b/docker/version index 8c50098d8a..94ff29cc4d 100755 --- a/docker/version +++ b/docker/version @@ -1 +1 @@ -3.1 +3.1.1 diff --git a/generate_setup.py b/generate_setup.py index b31e1867e3..32f47033ad 100755 --- a/generate_setup.py +++ b/generate_setup.py @@ -31,7 +31,7 @@ MAYAN_TEMPLATE = '__init__.py.tmpl' def generate_build_number(): if BUILD and DATE: try: - result = '{} {}'.format(BUILD(), DATE()).replace('\n', '') + result = '{}_{}'.format(BUILD(), DATE()).replace('\n', '') except sh.ErrorReturnCode_128: result = '' else: diff --git a/mayan/__init__.py b/mayan/__init__.py index b32999328b..e74927b5c3 100644 --- a/mayan/__init__.py +++ b/mayan/__init__.py @@ -1,9 +1,9 @@ from __future__ import unicode_literals __title__ = 'Mayan EDMS' -__version__ = '3.1' -__build__ = 0x030100 -__build_string__ = 'v3.1 Mon Sep 17 18:52:26 2018 -0400' +__version__ = '3.1.1' +__build__ = 0x030101 +__build_string__ = 'v3.1-11-g041f4e733_Tue Sep 18 22:03:25 2018 -0400' __author__ = 'Roberto Rosario' __author_email__ = 'roberto.rosario@mayan-edms.com' __description__ = 'Free Open Source Electronic Document Management System'