[Checkins] SVN: Sandbox/darrylcousins/tfws.website/ Whoops got a bit of a mess here

[Darryl Cousins]

Log message for revision 83726:
  Whoops got a bit of a mess here

Changed:
  U   Sandbox/darrylcousins/tfws.website/buildout.cfg
  U   Sandbox/darrylcousins/tfws.website/mars.adapter/mars/__init__.py
  U   Sandbox/darrylcousins/tfws.website/mars.adapter/setup.py
  U   Sandbox/darrylcousins/tfws.website/setup.py

-=-
Modified: Sandbox/darrylcousins/tfws.website/buildout.cfg
===================================================================
--- Sandbox/darrylcousins/tfws.website/buildout.cfg	2008-02-10 03:40:40 UTC (rev 83725)
+++ Sandbox/darrylcousins/tfws.website/buildout.cfg	2008-02-10 04:34:15 UTC (rev 83726)
@@ -1,6 +1,5 @@
 [buildout]
-develop =  
-    .
+develop = .
     grok
     z3c.authentication 
     z3c.resource 
@@ -18,6 +17,7 @@
 parts = 
     app 
     test
+    interpreter
 extends = http://download.zope.org/zope3.4/versions-3.4.0c1.cfg
 versions = versions
 
@@ -25,26 +25,17 @@
 grok = 0.12dev
 martian = 0.9.3
 
+[interpreter]
+recipe = zc.recipe.egg
+interpreter = python
+eggs = ${app:eggs}
+
 [app]
 recipe = zc.recipe.egg
-eggs = 
-    tfws.website
-    mars.adapter
-    mars.contentprovider
-    mars.form
-#    mars.formdemo
-    mars.layer
-    mars.macro
-    mars.resource
-    mars.template
-    mars.view
-    mars.viewlet
+eggs = ${test:eggs}
     Paste
     PasteScript
     PasteDeploy
-    z3c.authentication
-    z3c.resource
-    zc.selenium
 
 [test]
 recipe = zc.recipe.testrunner

Modified: Sandbox/darrylcousins/tfws.website/mars.adapter/mars/__init__.py
===================================================================
--- Sandbox/darrylcousins/tfws.website/mars.adapter/mars/__init__.py	2008-02-10 03:40:40 UTC (rev 83725)
+++ Sandbox/darrylcousins/tfws.website/mars.adapter/mars/__init__.py	2008-02-10 04:34:15 UTC (rev 83726)
@@ -1,7 +1,8 @@
+# this is a namespace package
 try:
-    # Declare this a namespace package if pkg_resources is available.
     import pkg_resources
-    pkg_resources.declare_namespace('mars')
+    pkg_resources.declare_namespace(__name__)
 except ImportError:
-    pass
+    import pkgutil
+    __path__ = pkgutil.extend_path(__path__, __name__)
 

Modified: Sandbox/darrylcousins/tfws.website/mars.adapter/setup.py
===================================================================
--- Sandbox/darrylcousins/tfws.website/mars.adapter/setup.py	2008-02-10 03:40:40 UTC (rev 83725)
+++ Sandbox/darrylcousins/tfws.website/mars.adapter/setup.py	2008-02-10 04:34:15 UTC (rev 83726)
@@ -7,6 +7,7 @@
 setup(
     name='mars.adapter',
     version='0.1',
+    license='ZPL',
     author='Darryl Cousins',
     author_email='darryl.cousins at tfws.org.nz',
     url='http://www.tfws.org.nz/mars',
@@ -28,12 +29,11 @@
     packages=find_packages(),
     namespace_packages=['mars'],
     zip_safe=True,
-    license='ZPL',
-    extras_require = dict(
-                test=['zope.app.testing']),
     install_requires = [
         'setuptools',
         'zc.buildout',
         'grok',
         ],
+    entry_points = """
+    """
 )

Modified: Sandbox/darrylcousins/tfws.website/setup.py
===================================================================
--- Sandbox/darrylcousins/tfws.website/setup.py	2008-02-10 03:40:40 UTC (rev 83725)
+++ Sandbox/darrylcousins/tfws.website/setup.py	2008-02-10 04:34:15 UTC (rev 83726)
@@ -5,18 +5,18 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='tfws.website',
-    version='0.1',
-    author='Darryl Cousins',
-    author_email='darryl.cousins at tfws.org.nz',
-    url='http://www.tfws.org.nz/mars',
-    description="""\
+      version='0.1',
+      author='Darryl Cousins',
+      author_email='darryl.cousins at tfws.org.nz',
+      url='http://www.tfws.org.nz/mars',
+      description="""\
 This package uses ``martian`` and ``grok`` to build a simple web
 application on the ``zope3`` framework.""",
-    long_description=(
-        read('src/tfws/website/README.txt') +
+      long_description=(
+        read('tfws/website/README.txt') +
         read('CHANGES.txt')
         ),
-    classifiers = ['Development Status :: 1 - Planning',
+      classifiers = ['Development Status :: 1 - Planning',
                     'Intended Audience :: Developers',
                     'License :: Other/Proprietary License',
                     'Programming Language :: Python',
@@ -24,9 +24,10 @@
                     'Topic :: Software Development :: Build Tools',
                     'Framework :: Zope3',
                     ],
-    packages=find_packages(),
-    namespace_packages=['tfws'],
-    zip_safe=True,
+      packages=find_packages(),
+      namespace_packages=['tfws'],
+      include_package_data=True,
+      zip_safe=True,
       install_requires=['setuptools',
                         'lxml',
                         'grok',
@@ -50,6 +51,16 @@
                         'jquery.javascript',
                         'jquery.layer',
                         # Add extra requirements here
+                        'mars.adapter',
+                        'mars.contentprovider',
+                        'mars.form',
+                        'mars.layer',
+                        'mars.macro',
+                        'mars.resource',
+                        'mars.template',
+                        'mars.view',
+                        'mars.viewlet',
+
                         ],
       entry_points="""
       [paste.app_factory]