ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/DAS/setup.py
(Generate patch)

Comparing COMP/DAS/setup.py (file contents):
Revision 1.3 by valya, Mon Feb 8 15:16:25 2010 UTC vs.
Revision 1.9 by valya, Fri Apr 30 16:44:44 2010 UTC

# Line 13 | Line 13 | from distutils.errors import DistutilsPl
13   from distutils.core import Extension
14   from distutils.command.install import INSTALL_SCHEMES
15  
16 + sys.path.append(os.path.join(os.getcwd(), 'src/python'))
17 + from DAS import version as das_version
18 +
19   requirements = []
20   try:
21      import xml.etree.cElementTree
# Line 27 | Line 30 | except ImportError:
30      requirements.append("pymongo")
31  
32   required_python_version = '2.6'
33 + required_pymongo_version = '1.6'
34  
35   if sys.platform == 'win32' and sys.version_info > (2, 6):
36     # 2.6's distutils.msvc9compiler can raise an IOError when failing to
# Line 82 | Line 86 | if "--no_ext" in sys.argv:
86   else:
87      features = {"c-ext": c_ext}
88  
89 <
86 < version      = "1.0.0" # need to define it somehow
89 > version      = das_version
90   name         = "DAS"
91   description  = "CMS Data Aggregation System"
92   readme       ="""
# Line 120 | Line 123 | def main():
123          print s % (name, version, required_python_version)
124          sys.exit(1)
125  
126 +    if  pymongo.version < required_pymongo_version:
127 +        s = "I'm sorry, but %s %s required pymongo %s or later."
128 +        print s % (name, version, required_pymongo_version)
129 +        sys.exit(1)
130 +
131      # set default location for "data_files" to
132      # platform specific "site-packages" location
133      for scheme in INSTALL_SCHEMES.values():

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines