From: W. Trevor King Date: Sun, 27 Jan 2013 19:09:52 +0000 (-0500) Subject: swc-installation-test-2.py: Add and_dependencies to Python package setup X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6df0f579866f87f16bb3c06968ebb7d7fe40a2db;p=swc-setup-installation-test.git swc-installation-test-2.py: Add and_dependencies to Python package setup Not used by any packages yet, but I'm about to use it for IPython. --- diff --git a/setup/swc-installation-test-2.py b/setup/swc-installation-test-2.py index a847c68..4cd22e2 100755 --- a/setup/swc-installation-test-2.py +++ b/setup/swc-installation-test-2.py @@ -464,29 +464,33 @@ class PythonPackageDependency (Dependency): return version -for package,name,long_name,minimum_version in [ +for package,name,long_name,minimum_version,and_dependencies in [ ('nose', None, 'Nose Python package', - CHECKER['nosetests'].minimum_version), + CHECKER['nosetests'].minimum_version, None), ('IPython', None, 'IPython Python package', - CHECKER['ipython'].minimum_version), - ('numpy', None, 'NumPy', None), - ('scipy', None, 'SciPy', None), - ('matplotlib', None, 'Matplotlib', None), - ('pandas', None, 'Pandas', (0, 8)), - ('sympy', None, 'SymPy', None), - ('Cython', None, None, None), - ('networkx', None, 'NetworkX', None), - ('mayavi.mlab', None, 'MayaVi', None), - ('setuptools', None, 'Setuptools', None), + CHECKER['ipython'].minimum_version, None), + ('numpy', None, 'NumPy', None, None), + ('scipy', None, 'SciPy', None, None), + ('matplotlib', None, 'Matplotlib', None, None), + ('pandas', None, 'Pandas', (0, 8), None), + ('sympy', None, 'SymPy', None, None), + ('Cython', None, None, None, None), + ('networkx', None, 'NetworkX', None, None), + ('mayavi.mlab', None, 'MayaVi', None, None), + ('setuptools', None, 'Setuptools', None, None), ]: if not name: name = package if not long_name: long_name = name + kwargs = {} + if and_dependencies: + kwargs['and_dependencies'] = and_dependencies CHECKER[name] = PythonPackageDependency( package=package, name=name, long_name=long_name, - minimum_version=minimum_version) -del package, name, long_name, minimum_version # cleanup namespace + minimum_version=minimum_version, **kwargs) +# cleanup namespace +del package, name, long_name, minimum_version, and_dependencies, kwargs class MercurialPythonPackage (PythonPackageDependency):