From: Brian Warner Date: Thu, 19 Feb 2009 08:35:58 +0000 (-0700) Subject: move show-tool-versions out of setup.py and into a separate script in misc/ , since... X-Git-Tag: allmydata-tahoe-1.4.0~183 X-Git-Url: https://git.rkrishnan.org/pf/content/fr.html?a=commitdiff_plain;h=c2a2e930899bb35413a341ae0e1d24fd425c0bc8;p=tahoe-lafs%2Ftahoe-lafs.git move show-tool-versions out of setup.py and into a separate script in misc/ , since setuptools is trying to build and install a bunch of stuff first --- diff --git a/misc/show-tool-versions.py b/misc/show-tool-versions.py new file mode 100644 index 00000000..98a9c4d4 --- /dev/null +++ b/misc/show-tool-versions.py @@ -0,0 +1,24 @@ +#! /usr/bin/env python + +import sys +import subprocess + +print "python:", sys.version.replace("\n", " ") + +try: + out = subprocess.Popen(["buildbot", "--version"], + stdout=subprocess.PIPE).communicate()[0] + print "buildbot:", out.replace("\n", " ") +except OSError: + pass + +try: + out = subprocess.Popen(["darcs", "--version"], + stdout=subprocess.PIPE).communicate()[0] + full = subprocess.Popen(["darcs", "--exact-version"], + stdout=subprocess.PIPE).communicate()[0] + print + print "darcs:", out.replace("\n", " ") + print full.rstrip() +except OSError: + pass diff --git a/setup.py b/setup.py index 92e89412..e30294c6 100644 --- a/setup.py +++ b/setup.py @@ -304,33 +304,6 @@ class MySdist(sdist.sdist): return sdist.sdist.make_distribution(self) -class ToolVersions(Command): - user_options = [] - def initialize_options(self): - pass - def finalize_options(self): - pass - def run(self): - print "python:", sys.version.replace("\n", " ") - - try: - out = subprocess.Popen(["buildbot", "--version"], - stdout=subprocess.PIPE).communicate()[0] - print "buildbot:", out.replace("\n", " ") - except OSError: - pass - - try: - out = subprocess.Popen(["darcs", "--version"], - stdout=subprocess.PIPE).communicate()[0] - full = subprocess.Popen(["darcs", "--exact-version"], - stdout=subprocess.PIPE).communicate()[0] - print - print "darcs:", out.replace("\n", " ") - print full.rstrip() - except OSError: - pass - # Tahoe's dependencies are managed by the find_links= entry in setup.cfg and # the _auto_deps.install_requires list, which is used in the call to setup() # below. @@ -361,7 +334,6 @@ setup(name=APPNAME, "run_with_pythonpath": RunWithPythonPath, "check_auto_deps": CheckAutoDeps, "make_executable": MakeExecutable, - "show_tool_versions": ToolVersions, "sdist": MySdist, }, package_dir = {'':'src'},