# HG changeset patch # User Goffi # Date 1294769723 -3600 # Node ID aae816738314b551f36a0468b008dede6047269c # Parent 7cf093e138b62bead72ec3072e3e6ba2fc344d3f distutils: added urwid-satext dependency, and gobject in preinstall_check diff -r 7cf093e138b6 -r aae816738314 setup.py --- a/setup.py Tue Jan 11 19:14:20 2011 +0100 +++ b/setup.py Tue Jan 11 19:15:23 2011 +0100 @@ -111,13 +111,14 @@ Hope to remove this at some point""" #modules_tocheck=['twisted', 'twisted.words', 'twisted.web', 'wx', 'urwid'] - modules_tocheck=['wx'] #XXX: wx is the only one to really difficult to install + modules_tocheck=['wx','gobject'] #XXX: wx is the only one to be really difficult to install, python-gobject is not up-to-date in PyPi package = {'twisted':'python-twisted-core', 'twisted.words':'python-twisted-words', 'twisted.web':'python-twisted-web', 'wx':'python-wxgtk2.8', 'urwid':'python-urwid', + 'gobject':'python-gobject', 'mercurial':'mercurial'} #this dict map dependencies to packages names for debian distributions sys.stdout.write ("Running pre-installation dependencies check\n") @@ -145,7 +146,7 @@ not_installed=set(modules_toinstall) if not_installed: - #some packages can't be automatically installed, we sys.stdout.write their name for manual installation + #some packages can't be automatically installed, we print their name for manual installation sys.stdout.write ("You should install the following dependencies with your distribution recommanded tool before installing %s:\n" % NAME) for module_name in not_installed: sys.stdout.write ("- %s (Debian name: %s)\n" % (module_name,package[module_name])) @@ -153,7 +154,7 @@ if sys.argv[1].lower() in ['egg_info','install']: - #we only check dependencies in egg_info or install is used + #we only check dependencies if egg_info or install is used preinstall_check() setup(name=NAME, @@ -184,7 +185,8 @@ ], scripts=['frontends/src/jp/jp', 'frontends/src/primitivus/primitivus', 'frontends/src/wix/wix'], zip_safe=False, - install_requires=['twisted', 'progressbar', 'urwid', 'beautifulsoup', 'mercurial'], + dependency_links = ['http://ftp.goffi.org/urwid-satext/'], + install_requires=['twisted', 'progressbar', 'urwid', 'beautifulsoup', 'mercurial', 'urwid-satext'], cmdclass=dict(install=custom_install), ) #XXX: The Mercurial dependecy is just here to build the custom wokkel (with MUC branch), it must be removed # and replace by wokkel as soon as MUC branch is officially available in wokkel main branch.