From 36a62f1b62150951f8dc92a05f60778a3149409f Mon Sep 17 00:00:00 2001 From: Markus Holtermann Date: Fri, 19 Sep 2014 09:28:50 +0200 Subject: Change version into a string --- bvggrabber/__init__.py | 53 +++----------------------------------------------- docs/conf.py | 8 ++++---- setup.py | 4 +--- 3 files changed, 8 insertions(+), 57 deletions(-) diff --git a/bvggrabber/__init__.py b/bvggrabber/__init__.py index 3ba0595..ce26baa 100644 --- a/bvggrabber/__init__.py +++ b/bvggrabber/__init__.py @@ -1,53 +1,6 @@ # -*- coding: utf-8 -*- -import datetime -import os -import subprocess -VERSION = (0, 1, 0, 'beta', 3) - - -def get_version(): - "Returns a PEP 386-compliant version number from VERSION." - # Taken from django.utils.version - assert VERSION[3] in ('alpha', 'beta', 'rc', 'final') - - # Now build the two parts of the version number: - # main = X.Y[.Z] - # sub = .devN - for pre-alpha releases - # | {a|b|c}N - for alpha, beta and rc releases - - parts = 2 if VERSION[2] == 0 else 3 - main = '.'.join(str(x) for x in VERSION[:parts]) - - sub = '' - if VERSION[3] == 'alpha' and VERSION[4] == 0: - git_changeset = get_git_changeset() - if git_changeset: - sub = '.dev%s' % git_changeset - - elif VERSION[3] != 'final': - mapping = {'alpha': 'a', 'beta': 'b', 'rc': 'c'} - sub = mapping[VERSION[3]] + str(VERSION[4]) - - return str(main + sub) - - -def get_git_changeset(): - """Returns a numeric identifier of the latest git changeset. - - The result is the UTC timestamp of the changeset in YYYYMMDDHHMMSS format. - This value isn't guaranteed to be unique, but collisions are very unlikely, - so it's sufficient for generating the development version numbers. - """ - repo_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - git_log = subprocess.Popen('git log --pretty=format:%ct --quiet -1 HEAD', - stdout=subprocess.PIPE, stderr=subprocess.PIPE, - shell=True, cwd=repo_dir, universal_newlines=True) - timestamp = git_log.communicate()[0] - try: - timestamp = datetime.datetime.utcfromtimestamp(int(timestamp)) - except ValueError: - return None - return timestamp.strftime('%Y%m%d%H%M%S') - +__author__ = 'Christian Struck, Markus Holtermann' +__email__ = 'info@markusholtermann.eu' +__version__ = '0.0.0' diff --git a/docs/conf.py b/docs/conf.py index 949aee2..ec71904 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -17,7 +17,7 @@ import sys sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..')) -from bvggrabber import get_version +from bvggrabber import __version__ # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -47,16 +47,16 @@ master_doc = 'index' # General information about the project. project = 'BVG-Grabber' -copyright = '2013, Markus Holtermann, Christian Struck' +copyright = '2013-2014, Markus Holtermann, Christian Struck' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = get_version() +version = __version__ # The full version, including alpha/beta/rc tags. -release = get_version() +release = __version__ # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index e54a14d..5c48eb0 100755 --- a/setup.py +++ b/setup.py @@ -4,8 +4,6 @@ import codecs from os import path from setuptools import setup, find_packages -from bvggrabber import get_version - BASEDIR = path.dirname(__file__) open = lambda filepath: codecs.open(filepath, 'r', 'utf-8') @@ -17,7 +15,7 @@ setup( name='bvg-grabber', description='Querying the upcoming public transport departures in Berlin', long_description=description, - version=get_version(), + version='0.0.0', url='https://github.com/Markush2010/bvg-grabber', author='Christian Struck, Markus Holtermann', author_email='', -- cgit v1.2.3