diff options
author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-01-08 17:21:07 +0000 |
---|---|---|
committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-01-12 11:57:46 +0000 |
commit | 28eff204f1162ddc516a8ff4cfef894c2273ff7f (patch) | |
tree | bbd52c5933c3769c1420ced32092553af8ced5a9 | |
parent | 48e41ded9cb6222dbfdad017ef9d41a89ff4c6c0 (diff) | |
download | import-28eff204f1162ddc516a8ff4cfef894c2273ff7f.tar.gz |
Remove generic PythonExtension class
The two extensions have diverged so this generic class is no longer useful.
-rw-r--r-- | baserockimport/exts/importer_python_common.py | 10 | ||||
-rwxr-xr-x | baserockimport/exts/python.find_deps | 43 |
2 files changed, 25 insertions, 28 deletions
diff --git a/baserockimport/exts/importer_python_common.py b/baserockimport/exts/importer_python_common.py index b51e680..6c8fc66 100644 --- a/baserockimport/exts/importer_python_common.py +++ b/baserockimport/exts/importer_python_common.py @@ -89,12 +89,4 @@ def name_or_closest(client, package_name): return results[0]['name'] if len(results) > 0 else None -# We subclass the ImportExtension to setup the logger, -# so that we can send logs to the import tool's log -class PythonExtension(ImportExtension): - def __init__(self): - super(PythonExtension, self).__init__() - - def process_args(self, _): - import __main__ - __main__.main() + diff --git a/baserockimport/exts/python.find_deps b/baserockimport/exts/python.find_deps index b9791ef..524191e 100755 --- a/baserockimport/exts/python.find_deps +++ b/baserockimport/exts/python.find_deps @@ -327,31 +327,36 @@ def find_runtime_deps(source, name, version=None, use_requirements_file=False): return runtime_deps -def main(): - if len(sys.argv) not in [3, 4]: - print('usage: %s PACKAGE_SOURCE_DIR NAME [VERSION]' % sys.argv[0]) - sys.exit(1) +class PythonFindDepsExtension(ImportExtension): - logging.debug('%s: sys.argv[1:]: %s' % (sys.argv[0], sys.argv[1:])) - source, name = sys.argv[1:3] - version = sys.argv[3] if len(sys.argv) == 4 else None + def __init__(self): + super(PythonFindDepsExtension, self).__init__() - client = xmlrpclib.ServerProxy(PYPI_URL) - new_name = name_or_closest(client, name) + def run(self): + if len(sys.argv) not in [3, 4]: + print('usage: %s PACKAGE_SOURCE_DIR NAME [VERSION]' % sys.argv[0]) + sys.exit(1) - if new_name == None: - error("Couldn't find any project with name '%s'" % name) + logging.debug('%s: sys.argv[1:]: %s' % (sys.argv[0], sys.argv[1:])) + source, name = sys.argv[1:3] + version = sys.argv[3] if len(sys.argv) == 4 else None - logging.debug('Treating %s as %s' % (name, new_name)) - name = new_name + client = xmlrpclib.ServerProxy(PYPI_URL) + new_name = name_or_closest(client, name) + + if new_name == None: + error("Couldn't find any project with name '%s'" % name) + + logging.debug('Treating %s as %s' % (name, new_name)) + name = new_name - deps = {} - deps['build-dependencies'] = find_build_deps(source, name, version) - deps['runtime-dependencies'] = find_runtime_deps(source, name, version) + deps = {} + deps['build-dependencies'] = find_build_deps(source, name, version) + deps['runtime-dependencies'] = find_runtime_deps(source, name, version) - root = {'python': deps} + root = {'python': deps} - print(json.dumps(root)) + print(json.dumps(root)) if __name__ == '__main__': - PythonExtension().run() + PythonFindDepsExtension().run() |