From 11d580aae1c9e9bb42485245c4fbd5c96dffc9a4 Mon Sep 17 00:00:00 2001 From: sneakypete81 Date: Sun, 7 Jul 2013 10:22:53 +0100 Subject: [PATCH] Read version into setup.py without importing, to avoid dependency problems --- openphoto/__init__.py | 3 +-- openphoto/_version.py | 1 + setup.py | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 openphoto/_version.py diff --git a/openphoto/__init__.py b/openphoto/__init__.py index 07b07a1..ab4d804 100644 --- a/openphoto/__init__.py +++ b/openphoto/__init__.py @@ -1,11 +1,10 @@ from openphoto.openphoto_http import OpenPhotoHttp from openphoto.errors import * +from openphoto._version import __version__ import openphoto.api_photo import openphoto.api_tag import openphoto.api_album -__version__ = "0.3" - LATEST_API_VERSION = 2 class OpenPhoto(OpenPhotoHttp): diff --git a/openphoto/_version.py b/openphoto/_version.py new file mode 100644 index 0000000..6a35e85 --- /dev/null +++ b/openphoto/_version.py @@ -0,0 +1 @@ +__version__ = "0.3" diff --git a/setup.py b/setup.py index 7ac96fd..26ab50a 100755 --- a/setup.py +++ b/setup.py @@ -1,12 +1,15 @@ #!/usr/bin/env python import sys -import openphoto requires = ['requests', 'requests_oauthlib'] console_script = """[console_scripts] openphoto = openphoto.main:main """ + +# from openphoto._version import __version__ +exec(open("openphoto/_version.py").read()) + # Check the Python version (major, minor) = sys.version_info[:2] if (major, minor) < (2, 6): @@ -24,7 +27,7 @@ except ImportError: 'requires': requires} setup(name='openphoto', - version=openphoto.__version__, + version=__version__, description='The official Python client library for Trovebox/OpenPhoto', long_description=open("README.rst").read(), author='Pete Burgers, James Walker',