From 57a947452cc86a22d87727ffed80c87d73359a04 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sun, 10 Feb 2013 04:19:30 -0600 Subject: Allow running test in uninstalled source tree. It was pointed out that we missed the use-case that running tests in a fresh tree checkout should work - and we missed that by reaching too far into the setup module interface. Shame on us. Change-Id: Ic0056a3113b308f063d927484e1e4a44c9316a2d --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index fb187ff..35680b3 100644 --- a/setup.py +++ b/setup.py @@ -274,7 +274,7 @@ def _get_revno(): return len(revlist.splitlines()) -def get_version_from_git(pre_version): +def _get_version_from_git(pre_version): """Return a version which is equal to the tag that's on the current revision if there is one, or tag plus number of additional revisions if the current revision has no tag.""" @@ -294,7 +294,7 @@ def get_version_from_git(pre_version): return None -def get_version_from_pkg_info(package_name): +def _get_version_from_pkg_info(package_name): """Get the version from PKG-INFO file if we can.""" try: pkg_info_file = open('PKG-INFO', 'r') @@ -325,10 +325,10 @@ def get_version(package_name, pre_version=None): version = os.environ.get("OSLO_PACKAGE_VERSION", None) if version: return version - version = get_version_from_pkg_info(package_name) + version = _get_version_from_pkg_info(package_name) if version: return version - version = get_version_from_git(pre_version) + version = _get_version_from_git(pre_version) if version: return version raise Exception("Versioning for this project requires either an sdist" -- cgit v1.2.1