From 8cd6ec111e58828c80c9f62820218247bb539c05 Mon Sep 17 00:00:00 2001 From: Santiago P De Rosso Date: Tue, 6 Feb 2018 13:22:49 -0500 Subject: [PATCH] 0.8.6 --- gitless/cli/gl.py | 6 +++--- gl.spec | 3 --- setup.py | 13 ++++++++++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/gitless/cli/gl.py b/gitless/cli/gl.py index 239071e..e5be6c7 100644 --- a/gitless/cli/gl.py +++ b/gitless/cli/gl.py @@ -34,7 +34,7 @@ INTERNAL_ERROR = 3 NOT_IN_GL_REPO = 4 -VERSION = '0.8.5' +__version__ = '0.8.6' URL = 'http://gitless.com' @@ -76,7 +76,7 @@ def main(): parser.add_argument( '--version', action='version', version=( 'GL Version: {0}\nYou can check if there\'s a new version of Gitless ' - 'available at {1}'.format(VERSION, URL))) + 'available at {1}'.format(__version__, URL))) subparsers = parser.add_subparsers(title='subcommands', dest='subcmd_name') subparsers.required = True @@ -117,5 +117,5 @@ def main(): pprint.err_exp( 'If you want to help, see {0} for info on how to report bugs and ' 'include the following information:\n\n{1}\n\n{2}'.format( - URL, VERSION, traceback.format_exc())) + URL, __version__, traceback.format_exc())) return INTERNAL_ERROR diff --git a/gl.spec b/gl.spec index d8f5e7f..dfdee1f 100644 --- a/gl.spec +++ b/gl.spec @@ -3,12 +3,9 @@ import os a = Analysis(['gl.py'], pathex=[os.getcwd()], - hiddenimports=['pygit2_cffi_51591433xe8494016'], hookspath=None, runtime_hooks=None) -# this is a file pygit2 requires -a.datas += [('decl.h', '../pygit2/pygit2/decl.h', 'DATA')] pyz = PYZ(a.pure) exe = EXE(pyz, diff --git a/setup.py b/setup.py index 89d749b..2a16dce 100755 --- a/setup.py +++ b/setup.py @@ -2,12 +2,19 @@ # -*- coding: utf-8 -*- +import ast +import re import sys from setuptools import setup -VERSION = '0.8.5' +_version_re = re.compile(r'__version__\s+=\s+(.*)') + + +with open('gitless/cli/gl.py', 'rb') as f: + version = str(ast.literal_eval(_version_re.search( + f.read().decode('utf-8')).group(1))) # Build helper @@ -18,7 +25,7 @@ import platform rel = 'gl-v{0}-{1}-{2}'.format( - VERSION, platform.system().lower(), platform.machine()) + version, platform.system().lower(), platform.machine()) print('running pyinstaller...') pyinstaller( @@ -52,7 +59,7 @@ setup( name='gitless', - version=VERSION, + version=version, description='A version control system built on top of Git', long_description=ld, author='Santiago Perez De Rosso',