Changeset 2312
- Timestamp:
- Feb 11, 2010 11:26:25 AM (11 years ago)
- Location:
- coopr.misc/stable/2.2
- Files:
-
- 5 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
coopr.misc/stable/2.2
- Property svnmerge-integrated changed
/coopr.misc/trunk merged: 2273,2276,2282,2286,2294
- Property svnmerge-integrated changed
-
coopr.misc/stable/2.2/scripts/pyro_mip_server
r2043 r2312 35 35 raise ValueError, "Problem constructing solver `"+data.opt+"'" 36 36 opt.mipgap = data.mipgap 37 opt.suffixes = data.suffixes 37 38 38 39 # here is where we should set any options required by the solver, available -
coopr.misc/stable/2.2/util/README.txt
r1893 r2312 1 1 The coopr_install script is created by executing: 2 2 3 vpy_create coopr.py coopr_install3 lbin vpy_create coopr.py coopr_install 4 4 5 5 The vpy_create command is provided by the pyutilib.virtualenv package. -
coopr.misc/stable/2.2/util/coopr.py
r2191 r2312 31 31 continue 32 32 if sys.version_info < (2,6,4): 33 self.add_repository( pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))33 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)) 34 34 else: 35 self.add_repository( pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))35 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)) 36 36 37 37 -
coopr.misc/stable/2.2/util/coopr_install
r2191 r2312 2606 2606 # 2607 2607 2608 import commands 2608 2609 import re 2609 2610 import urllib2 … … 2616 2617 import errno 2617 2618 import stat 2619 2620 using_subversion = True 2618 2621 2619 2622 # … … 2691 2694 # 2692 2695 def guess_release(svndir): 2693 output = urllib2.urlopen(svndir).read() 2694 if output=="": 2695 return None 2696 links = re.findall('\<li>\<a href[^>]+>[^\<]+\</a>',output) 2697 versions = [] 2698 for link in links: 2699 versions.append( re.split('>', link[:-5])[-1] ) 2696 if using_subversion: 2697 output = commands.getoutput('svn ls '+svndir) 2698 if output=="": 2699 return None 2700 #print output 2701 versions = [] 2702 for link in re.split('/',output.strip()): 2703 tmp = link.strip() 2704 if tmp != '': 2705 versions.append( tmp ) 2706 #print versions 2707 else: 2708 output = urllib2.urlopen(svndir, timeout=30).read() 2709 if output=="": 2710 return None 2711 links = re.findall('\<li>\<a href[^>]+>[^\<]+\</a>',output) 2712 versions = [] 2713 for link in links: 2714 versions.append( re.split('>', link[:-5])[-1] ) 2700 2715 latest = None 2701 2716 latest_str = None … … 2818 2833 def guess_versions(self, offline=False): 2819 2834 if not self.config.root is None: 2835 if using_subversion: 2836 rootdir_output = commands.getoutput('svn ls ' + self.config.root) 2837 else: 2838 rootdir_output = urllib2.urlopen(self.config.root, timeout=30).read() 2820 2839 try: 2821 2840 self.trunk = self.config.root+'/trunk' … … 2825 2844 self.trunk_root = None 2826 2845 try: 2827 if offline :2846 if offline or not 'stable' in rootdir_output: 2828 2847 raise IOError 2829 2848 self.stable = guess_release(self.config.root+'/stable') … … 2833 2852 self.stable_root = None 2834 2853 try: 2835 if offline :2854 if offline or not 'releases' in rootdir_output: 2836 2855 raise IOError 2837 2856 self.release = guess_release(self.config.root+'/releases') … … 2840 2859 except (urllib2.HTTPError,IOError): 2841 2860 try: 2842 if offline :2861 if offline or not 'tags' in rootdir_output: 2843 2862 raise IOError 2844 2863 self.release = guess_release(self.config.root+'/tags') … … 3619 3638 parser.readfp(fp, '<default configuration>') 3620 3639 elif not os.path.exists(file): 3640 if not '/' in file and not self.config_file is None: 3641 file = os.path.dirname(self.config_file)+"/"+file 3621 3642 try: 3622 output = urllib2.urlopen(file ).read()3643 output = urllib2.urlopen(file, timeout=30).read() 3623 3644 except Exception, err: 3624 3645 print "Problems opening configuration url:",file … … 3830 3851 continue 3831 3852 if sys.version_info < (2,6,4): 3832 self.add_repository( pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))3853 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)) 3833 3854 else: 3834 self.add_repository( pkg, root='https://projects.coin-or.org/svn/CoinBazaar/projects/'+pkg, dev=True, username=os.environ.get('COINOR_USERNAME',None))3855 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)) 3835 3856 3836 3857
Note: See TracChangeset
for help on using the changeset viewer.