From: "Karl Hasselström" <kha@treskal.com>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org
Subject: [StGit PATCH 1/2] Import version to a separate namespace
Date: Wed, 14 May 2008 03:44:56 +0200 [thread overview]
Message-ID: <20080514014450.7043.20656.stgit@yoghurt> (raw)
In-Reply-To: <20080514014309.GA17955@diana.vm.bytemark.co.uk>
The set of names we need from the version module is about to get too
large to list explicitly, but we don't want to pollute the local
namespace with every name from version. So do a qualified import of
the module.
Signed-off-by: Karl Hasselström <kha@treskal.com>
---
setup.py | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/setup.py b/setup.py
index 3be087c..04ca821 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
import sys, glob, os
from distutils.core import setup
-from stgit.version import version, git_min_ver, python_min_ver
+from stgit import version
from stgit.run import Run
def __version_to_list(version):
@@ -29,18 +29,18 @@ def __check_python_version():
"""Check the minimum Python version
"""
pyver = '.'.join(str(n) for n in sys.version_info)
- if not __check_min_version(python_min_ver, pyver):
+ if not __check_min_version(version.python_min_ver, pyver):
print >> sys.stderr, 'Python version %s or newer required. Found %s' \
- % (python_min_ver, pyver)
+ % (version.python_min_ver, pyver)
sys.exit(1)
def __check_git_version():
"""Check the minimum GIT version
"""
gitver = Run('git', '--version').output_one_line().split()[2]
- if not __check_min_version(git_min_ver, gitver):
+ if not __check_min_version(version.git_min_ver, gitver):
print >> sys.stderr, 'GIT version %s or newer required. Found %s' \
- % (git_min_ver, gitver)
+ % (version.git_min_ver, gitver)
sys.exit(1)
# Check the minimum versions required
@@ -52,7 +52,7 @@ if sys.argv[1] in ['install', 'build']:
old_mask = os.umask(0022)
setup(name = 'stgit',
- version = version,
+ version = version.version,
license = 'GPLv2',
author = 'Catalin Marinas',
author_email = 'catalin.marinas@gmail.com',
next prev parent reply other threads:[~2008-05-14 1:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-14 1:43 StGit: kha/{safe,experimental} updated Karl Hasselström
2008-05-14 1:44 ` Karl Hasselström [this message]
2008-05-14 1:47 ` [StGit PATCH 2/2] Better StGit version tracking Karl Hasselström
2008-05-14 1:49 ` [StGit PATCH] Emacs mode: automatically cd up to root of worktree Karl Hasselström
2008-05-14 7:38 ` David Kågedal
2008-05-14 8:13 ` Karl Hasselström
2008-05-14 1:49 ` [StGit PATCH] New command: stg redo Karl Hasselström
2008-05-19 21:21 ` StGit: kha/{safe,experimental} updated Catalin Marinas
2008-05-20 7:04 ` Karl Hasselström
2008-05-20 17:19 ` Catalin Marinas
2008-05-20 21:02 ` Karl Hasselström
2008-05-20 21:39 ` [StGit PATCH] Try the built-in version string before git-describe Karl Hasselström
2008-05-21 14:38 ` Catalin Marinas
2008-05-21 15:00 ` Karl Hasselström
2008-05-21 14:07 ` StGit: kha/{safe,experimental} updated Catalin Marinas
2008-05-21 14:58 ` Karl Hasselström
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080514014450.7043.20656.stgit@yoghurt \
--to=kha@treskal.com \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).