[120971] branches/gsoc14-pip2port/tester.py
gaurav at macports.org
gaurav at macports.org
Fri Jun 13 00:10:05 PDT 2014
Revision: 120971
https://trac.macports.org/changeset/120971
Author: gaurav at macports.org
Date: 2014-06-13 00:10:05 -0700 (Fri, 13 Jun 2014)
Log Message:
-----------
Modified code as per the the coding standards
Modified Paths:
--------------
branches/gsoc14-pip2port/tester.py
Modified: branches/gsoc14-pip2port/tester.py
===================================================================
--- branches/gsoc14-pip2port/tester.py 2014-06-12 23:51:57 UTC (rev 120970)
+++ branches/gsoc14-pip2port/tester.py 2014-06-13 07:10:05 UTC (rev 120971)
@@ -92,28 +92,29 @@
file_name = src_dir + '/' + dict['filename']
u = urllib2.urlopen(url)
- f = open(file_name,'wb')
- meta = u.info()
- file_size = int(meta.getheaders("Content-Length")[0])
+# f = open(file_name,'wb')
+ with open(file_name,'wb') as f:
+ meta = u.info()
+ file_size = int(meta.getheaders("Content-Length")[0])
- widgets = ['Fetching: ', Percentage(), ' ', Bar(marker=RotatingMarker(),left='[',right=']'), ' ', ETA(), ' ', FileTransferSpeed()]
- pbar = ProgressBar(widgets=widgets, maxval=int(file_size))
- pbar.start()
+ widgets = ['Fetching: ', Percentage(), ' ', Bar(marker=RotatingMarker(),left='[',right=']'), ' ', ETA(), ' ', FileTransferSpeed()]
+ pbar = ProgressBar(widgets=widgets, maxval=int(file_size))
+ pbar.start()
- file_size_dl = 0
- block_sz = 1024
- while True:
- buffer = u.read(block_sz)
- if not buffer:
- break
+ file_size_dl = 0
+ block_sz = 1024
+ while True:
+ buffer = u.read(block_sz)
+ if not buffer:
+ break
- file_size_dl += len(buffer)
- f.write(buffer)
- pbar.update(file_size_dl)
+ file_size_dl += len(buffer)
+ f.write(buffer)
+ pbar.update(file_size_dl)
- pbar.finish()
- print
- f.close()
+ pbar.finish()
+ print
+# f.close()
checksum_md5_calc = hashlib.md5(open(file_name).read()).hexdigest()
if str(checksum_md5) == str(checksum_md5_calc):
@@ -160,9 +161,10 @@
if not value['filename'].split('.')[-1] == 'gz':
fetch(pkg_name,value)
try:
- f = open('./sources/'+pkg_name+'/EGG-INFO/requires.txt')
- list = f.readlines()
- list = [x.strip('\n') for x in list]
+ # f = open('./sources/'+pkg_name+'/EGG-INFO/requires.txt')
+ with open('./sources/'+pkg_name+'/EGG-INFO/requires.txt') as f:
+ list = f.readlines()
+ list = [x.strip('\n') for x in list]
f.close()
try:
shutil.rmtree('./sources/'+pkg_name+'/EGG-INFO', ignore_errors=True)
@@ -199,11 +201,12 @@
checksums = []
try:
h = hashlib.new('ripemd160')
- f = open(file_name)
- h.update(f.read())
- checksums.insert(0,h.hexdigest())
- checksums.insert(1,hashlib.sha256(f.read()).hexdigest())
- f.close()
+# f = open(file_name)
+ with open(file_name) as f:
+ h.update(f.read())
+ checksums.insert(0,h.hexdigest())
+ checksums.insert(1,hashlib.sha256(f.read()).hexdigest())
+# f.close()
dir = '/'.join(file_name.split('/')[0:-1])
os.remove(file_name)
try:
@@ -217,106 +220,105 @@
def create_portfile(dict,file_name,dict2):
- file = open(file_name, 'w')
+# file = open(file_name, 'w')
+ with open(file_name, 'w') as file:
+ file.write('# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4\n')
+ file.write('# $Id$\n\n')
+ file.write('PortSystem 1.0\n')
+ file.write('PortGroup python 1.0\n\n')
- file.write('# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4\n')
- file.write('# $Id$\n\n')
- file.write('PortSystem 1.0\n')
- file.write('PortGroup python 1.0\n\n')
+ file.write('name {0}\n'.format(dict['name']))
+ file.write('version {0}\n'.format(dict['version']))
+# file.write('categories-append replaceme\n\n')
- file.write('name '+dict['name']+'\n')
- file.write('version '+dict['version']+'\n')
-# file.write('categories-append replaceme\n\n')
-
- file.write('platforms darwin\n')
- license = dict['license']
- if license:
- license = license.encode('utf-8')
- file.write('license '+license+'\n')
- else:
- file.write('license None\n')
+ file.write('platforms darwin\n')
+ license = dict['license']
+ if license:
+ license = license.encode('utf-8')
+ file.write('license {0}\n'.format(license))
+ else:
+ file.write('license None\n')
- if dict['maintainer']:
- file.write('maintainers ' + ' '.join(dict['maintainer']) + '\n\n')
- else:
- file.write('maintainers nomaintainer\n\n')
+ if dict['maintainer']:
+ file.write('maintainers {0}\n\n'.format(' '.join(dict['maintainer'])))
+ else:
+ file.write('maintainers nomaintainer\n\n')
- summary = dict['summary']
- if summary:
- summary = re.sub(r'[\[\]\{\}\;\:\$\t\"\'\`]',' ',summary)
- sum_lines = textwrap.wrap(summary,width=70)
- file.write('description ')
- for sum_line in sum_lines:
- if sum_line:
- if not sum_lines.index(sum_line)==0:
- file.write(' ')
- if sum_line == sum_lines[-1]:
- file.write(sum_line+"\n")
- else:
- file.write(sum_line + " \\\n")
- else:
- file.write('description None\n\n')
-# file.write('description '+dict['summary']+'\n\n')
-# file.write('description '+summary+'\n\n')
-# file.write('long_description '+dict['description']+'\n\n')
- description = dict['description']
- if description:
- description = description.encode('utf-8')
- description = re.sub(r'[\[\]\{\}\;\:\$\t\"\'\`]',' ',description)
-# lines = textwrap.wrap(dict['description'],width=70)
- lines = textwrap.wrap(description,width=70)
- file.write('long_description ')
- for line in lines:
- if line:
- if not lines.index(line)==0:
- file.write(' ')
- if line == lines[-1]:
- file.write(line+"\n")
- else:
- file.write(line + " \\\n")
- else:
- file.write('long_description '+'${description}'+'\n\n')
+ summary = dict['summary']
+ if summary:
+ summary = re.sub(r'[\[\]\{\}\;\:\$\t\"\'\`]',' ',summary)
+ sum_lines = textwrap.wrap(summary,width=70)
+ file.write('description ')
+ for sum_line in sum_lines:
+ if sum_line:
+ if not sum_lines.index(sum_line)==0:
+ file.write(' ')
+ if sum_line == sum_lines[-1]:
+ file.write("{0}\n".format(sum_line))
+ else:
+ file.write("{0} \\\n".format(sum_line))
+ else:
+ file.write('description None\n\n')
+# file.write('description '+dict['summary']+'\n\n')
+# file.write('description '+summary+'\n\n')
+# file.write('long_description '+dict['description']+'\n\n')
+ description = dict['description']
+ if description:
+ description = description.encode('utf-8')
+ description = re.sub(r'[\[\]\{\}\;\:\$\t\"\'\`]',' ',description)
+# lines = textwrap.wrap(dict['description'],width=70)
+ lines = textwrap.wrap(description,width=70)
+ file.write('long_description ')
+ for line in lines:
+ if line:
+ if not lines.index(line)==0:
+ file.write(' ')
+ if line == lines[-1]:
+ file.write("{0}\n".format(line))
+ else:
+ file.write("{0} \\\n".format(line))
+ else:
+ file.write('long_description ${description}\n\n')
- file.write('homepage '+dict['home_page']+'\n')
+ file.write('homepage {0}\n'.format(dict['home_page']))
- if dict2:
- master_site = '/'.join(dict2[0]['url'].split('/')[0:-1])
- else:
- master_site = ''
- file.write('master_sites '+master_site+'\n')
- file.write('distname py-'+dict['name']+dict['version']+'\n\n')
-# rmd160 = checksum_rmd160(dict['name'],dict['version'])
-# sha256 = checksum_sha256(dict['name'],dict['version'])
- checksums_values = checksums(dict['name'],dict['version'])
-# if rmd160 and sha256:
- if checksums_values:
- file.write('checksums rmd160 '+checksums_values[0]+' \\\n')
- file.write(' sha256 '+checksums_values[1]+'\n\n')
+ if dict2:
+ master_site = '/'.join(dict2[0]['url'].split('/')[0:-1])
+ else:
+ master_site = ''
+ file.write('master_sites {0}\n'.format(master_site))
+ file.write('distname py-{0}{1}\n\n'.format(dict['name'],dict['version']))
+# rmd160 = checksum_rmd160(dict['name'],dict['version'])
+# sha256 = checksum_sha256(dict['name'],dict['version'])
+ checksums_values = checksums(dict['name'],dict['version'])
+# if rmd160 and sha256:
+ if checksums_values:
+ file.write('checksums rmd160 {0} \\ \n'.format(checksums_values[0]))
+ file.write(' sha256 {0}\n\n'.format(checksums_values[1]))
- python_vers = dict['requires_python']
- if python_vers:
- file.write('python.versions 25 26 27 '+dict['requires_python']+'\n\n')
- else:
- file.write('python.versions 25 26 27\n\n')
+ python_vers = dict['requires_python']
+ if python_vers:
+ file.write('python.versions 25 26 27 {0}\n\n'.format(dict['requires_python']))
+ else:
+ file.write('python.versions 25 26 27\n\n')
- file.write('if {${name} ne ${subport}} {\n')
- file.write(' depends_build port:py${python.version}-setuptools\n')
- deps = dependencies(dict['name'],dict['version'],True)
- if deps:
- for dep in deps:
- file.write(' port:py-'+dep+'\n')
- file.write('\n')
- file.write(' livecheck.type none\n')
- file.write('} else {\n')
- file.write(' livecheck.type regex\n')
- file.write(' livecheck.url ${master_sites}\n')
-# file.write(' livecheck.regex \n')
- file.write('}\n')
+ file.write('if {${name} ne ${subport}} {\n')
+ file.write(' depends_build port:py${python.version}-setuptools\n')
+ deps = dependencies(dict['name'],dict['version'],True)
+ if deps:
+ for dep in deps:
+ file.write(' port:py-{0}\n'.format(dep))
+ file.write('\n')
+ file.write(' livecheck.type none\n')
+ file.write('} else {\n')
+ file.write(' livecheck.type regex\n')
+ file.write(' livecheck.url ${master_sites}\n')
+# file.write(' livecheck.regex \n')
+ file.write('}\n')
-# file.write(' post-destroot {\n')
+# file.write(' post-destroot {\n')
- file.close()
def print_portfile(pkg_name,pkg_version=None):
@@ -356,7 +358,7 @@
dest='packages_data', nargs='*', type=str,
help='Releases data for a package by <package_name>')
parser.add_argument('-f', '--fetch', action='store', type=str,
- dest='package_fetch', nargs=2, required=False,
+ dest='package_fetch', nargs='*', required=False,
help='Fetches distfiles for a package by <package_name> and <package_version>')
parser.add_argument('-p', '--portfile', action='store', type=str,
dest='package_portfile', nargs='*', required=False,
@@ -391,9 +393,12 @@
pkg_version = options.package_fetch[1]
fetch_url(pkg_name,pkg_version)
else:
- if client.package_releases(pkg_name):
- pkg_version = client.packages_releases(pkg_name)[0]
+ releases = client.package_releases(pkg_name)
+ if releases:
+ pkg_version = releases[0]
fetch_url(pkg_name,pkg_version)
+ else:
+ print "No release found\n"
return
if options.package_portfile:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140613/23adac87/attachment-0001.html>
More information about the macports-changes
mailing list