[llvm-commits] [zorg] r146770 - in /zorg/trunk/lnt: docs/intro.rst setup.py

[Daniel Dunbar]

Author: ddunbar
Date: Fri Dec 16 17:14:36 2011
New Revision: 146770

URL: http://llvm.org/viewvc/llvm-project?rev=146770&view=rev
Log:
lnt/setup: Update for complete Quixote removal.

Modified:
    zorg/trunk/lnt/docs/intro.rst
    zorg/trunk/lnt/setup.py

Modified: zorg/trunk/lnt/docs/intro.rst
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/docs/intro.rst?rev=146770&r1=146769&r2=146770&view=diff
==============================================================================
--- zorg/trunk/lnt/docs/intro.rst (original)
+++ zorg/trunk/lnt/docs/intro.rst Fri Dec 16 17:14:36 2011
@@ -95,9 +95,9 @@
 Architecture
 ------------
 
-The LNT web app is currently implemented as a WSGI web app on top of Quixote,
-along with some facilities from Werkzeug. My tentative plan is to move to Jinja
-for templating, and to move to a more AJAXy web interface.
+The LNT web app is currently implemented as a Flask WSGI web app, with Jinja2
+for the templating engine. My hope is to eventually move to a more AJAXy web
+interface.
 
 The database layer uses SQLAlchemy for its ORM, and is typically backed by
 SQLite, although I have tested on MySQL on the past, and supporting other

Modified: zorg/trunk/lnt/setup.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/setup.py?rev=146770&r1=146769&r2=146770&view=diff
==============================================================================
--- zorg/trunk/lnt/setup.py (original)
+++ zorg/trunk/lnt/setup.py Fri Dec 16 17:14:36 2011
@@ -3,7 +3,8 @@
 
 from setuptools import setup, find_packages
 
-# setuptools expects to be invoked from within the directory of setup.py, but it is nice to allow:
+# setuptools expects to be invoked from within the directory of setup.py, but it
+# is nice to allow:
 #   python path/to/setup.py install
 # to work (for scripts, etc.)
 os.chdir(os.path.dirname(os.path.abspath(__file__)))
@@ -24,7 +25,8 @@
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',
         'Intended Audience :: Developers',
-        'License :: OSI Approved :: University of Illinois/NCSA Open Source License',
+        ('License :: OSI Approved :: '
+         'University of Illinois/NCSA Open Source License'),
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Progamming Language :: Python',
@@ -35,18 +37,7 @@
     zip_safe = False,
 
     # Additional resource extensions we use.
-    #
-    # FIXME: Remove the .ptl entry once we move to Jinja. Note that the files
-    # most likely won't get byte compiled because of how permissions will be
-    # set, unless WSGI app has permissions to write to the install directory. I
-    # can't find a way to force setuptools to treat these as Python modules.
-    package_data = {'lnt.viewer': ['*.ptl',
-                                   'zview/*.ptl',
-                                   'js/*.js',
-                                   'resources/*.css',
-                                   'resources/*.js'],
-
-                    'lnt.server.ui': ['static/*.ico',
+    package_data = {'lnt.server.ui': ['static/*.ico',
                                       'static/*.js',
                                       'static/*.css',
                                       'templates/*.html'],
@@ -63,5 +54,5 @@
             'lnt = lnt.lnttool:main',
             ],
         },
-    install_requires=['Quixote==2.7b2', 'SQLAlchemy', 'Flask'],
+    install_requires=['SQLAlchemy', 'Flask'],
 )