From 78271ebb0f1574da19ffed0928ab4e5ba88e3048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Mon, 1 Mar 2010 16:01:15 +0000 Subject: [PATCH] - implement library TODOs - move TODOs to test, which will fail for now (socks) - remove implemented TODOs git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33193 20353a03-c40f-0410-a6d1-a30d3c3de9de --- buildout/TODO.txt | 9 --------- buildout/software-profiles/erp5.cfg | 3 ++- buildout/software-profiles/zope-2.8.cfg | 2 ++ buildout/tests/assertSoftware.py | 10 ++++++++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/buildout/TODO.txt b/buildout/TODO.txt index 72fd4e0839..d01b4e2353 100644 --- a/buildout/TODO.txt +++ b/buildout/TODO.txt @@ -5,15 +5,6 @@ - merge from: - https://svn.erp5.org/repos/public/experimental/erp5.buildout-zope-2.12/ - use more of buildout automatic dependency resolution - - software-profiles/python-2.4.cfg: - - celementtree (https://svn.erp5.org/repos/public/spec/mandriva/python2.4-celementtree/) - - mechanize (https://svn.erp5.org/repos/public/spec/mandriva/python2.4-mechanize/) - - numeric (https://svn.erp5.org/repos/public/spec/mandriva/python2.4-numeric/) - - paramiko (https://svn.erp5.org/repos/public/spec/mandriva/python2.4-paramiko/) - - ply (https://svn.erp5.org/repos/public/spec/mandriva/python2.4-ply/) - - pyxml (https://svn.erp5.org/repos/public/spec/mandriva/python2.4-pyxml/) - - socksipy (http://socksipy.sourceforge.net/) - - make bin/python2.4 using all available eggs - software-profiles/openoffice-bin.cfg: - consider using own recipe or zorg.recipe.openoffice, which would be closer to buildout usage (internal cache, etc) diff --git a/buildout/software-profiles/erp5.cfg b/buildout/software-profiles/erp5.cfg index 18977df6fa..17e82257d6 100644 --- a/buildout/software-profiles/erp5.cfg +++ b/buildout/software-profiles/erp5.cfg @@ -258,15 +258,16 @@ recipe = zc.recipe.egg eggs = ${itools:egg} ${mysql-python:egg} - ClientForm PyXML SOAPpy + cElementTree elementtree erp5diff ipdb lxml mechanize numpy + paramiko ply pysvn python-ldap diff --git a/buildout/software-profiles/zope-2.8.cfg b/buildout/software-profiles/zope-2.8.cfg index f35580399f..073c9f1943 100644 --- a/buildout/software-profiles/zope-2.8.cfg +++ b/buildout/software-profiles/zope-2.8.cfg @@ -5,4 +5,6 @@ recipe = erp5.recipe.zope2install url = http://www.zope.org/Products/Zope/2.8.11/Zope-2.8.11-final.tgz skip-fake-eggs = + ClientForm + mechanize pytz diff --git a/buildout/tests/assertSoftware.py b/buildout/tests/assertSoftware.py index f7f6821c6a..9d2e91031e 100644 --- a/buildout/tests/assertSoftware.py +++ b/buildout/tests/assertSoftware.py @@ -32,17 +32,23 @@ print sys.version_info[:2] _ssl _xmlplus bz2 + cElementTree elementtree fpconst gdbm itools ldap lxml + mechanize memcache numpy + paramiko + ply pytz simplejson + socks threadframe + xml xml.parsers.expat zlib """) @@ -53,7 +59,7 @@ print sys.version_info[:2] except ImportError: failed_library_list.append(lib) self.assertEqual([], failed_library_list, - 'Python libraries not found:\n'+'\n\t'.join(failed_library_list)) + 'Python libraries not found:\n'+'\n'.join(failed_library_list)) class AssertLddLibs(unittest.TestCase): def test_tritonn_senna(self): @@ -145,7 +151,7 @@ class AssertApache(unittest.TestCase): if not os.path.exists('parts/apache/modules/%s' % module): failed_module_list.append(module) self.assertEqual([], failed_module_list, - 'Apache modules not found:\n'+'\n\t'.join(failed_module_list)) + 'Apache modules not found:\n'+'\n'.join(failed_module_list)) if __name__ == '__main__': unittest.main() -- 2.30.9