<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121207] branches/gsoc14-pip2port/pypi2port</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121207">121207</a></dd>
<dt>Author</dt> <dd>gaurav@macports.org</dd>
<dt>Date</dt> <dd>2014-06-19 23:15:32 -0700 (Thu, 19 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Updated executable</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc14pip2portpypi2port">branches/gsoc14-pip2port/pypi2port</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc14pip2portpypi2port"></a>
<div class="modfile"><h4>Modified: branches/gsoc14-pip2port/pypi2port (121206 => 121207)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc14-pip2port/pypi2port 2014-06-20 06:15:06 UTC (rev 121206)
+++ branches/gsoc14-pip2port/pypi2port 2014-06-20 06:15:32 UTC (rev 121207)
</span><span class="lines">@@ -131,6 +131,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def dependencies(pkg_name, pkg_version, deps=False):
</span><ins>+ flag = False
</ins><span class="cx"> if not deps:
</span><span class="cx"> return
</span><span class="cx"> values = client.release_urls(pkg_name, pkg_version)
</span><span class="lines">@@ -138,43 +139,46 @@
</span><span class="cx"> if not value['filename'].split('.')[-1] == 'gz':
</span><span class="cx"> fetch(pkg_name, value)
</span><span class="cx"> try:
</span><del>- with open('./sources/python/' + pkg_name + '/EGG-INFO/requires.txt') as f:
</del><ins>+ with open('./sources/python/' + pkg_name + '/EGG-INFO/requires.txt')
+ as f:
</ins><span class="cx"> list = f.readlines()
</span><span class="cx"> list = [x.strip('\n') for x in list]
</span><span class="cx"> f.close()
</span><span class="cx"> try:
</span><del>-# shutil.rmtree('./sources/python/' + pkg_name + '/EGG-INFO',
-# ignore_errors=True)
-# items = os.listdir('./sources/python/' + pkg_name)
-# for item in items[:]:
-# if not item.split('.')[-1] == 'gz':
-# os.remove('./sources/python/' + pkg_name + '/' + item)
-# items.remove(item)
- print ""
-
-# if not items:
-# os.rmdir('./sources/python/' + pkg_name)
</del><ins>+ if flag:
+ shutil.rmtree('./sources/python/' + pkg_name + '/EGG-INFO',
+ ignore_errors=True)
+ items = os.listdir('./sources/python/' + pkg_name)
+ for item in items[:]:
+ if not item.split('.')[-1] == 'gz':
+ os.remove('./sources/python/' + pkg_name + '/' + item)
+ items.remove(item)
+ if not items:
+ os.rmdir('./sources/python/' + pkg_name)
+ print ""
</ins><span class="cx"> except:
</span><del>- print ""
</del><ins>+ print ""
</ins><span class="cx"> return list
</span><span class="cx"> except:
</span><span class="cx"> try:
</span><del>-# shutil.rmtree('./sources/python/'+pkg_name+'/EGG-INFO',
-# ignore_errors=True)
-# items = os.listdir('./sources/python/'+pkg_name)
-# for item in items[:]:
-# if not item.split('.')[-1] == 'gz':
-# os.remove('./sources/python/'+pkg_name+'/'+item)
-# items.remove(item)
-# if not items:
-# os.rmdir('./sources/python/'+pkg_name)
- print ""
</del><ins>+ if flag:
+ shutil.rmtree('./sources/python/'+pkg_name+'/EGG-INFO',
+ ignore_errors=True)
+ items = os.listdir('./sources/python/'+pkg_name)
+ for item in items[:]:
+ if not item.split('.')[-1] == 'gz':
+ os.remove('./sources/python/'+pkg_name+'/'+item)
+ items.remove(item)
+ if not items:
+ os.rmdir('./sources/python/'+pkg_name)
+ print ""
</ins><span class="cx"> except:
</span><del>- print ""
</del><ins>+ print ""
</ins><span class="cx"> return False
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def checksums(pkg_name, pkg_version):
</span><ins>+ flag = False
</ins><span class="cx"> file_name = fetch_url(pkg_name, pkg_version, True)
</span><span class="cx"> print file_name
</span><span class="cx"> if file_name:
</span><span class="lines">@@ -186,9 +190,11 @@
</span><span class="cx"> checksums.insert(0, h.hexdigest())
</span><span class="cx"> checksums.insert(1, hashlib.sha256(f.read()).hexdigest())
</span><span class="cx"> dir = '/'.join(file_name.split('/')[0:-1])
</span><del>-# os.remove(file_name)
</del><ins>+ if flag:
+ os.remove(file_name)
</ins><span class="cx"> try:
</span><del>-# os.rmdir(dir)
</del><ins>+ if flag:
+ os.rmdir(dir)
</ins><span class="cx"> print
</span><span class="cx"> except OSError as ex:
</span><span class="cx"> print
</span><span class="lines">@@ -215,28 +221,32 @@
</span><span class="cx"> if license and not license == "UNKNOWN":
</span><span class="cx"> license = license.encode('utf-8')
</span><span class="cx"> license = license.split('\n')[0]
</span><del>- license = re.sub(r'[\[\]\{\}\;\:\$\t\"\'\`\=(--)]+',' ',license)
- license = re.sub(r'\s(\s)+',' ',license)
- license = re.sub(r'([A-Z]*)([a-z]*)([\s]*)([0-9]\.*[0-9]*)',r'\1\2-\4',license)
- license = re.sub(r'v-','-',license)
</del><ins>+ license = re.sub(r'[\[\]\{\}\;\:\$\t\"\'\`\=(--)]+', ' ', license)
+ license = re.sub(r'\s(\s)+', ' ', license)
+ license = re.sub(r'([A-Z]*)([a-z]*)([\s]*)([0-9]\.*[0-9]*)',
+ r'\1\2-\4', license)
+ license = re.sub(r'v-', '-', license)
</ins><span class="cx"> file.write('license {0}\n'.format(license))
</span><span class="cx"> else:
</span><del>- file.write('license {0}\n'.format(os.getenv('license','None')))
</del><ins>+ file.write('license {0}\n'.format(
+ os.getenv('license', 'None')))
</ins><span class="cx">
</span><span class="cx"> if dict['maintainer']:
</span><span class="cx"> maintainers = ' '.join(dict['maintainer'])
</span><del>- if not maintainers == "UNKNOWN":
</del><ins>+ if not maintainers == "UNKNOWN":
</ins><span class="cx"> file.write('maintainers {0}\n\n'.format(maintainers))
</span><span class="cx"> else:
</span><del>- file.write('maintainers {0}\n\n'.format(os.getenv('maintainer','nomaintainer')))
</del><ins>+ file.write('maintainers {0}\n\n'.format(
+ os.getenv('maintainer', 'nomaintainer')))
</ins><span class="cx"> else:
</span><del>- file.write('maintainers {0}\n\n'.format(os.getenv('maintainer','nomaintainer')))
</del><ins>+ file.write('maintainers {0}\n\n'.format(
+ os.getenv('maintainer', 'nomaintainer')))
</ins><span class="cx">
</span><span class="cx"> summary = dict['summary']
</span><span class="cx"> if summary:
</span><span class="cx"> summary = re.sub(r'[\[\]\{\}\;\:\$\t\"\'\`\=(--)]+',
</span><span class="cx"> ' ', summary)
</span><del>- summary = re.sub(r'\s(\s)+',' ',summary)
</del><ins>+ summary = re.sub(r'\s(\s)+', ' ', summary)
</ins><span class="cx"> sum_lines = textwrap.wrap(summary)
</span><span class="cx"> file.write('description ')
</span><span class="cx"> for sum_line in sum_lines:
</span><span class="lines">@@ -252,15 +262,16 @@
</span><span class="cx"> description = dict['description']
</span><span class="cx"> if description:
</span><span class="cx"> description = description.encode('utf-8')
</span><del>- description = re.sub(r'[\[\]\{\}\;\:\$\t\"\'\`\=(--)]+', ' ', description)
</del><ins>+ description = re.sub(r'[\[\]\{\}\;\:\$\t\"\'\`\=(--)]+',
+ ' ', description)
</ins><span class="cx"> description = re.sub(r'\s(\s)+', ' ', description)
</span><span class="cx"> lines = textwrap.wrap(description, width=70)
</span><span class="cx"> file.write('long_description ')
</span><span class="cx"> for line in lines:
</span><del>- if line and lines.index(line)<4:
</del><ins>+ if line and lines.index(line) < 4:
</ins><span class="cx"> if not lines.index(line) == 0:
</span><span class="cx"> file.write(' ')
</span><del>- if lines.index(line)>=3:
</del><ins>+ if lines.index(line) >= 3:
</ins><span class="cx"> file.write("{0}...\n".format(line))
</span><span class="cx"> elif line == lines[-1]:
</span><span class="cx"> file.write("{0}\n".format(line))
</span><span class="lines">@@ -269,19 +280,20 @@
</span><span class="cx"> else:
</span><span class="cx"> file.write('long_description ${description}\n\n')
</span><span class="cx"> home_page = dict['home_page']
</span><del>-
</del><ins>+
</ins><span class="cx"> if home_page and not home_page == 'UNKNOWN':
</span><span class="cx"> file.write('homepage {0}\n'.format(home_page))
</span><span class="cx"> else:
</span><del>- file.write('homepage {0}\n'.format(os.getenv('home_page','')))
-
</del><ins>+ file.write('homepage {0}\n'.format(
+ os.getenv('home_page', '')))
+
</ins><span class="cx"> try:
</span><span class="cx"> master_site = dict['release_url']
</span><span class="cx"> except:
</span><span class="cx"> if dict2:
</span><span class="cx"> master_site = '/'.join(dict2[0]['url'].split('/')[0:-1])
</span><span class="cx"> else:
</span><del>- master_site = os.getenv('master_site','')
</del><ins>+ master_site = os.getenv('master_site', '')
</ins><span class="cx"> if master_site:
</span><span class="cx"> file.write('master_sites {0}\n'.format(master_site))
</span><span class="cx"> master_site_exists = True
</span></span></pre>
</div>
</div>
</body>
</html>