From 9e2613f6ae2ea417f1d937844904e67fe28d80a5 Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Sun, 9 Dec 2012 17:33:24 +0100 Subject: [PATCH] start 0.3dev --- setup.py | 6 +++--- you-get.json | 3 --- you_get/__init__.py | 4 +++- you_get/common.py | 2 +- you_get/version.py | 4 ++++ 5 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 you_get/version.py diff --git a/setup.py b/setup.py index 05bae85d..a3506105 100755 --- a/setup.py +++ b/setup.py @@ -2,17 +2,17 @@ PROJ_METADATA = 'you-get.json' -import os, json - +import os, json, imp here = os.path.abspath(os.path.dirname(__file__)) proj_info = json.loads(open(os.path.join(here, PROJ_METADATA)).read()) README = open(os.path.join(here, 'README.txt')).read() CHANGELOG = open(os.path.join(here, 'CHANGELOG.txt')).read() +VERSION = imp.load_source('version', os.path.join(here, 'you_get/version.py')).__version__ from setuptools import setup, find_packages setup( name = proj_info['name'], - version = proj_info['version'], + version = VERSION, author = proj_info['author'], author_email = proj_info['author_email'], diff --git a/you-get.json b/you-get.json index a71cad10..621c07a1 100644 --- a/you-get.json +++ b/you-get.json @@ -1,8 +1,5 @@ { "name": "you-get", - "version": "0.2.16", - "date": "2012-12-01", - "author": "Mort Yao", "author_email": "mort.yao@gmail.com", "url": "http://www.soimort.org/you-get/", diff --git a/you_get/__init__.py b/you_get/__init__.py index 08ba865d..a57ab31d 100644 --- a/you_get/__init__.py +++ b/you_get/__init__.py @@ -2,5 +2,7 @@ from .processor import * from .downloader import * + +from .version import __version__, __date__ +from .common import script_main from .main import * -from .common import script_main, __version__ diff --git a/you_get/common.py b/you_get/common.py index d0070d68..34fe125a 100644 --- a/you_get/common.py +++ b/you_get/common.py @@ -8,7 +8,7 @@ import re import sys from urllib import request, parse -__version__ = "0.2.16" +from .version import __version__ dry_run = False force = False diff --git a/you_get/version.py b/you_get/version.py new file mode 100644 index 00000000..e0a78a74 --- /dev/null +++ b/you_get/version.py @@ -0,0 +1,4 @@ +#!/usr/bin/env python + +__version__ = '0.3dev' +__date__ = '2012-12-09'