Changeset 2389


Ignore:
Timestamp:
02/21/10 23:56:57 (4 years ago)
Author:
wehart
Message:

Merged revisions 2354-2388 via svnmerge from
 https://software.sandia.gov/svn/public/coopr/coopr.misc/trunk

........

r2368 | wehart | 2010-02-17 13:05:11 -0700 (Wed, 17 Feb 2010) | 7 lines


Adding a 'test.coopr' script, which can be used as follows:


test.coopr # test all coopr projects
test.coopr coopr.pyomo # test the specified project
test.coopr pyomo # test the specified project without

# retyping 'coopr'

........

r2377 | wehart | 2010-02-19 14:56:45 -0700 (Fri, 19 Feb 2010) | 3 lines


Extending functionality of this script to allow it be run in any
directory, but still test the Coopr installation that it is installed with.

........

r2384 | wehart | 2010-02-21 22:54:39 -0700 (Sun, 21 Feb 2010) | 6 lines


Updated coopr_install due to changes
in pyutilib.virtual that check to ensure that
urlopen() is called with the correct arguments.


Added a warning when installing with Python 2.4

........

Location:
coopr.misc/stable/2.2
Files:
4 edited
3 copied

Legend:

Unmodified
Added
Removed
  • coopr.misc/stable/2.2

  • coopr.misc/stable/2.2/setup.py

    r2078 r2389  
    6767      keywords=['optimization'], 
    6868      scripts=scripts, 
    69       namespace_packages=['coopr'] 
     69      namespace_packages=['coopr'], 
     70      entry_points=""" 
     71        [console_scripts] 
     72        test.coopr = coopr.misc.runtests:runCooprTests 
     73      """ 
    7074      ) 
    7175 
  • coopr.misc/stable/2.2/util/coopr.py

    r2312 r2389  
    3535                self.add_repository('coopr.'+pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/coopr.'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None)) 
    3636 
     37    def install_packages(self, options): 
     38        Installer.install_packages(self, options) 
     39        if sys.version_info[:2] < (2,5): 
     40            print "" 
     41            print "-----------------------------------------------------------------" 
     42            print " WARNING: Most Coopr packages will only work with Python 2.5 or" 
     43            print "          newer.  You have installed Coopr with:" 
     44            print sys.version 
     45            print "-----------------------------------------------------------------" 
     46 
     47            print "" 
    3748 
    3849def create_installer(): 
  • coopr.misc/stable/2.2/util/coopr_install

    r2354 r2389  
    27062706        #print versions 
    27072707    else: 
    2708         output = urllib2.urlopen(svndir, timeout=30).read() 
     2708        if sys.version_info[:2] <= (2,5): 
     2709            output = urllib2.urlopen(svndir).read() 
     2710        else: 
     2711            output = urllib2.urlopen(svndir, timeout=30).read() 
    27092712        if output=="": 
    27102713            return None 
     
    28362839                rootdir_output = commands.getoutput('svn ls ' + self.config.root) 
    28372840            else: 
    2838                 rootdir_output = urllib2.urlopen(self.config.root, timeout=30).read() 
     2841                if sys.version_info[:2] <= (2,5): 
     2842                    rootdir_output = urllib2.urlopen(self.config.root).read() 
     2843                else: 
     2844                    rootdir_output = urllib2.urlopen(self.config.root, timeout=30).read() 
    28392845            try: 
    28402846                self.trunk = self.config.root+'/trunk' 
     
    36413647                file = os.path.dirname(self.config_file)+"/"+file 
    36423648            try: 
    3643                 output = urllib2.urlopen(file, timeout=30).read() 
     3649                if sys.version_info[:2] <= (2,5): 
     3650                    output = urllib2.urlopen(file).read() 
     3651                else: 
     3652                    output = urllib2.urlopen(file, timeout=30).read() 
    36443653            except Exception, err: 
    36453654                print "Problems opening configuration url:",file 
     
    38553864                self.add_repository('coopr.'+pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/coopr.'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None)) 
    38563865 
     3866    def install_packages(self, options): 
     3867        Installer.install_packages(self, options) 
     3868        if sys.version_info[:2] < (2,5): 
     3869            print "" 
     3870            print "-----------------------------------------------------------------" 
     3871            print " WARNING: Most Coopr packages will only work with Python 2.5 or" 
     3872            print "          newer.  You have installed Coopr with:" 
     3873            print sys.version 
     3874            print "-----------------------------------------------------------------" 
     3875 
     3876            print "" 
    38573877 
    38583878def create_installer(): 
Note: See TracChangeset for help on using the changeset viewer.