Changeset 5:755b1aa778e0

Show
Ignore:
Timestamp:
11/15/06 13:27:21 (2 years ago)
Author:
James Taylor <james@bx.psu.edu>
branch:
default
convert_revision:
svn:9bcadc22-80f8-0310-8a53-c8f022958886/galaxy/trunk@1227
Message:

Cleaning up modules. Still a few stragglers that can't be easily eggified.
EVERYTHING we depend on should eventually be under the galaxy module or
packaged in eggs to avoid namespace problems.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • lib/galaxy/util/__init__.py

    r4 r5  
    1010pkg_resources.require( 'docutils' ) 
    1111import docutils.core 
     12from galaxy.util.docutils_ext.htmlfrag import Writer as HTMLFragWriter 
    1213 
    1314pkg_resources.require( 'elementtree' ) 
    …… 
    206207            if len( str ) > 0 and not str.isspace(): 
    207208                log.warn( str ) 
    208     return docutils.core.publish_string( s, writer_name="htmlfrag", settings_overrides=dict( warning_stream=FakeStream() ) ) 
     209    return docutils.core.publish_string( s, writer=HTMLFragWriter(), settings_overrides=dict( warning_stream=FakeStream() ) ) 
    209210 
    210211def xml_text(root, name): 

  • nosetests.sh

    r3 r5  
    1818echo "python path: $PYTHONPATH" 
    1919 
    20 python2.4 nosetests.py $@ 
     20python2.4 ./scripts/nosetests.py $@ 

  • run.sh

    r3 r5  
    1818echo "python path: $PYTHONPATH" 
    1919 
    20 python2.4 paster.py serve universe_wsgi.ini $@ 
     20python2.4 ./scripts/paster.py serve universe_wsgi.ini $@