Changeset 4793

Show
Ignore:
Timestamp:
06/21/08 02:03:50 (7 months ago)
Author:
chrisz
Message:

Clean-up in TG requirements

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.0/setup.py

    r4767 r4793  
    2323    "simplejson >= 1.3", 
    2424    "TurboCheetah >= 1.0", 
     25    # TurboJson >= 1.2 use PEAK-Rules 
    2526    "TurboJson >= 1.1.3, < 1.2", 
    2627    "TurboKid >= 1.0.4", 
    …… 
    3536 
    3637sqlobject = [ 
    37     "SQLObject >= 0.7.1" 
     38    "SQLObject >= 0.7.1", 
    3839] 
    3940 
    40 sqlalchemy = [ 
    41     "SQLAlchemy >= 0.3.10", 
     41if sys.version_info < (2, 4): 
     42    sqlalchemy = [ 
     43        # SQLAlchemy >= 0.5 does not support Py 2.3 
     44        "SQLAlchemy >= 0.3.10, < 0.5.0alpha", 
     45else: 
     46    sqlalchemy = [ 
     47        "SQLAlchemy >= 0.3.10", 
     48    ] 
     49 
     50testtools =  [ 
     51    "nose >= 0.9.3", 
    4252] 
    4353 
    44 testtools =  [ 
    45     "nose >= 0.9.3, <= 0.10.0a1", 
    46 ] 
     54tgtesttools = testtools + sqlalchemy 
    4755 
    48 tgtesttools =  [ 
    49     "nose >= 0.9.3, <= 0.10.0a1", 
    50     "SQLAlchemy >= 0.3.10", 
    51 ] 
    52  
    53 # python 2.5 compatible list 
    5456if sys.version_info < (2, 5): 
    5557    tgtesttools.extend([ 
    56         "pysqlite" 
     58            # Py < 2.5 does not include SQLite 
     59            "pysqlite", 
    5760        ]) 
    58 else: 
    59     # currently there are no extra requires for Python >= 2.5 
    60     # install_requires.extend([]) 
    61     pass 
    6261 
    6362 

  • branches/1.1/setup.py

    r4791 r4793  
    2323    "simplejson >= 1.9.1", 
    2424    "TurboCheetah >= 1.0", 
     25    # TurboJson < 1.2 use RuleDispatch 
    2526    "TurboJson >= 1.2", 
    2627    "tgMochiKit >= 0.1alpha", 
    …… 
    3233] 
    3334 
    34  
    35 if sys.version_info < (2, 5): 
    36     sqlobject = ["SQLObject >= 0.7.1, < 0.10.0"] 
    37 else: 
    38     sqlobject = ["SQLObject >= 0.8, <= 0.10.0"] 
     35sqlobject = [ 
     36    "SQLObject >= 0.7.1", 
     37] 
    3938 
    4039exp = ["TGFastData"] 
    …… 
    4847 
    4948testtools =  [ 
    50     "nose >= 0.9.3, <= 0.10.0a1", 
     49    "nose >= 0.9.3", 
    5150] 
    5251 
    53 tgtesttools =  [ 
    54     "nose >= 0.9.3, <= 0.10.0a1", 
    55 ] 
     52tgtesttools =  testtools 
    5653 
    57 # python 2.5 compatible list 
    5854if sys.version_info < (2, 5): 
    5955    tgtesttools.extend([ 
    60         "pysqlite" 
     56            # Py < 2.5 does not include SQLite 
     57            "pysqlite", 
    6158        ]) 
    62 else: 
    63     # currently there are no extra requires for Python >= 2.5 
    64     ##install_requires.extend([]) 
    65     pass 
    6659 
    6760