Changeset 57

Show
Ignore:
Timestamp:
07/25/07 20:37:52 (1 year ago)
Author:
edsuom
Message:

Updated sAsync to use asynqueue package instead of twisted_goodies.taskqueue; updated ez_setup.py scripts for all projects

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • projects/AsynCluster/trunk/ez_setup.py

    r15 r57  
    1515""" 
    1616import sys 
    17 DEFAULT_VERSION = "0.6c5
     17DEFAULT_VERSION = "0.6c6
    1818DEFAULT_URL     = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3] 
    1919 
     
    4040    'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64', 
    4141    'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d', 
     42    'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20', 
     43    'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab', 
     44    'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53', 
    4245} 
    4346 
  • projects/sAsync/trunk/ez_setup.py

    r3 r57  
    1515""" 
    1616import sys 
    17 DEFAULT_VERSION = "0.6b3
     17DEFAULT_VERSION = "0.6c6
    1818DEFAULT_URL     = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3] 
    1919 
     
    2525    'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618', 
    2626    'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac', 
    27     'setuptools-0.6b3dev_r46791-py2.3.egg': 'e765a29566575ffac5d81cdf0c6f8db9', 
    28     'setuptools-0.6b3dev_r46791-py2.4.egg': 'd249c022ed029ad60d134bd998adc880', 
     27    'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5', 
     28    'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4', 
     29    'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c', 
     30    'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b', 
     31    'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27', 
     32    'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277', 
     33    'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa', 
     34    'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e', 
     35    'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e', 
     36    'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f', 
     37    'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2', 
     38    'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc', 
     39    'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167', 
     40    'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64', 
     41    'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d', 
     42    'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20', 
     43    'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab', 
     44    'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53', 
    2945} 
    3046 
     
    7692        pkg_resources.require("setuptools>="+version) 
    7793 
    78     except pkg_resources.VersionConflict
     94    except pkg_resources.VersionConflict, e
    7995        # XXX could we install in a subprocess here? 
    8096        print >>sys.stderr, ( 
    8197            "The required version of setuptools (>=%s) is not available, and\n" 
    8298            "can't be installed while this script is running. Please install\n" 
    83             " a more recent version first.
    84         ) % version 
     99            " a more recent version first.\n\n(Currently using %r)
     100        ) % (version, e.args[0]) 
    85101        sys.exit(2) 
    86102 
     
    138154        import setuptools 
    139155    except ImportError: 
    140         import tempfile, shutil 
    141         tmpdir = tempfile.mkdtemp(prefix="easy_install-") 
     156        egg = None 
    142157        try: 
    143             egg = download_setuptools(version, to_dir=tmpdir, delay=0) 
     158            egg = download_setuptools(version, delay=0) 
    144159            sys.path.insert(0,egg) 
    145160            from setuptools.command.easy_install import main 
    146161            return main(list(argv)+[egg])   # we're done here 
    147162        finally: 
    148             shutil.rmtree(tmpdir) 
     163            if egg and os.path.exists(egg): 
     164                os.unlink(egg) 
    149165    else: 
    150166        if setuptools.__version__ == '0.0.1': 
  • projects/sAsync/trunk/sasync/database.py

    r56 r57  
    2929from twisted.python import failure 
    3030import sqlalchemy as SA 
    31  
    32 import asynqueue 
     31from asynqueue import ThreadQueue 
     32 
    3333import misc 
    3434 
     
    246246        """ 
    247247        def newQueue(): 
    248             queue = taskqueue.ThreadQueue(1) 
     248            queue = ThreadQueue(1) 
    249249            self.running = True 
    250250            self.queues[key] = queue 
  • projects/sAsync/trunk/sasync/test/mock.py

    r3 r57  
    2828import zope.interface 
    2929from twisted.internet import reactor, defer 
    30 from twisted_goodies import taskqueue 
     30from asynqueue import IWorker 
    3131 
    3232 
     
    5252 
    5353class MockWorker(object): 
    54     zope.interface.implements(taskqueue.IWorker) 
     54    zope.interface.implements(IWorker) 
    5555 
    5656    def __init__(self, runDelay=0.0): 
  • projects/sAsync/trunk/sasync/__init__.py

    r3 r57  
    1010Twisted framework and its deferred processing capabilities. 
    1111 
    12 Copyright (C) 2006 by Edwin A. Suominen, U{http://www.eepatents.com}. 
     12Copyright (C) 2006-2007 by Edwin A. Suominen, U{http://www.eepatents.com} 
    1313 
    1414 
     
    2828write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
    2929Boston, MA 02110-1301, USA. 
    30  
    31 I{Note:} the L{taskqueue} module and its unit test module are distributed under 
    32 a variant of the MIT license rather than the GPL in order to be suitable for 
    33 inclusion in the Twisted codebase. 
    3430 
    3531 
  • projects/sAsync/trunk/setup.py

    r5 r57  
    3434 
    3535### Define requirements 
    36 required = ['SQLAlchemy>=0.3', 'Twisted-Goodies>=0.3'] 
     36required = ['SQLAlchemy>=0.3', 'AsynQueue'] 
    3737 
    3838 
  • projects/Twisted-Goodies/trunk/ez_setup.py

    r2 r57  
    1515""" 
    1616import sys 
    17 DEFAULT_VERSION = "0.6c5
     17DEFAULT_VERSION = "0.6c6
    1818DEFAULT_URL     = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3] 
    1919 
     
    4040    'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64', 
    4141    'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d', 
     42    'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20', 
     43    'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab', 
     44    'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53', 
    4245} 
    4346 
  • projects/Twisted-Goodies/trunk/misc/var_www_foss.tellectual.com_index.py

    r51 r57  
    4141     evolutionary computing tools that make use of the asynchronous 
    4242     node processing. 
     43     """), 
     44 
     45    ("AsynQueue", 
     46     """ 
     47     Asynchronous task queueing based on the Twisted framework, with task 
     48     prioritization and a powerful worker/manager interface. 
    4349     """), 
    4450 
  • projects/Twisted-Goodies/trunk/twisted_goodies/simpleserver/http/resources.py

    r50 r57  
    306306 
    307307__all__ = [ 
    308     'T', 'TracResource', 'StanResource', 'ProxyResource', 'APIDocResource'] 
     308    'T', 'StanResource', 
     309    'TracResource', 'ProxyResource', 'APIDocResource']