From ded79e85f413f2869342d202412b2e7057bead00 Mon Sep 17 00:00:00 2001 From: Dana Powers Date: Thu, 4 Jun 2015 15:54:00 -0700 Subject: [PATCH] Set __version__ string in kafka/version.py --- MANIFEST.in | 1 - VERSION | 1 - kafka/__init__.py | 4 +--- kafka/version.py | 1 + setup.py | 6 +++--- 5 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 VERSION create mode 100644 kafka/version.py diff --git a/MANIFEST.in b/MANIFEST.in index 68bd7939c..bdd65051c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1 @@ -include VERSION recursive-include kafka *.py diff --git a/VERSION b/VERSION deleted file mode 100644 index 8caff3251..000000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.9.4-dev diff --git a/kafka/__init__.py b/kafka/__init__.py index 3536084aa..396a8b83d 100644 --- a/kafka/__init__.py +++ b/kafka/__init__.py @@ -1,7 +1,5 @@ __title__ = 'kafka' -# Use setuptools to get version from setup.py -import pkg_resources -__version__ = pkg_resources.require('kafka-python')[0].version +from .version import __version__ __author__ = 'David Arthur' __license__ = 'Apache License 2.0' __copyright__ = 'Copyright 2015, David Arthur under Apache License, v2.0' diff --git a/kafka/version.py b/kafka/version.py new file mode 100644 index 000000000..5b721edda --- /dev/null +++ b/kafka/version.py @@ -0,0 +1 @@ +__version__ = '0.9.4-dev' diff --git a/setup.py b/setup.py index f1c195408..8e4fb6652 100644 --- a/setup.py +++ b/setup.py @@ -2,9 +2,9 @@ import os from setuptools import setup, Command -with open('VERSION', 'r') as v: - __version__ = v.read().rstrip() - +# Pull version from source without importing +# since we can't import something we haven't built yet :) +exec(open('kafka/version.py').read()) class Tox(Command):