hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [14/14] hadoop git commit: HADOOP-12204. releasedocmaker should pass pylint (Kengo Seki via aw)
Date Thu, 30 Jul 2015 01:27:44 GMT
HADOOP-12204. releasedocmaker should pass pylint (Kengo Seki via aw)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/42d0c0fa
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/42d0c0fa
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/42d0c0fa

Branch: refs/heads/HADOOP-12111
Commit: 42d0c0fac1c2b9d1822193762512e86a442ee08e
Parents: 3d80b51
Author: Allen Wittenauer <aw@apache.org>
Authored: Wed Jul 29 18:27:21 2015 -0700
Committer: Allen Wittenauer <aw@apache.org>
Committed: Wed Jul 29 18:27:21 2015 -0700

----------------------------------------------------------------------
 dev-support/releasedocmaker.py | 1015 ++++++++++++++++++-----------------
 1 file changed, 511 insertions(+), 504 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/42d0c0fa/dev-support/releasedocmaker.py
----------------------------------------------------------------------
diff --git a/dev-support/releasedocmaker.py b/dev-support/releasedocmaker.py
index c59ae99..37bd58a 100755
--- a/dev-support/releasedocmaker.py
+++ b/dev-support/releasedocmaker.py
@@ -19,21 +19,20 @@
 from glob import glob
 from optparse import OptionParser
 from time import gmtime, strftime
-import pprint
 import os
 import re
 import sys
 import urllib
 import urllib2
 try:
-  import json
+    import json
 except ImportError:
-  import simplejson as json
+    import simplejson as json
 
-releaseVersion={}
-namePattern = re.compile(r' \([0-9]+\)')
+RELEASE_VERSION = {}
+NAME_PATTERN = re.compile(r' \([0-9]+\)')
 
-asflicense='''
+ASF_LICENSE = '''
 <!---
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -53,524 +52,532 @@ asflicense='''
 -->
 '''
 
-def clean(str):
-  return tableclean(re.sub(namePattern, "", str))
+def clean(_str):
+    return tableclean(re.sub(NAME_PATTERN, "", _str))
 
-def formatComponents(str):
-  str = re.sub(namePattern, '', str).replace("'", "")
-  if str != "":
-    ret = str
-  else:
-    # some markdown parsers don't like empty tables
-    ret = "."
-  return clean(ret)
+def format_components(_str):
+    _str = re.sub(NAME_PATTERN, '', _str).replace("'", "")
+    if _str != "":
+        ret = _str
+    else:
+        # some markdown parsers don't like empty tables
+        ret = "."
+    return clean(ret)
 
 # convert to utf-8
 # protect some known md metachars
 # or chars that screw up doxia
-def tableclean(str):
-  str=str.encode('utf-8')
-  str=str.replace("_","\_")
-  str=str.replace("\r","")
-  str=str.rstrip()
-  return str
+def tableclean(_str):
+    _str = _str.encode('utf-8')
+    _str = _str.replace("_", r"\_")
+    _str = _str.replace("\r", "")
+    _str = _str.rstrip()
+    return _str
 
 # same thing as tableclean,
 # except table metachars are also
 # escaped as well as more
 # things we don't want doxia to
 # screw up
-def notableclean(str):
-  str=tableclean(str)
-  str=str.replace("|","\|")
-  str=str.replace("<","\<")
-  str=str.replace(">","\>")
-  str=str.replace("*","\*")
-  str=str.rstrip()
-  return str
+def notableclean(_str):
+    _str = tableclean(_str)
+    _str = _str.replace("|", r"\|")
+    _str = _str.replace("<", r"\<")
+    _str = _str.replace(">", r"\>")
+    _str = _str.replace("*", r"\*")
+    _str = _str.rstrip()
+    return _str
 
 # clean output dir
-def cleanOutputDir(dir):
-    files = os.listdir(dir)
+def clean_output_dir(directory):
+    files = os.listdir(directory)
     for name in files:
-        os.remove(os.path.join(dir,name))
-    os.rmdir(dir)
+        os.remove(os.path.join(directory, name))
+    os.rmdir(directory)
 
 def mstr(obj):
-  if (obj is None):
-    return ""
-  return unicode(obj)
-
-def buildindex(title,license):
-  versions=reversed(sorted(glob("[0-9]*.[0-9]*.[0-9]*")))
-  with open("index.md","w") as indexfile:
-    if license is True:
-      indexfile.write(asflicense)
-    for v in versions:
-      indexfile.write("* %s v%s\n" % (title,v))
-      for k in ("Changes","Release Notes"):
-        indexfile.write("    * %s (%s/%s.%s.html)\n" \
-          % (k,v,k.upper().replace(" ",""),v))
-  indexfile.close()
-
-class GetVersions:
-  """ yo """
-  def __init__(self,versions, projects):
-    versions = versions
-    projects = projects
-    self.newversions = []
-    pp = pprint.PrettyPrinter(indent=4)
-    at=0
-    end=1
-    count=100
-    versions.sort()
-    print "Looking for %s through %s"%(versions[0],versions[-1])
-    for p in projects:
-      resp = urllib2.urlopen("https://issues.apache.org/jira/rest/api/2/project/%s/versions"%p)
-      data = json.loads(resp.read())
-      for d in data:
-        if d['name'][0].isdigit and versions[0] <= d['name'] and d['name'] <= versions[-1]:
-          print "Adding %s to the list" % d['name']
-          self.newversions.append(d['name'])
-    newlist=list(set(self.newversions))
-    self.newversions=newlist
-
-  def getlist(self):
-      pp = pprint.PrettyPrinter(indent=4)
-      return(self.newversions)
-
-class Version:
-  """Represents a version number"""
-  def __init__(self, data):
-    self.mod = False
-    self.data = data
-    found = re.match('^((\d+)(\.\d+)*).*$', data)
-    if (found):
-      self.parts = [ int(p) for p in found.group(1).split('.') ]
-    else:
-      self.parts = []
-    # backfill version with zeroes if missing parts
-    self.parts.extend((0,) * (3 - len(self.parts)))
-
-  def __str__(self):
-    if (self.mod):
-      return '.'.join([ str(p) for p in self.parts ])
-    return self.data
-
-  def __cmp__(self, other):
-    return cmp(self.parts, other.parts)
-
-class Jira:
-  """A single JIRA"""
-
-  def __init__(self, data, parent):
-    self.key = data['key']
-    self.fields = data['fields']
-    self.parent = parent
-    self.notes = None
-    self.incompat = None
-    self.reviewed = None
-
-  def getId(self):
-    return mstr(self.key)
-
-  def getDescription(self):
-    return mstr(self.fields['description'])
-
-  def getReleaseNote(self):
-    if (self.notes is None):
-      field = self.parent.fieldIdMap['Release Note']
-      if (self.fields.has_key(field)):
-        self.notes=mstr(self.fields[field])
-      else:
-        self.notes=self.getDescription()
-    return self.notes
-
-  def getPriority(self):
-    ret = ""
-    pri = self.fields['priority']
-    if(pri is not None):
-      ret = pri['name']
-    return mstr(ret)
-
-  def getAssignee(self):
-    ret = ""
-    mid = self.fields['assignee']
-    if(mid is not None):
-      ret = mid['displayName']
-    return mstr(ret)
-
-  def getComponents(self):
-    if (len(self.fields['components'])>0):
-      return ", ".join([ comp['name'] for comp in self.fields['components'] ])
-    else:
-      return ""
-
-  def getSummary(self):
-    return self.fields['summary']
-
-  def getType(self):
-    ret = ""
-    mid = self.fields['issuetype']
-    if(mid is not None):
-      ret = mid['name']
-    return mstr(ret)
-
-  def getReporter(self):
-    ret = ""
-    mid = self.fields['reporter']
-    if(mid is not None):
-      ret = mid['displayName']
-    return mstr(ret)
-
-  def getProject(self):
-    ret = ""
-    mid = self.fields['project']
-    if(mid is not None):
-      ret = mid['key']
-    return mstr(ret)
-
-  def __cmp__(self,other):
-    selfsplit=self.getId().split('-')
-    othersplit=other.getId().split('-')
-    v1=cmp(selfsplit[0],othersplit[0])
-    if (v1!=0):
-      return v1
-    else:
-      if selfsplit[1] < othersplit[1]:
+    if obj is None:
+        return ""
+    return unicode(obj)
+
+def buildindex(title, asf_license):
+    versions = reversed(sorted(glob("[0-9]*.[0-9]*.[0-9]*")))
+    with open("index.md", "w") as indexfile:
+        if asf_license is True:
+            indexfile.write(ASF_LICENSE)
+        for version in versions:
+            indexfile.write("* %s v%s\n" % (title, version))
+            for k in ("Changes", "Release Notes"):
+                indexfile.write("    * %s (%s/%s.%s.html)\n" \
+                    % (k, version, k.upper().replace(" ", ""), version))
+    indexfile.close()
+
+class GetVersions(object):
+    """ yo """
+    def __init__(self, versions, projects):
+        versions = versions
+        projects = projects
+        self.newversions = []
+        versions.sort()
+        print "Looking for %s through %s"%(versions[0], versions[-1])
+        for project in projects:
+            url = "https://issues.apache.org/jira/rest/api/2/project/%s/versions" % project
+            resp = urllib2.urlopen(url)
+            datum = json.loads(resp.read())
+            for data in datum:
+                name = data['name']
+                if name[0].isdigit and versions[0] <= name and name <= versions[-1]:
+                    print "Adding %s to the list" % name
+                    self.newversions.append(name)
+        newlist = list(set(self.newversions))
+        self.newversions = newlist
+
+    def getlist(self):
+        return self.newversions
+
+class Version(object):
+    """Represents a version number"""
+    def __init__(self, data):
+        self.mod = False
+        self.data = data
+        found = re.match(r'^((\d+)(\.\d+)*).*$', data)
+        if found:
+            self.parts = [int(p) for p in found.group(1).split('.')]
+        else:
+            self.parts = []
+        # backfill version with zeroes if missing parts
+        self.parts.extend((0,) * (3 - len(self.parts)))
+
+    def __str__(self):
+        if self.mod:
+            return '.'.join([str(p) for p in self.parts])
+        return self.data
+
+    def __cmp__(self, other):
+        return cmp(self.parts, other.parts)
+
+class Jira(object):
+    """A single JIRA"""
+
+    def __init__(self, data, parent):
+        self.key = data['key']
+        self.fields = data['fields']
+        self.parent = parent
+        self.notes = None
+        self.incompat = None
+        self.reviewed = None
+
+    def get_id(self):
+        return mstr(self.key)
+
+    def get_description(self):
+        return mstr(self.fields['description'])
+
+    def get_release_note(self):
+        if self.notes is None:
+            field = self.parent.field_id_map['Release Note']
+            if self.fields.has_key(field):
+                self.notes = mstr(self.fields[field])
+            else:
+                self.notes = self.get_description()
+        return self.notes
+
+    def get_priority(self):
+        ret = ""
+        pri = self.fields['priority']
+        if pri is not None:
+            ret = pri['name']
+        return mstr(ret)
+
+    def get_assignee(self):
+        ret = ""
+        mid = self.fields['assignee']
+        if mid is not None:
+            ret = mid['displayName']
+        return mstr(ret)
+
+    def get_components(self):
+        if len(self.fields['components']) > 0:
+            return ", ".join([comp['name'] for comp in self.fields['components']])
+        else:
+            return ""
+
+    def get_summary(self):
+        return self.fields['summary']
+
+    def get_type(self):
+        ret = ""
+        mid = self.fields['issuetype']
+        if mid is not None:
+            ret = mid['name']
+        return mstr(ret)
+
+    def get_reporter(self):
+        ret = ""
+        mid = self.fields['reporter']
+        if mid is not None:
+            ret = mid['displayName']
+        return mstr(ret)
+
+    def get_project(self):
+        ret = ""
+        mid = self.fields['project']
+        if mid is not None:
+            ret = mid['key']
+        return mstr(ret)
+
+    def __cmp__(self, other):
+        selfsplit = self.get_id().split('-')
+        othersplit = other.get_id().split('-')
+        result = cmp(selfsplit[0], othersplit[0])
+        if result != 0:
+            return result
+        else:
+            if selfsplit[1] < othersplit[1]:
+                return True
+            elif selfsplit[1] > othersplit[1]:
+                return False
+        return False
+
+    def get_incompatible_change(self):
+        if self.incompat is None:
+            field = self.parent.field_id_map['Hadoop Flags']
+            self.reviewed = False
+            self.incompat = False
+            if self.fields.has_key(field):
+                if self.fields[field]:
+                    for flag in self.fields[field]:
+                        if flag['value'] == "Incompatible change":
+                            self.incompat = True
+                        if flag['value'] == "Reviewed":
+                            self.reviewed = True
+        return self.incompat
+
+    def check_missing_component(self):
+        if len(self.fields['components']) > 0:
+            return False
         return True
-      elif selfsplit[1] > othersplit[1]:
+
+    def check_missing_assignee(self):
+        if self.fields['assignee'] is not None:
+            return False
+        return True
+
+    def check_version_string(self):
+        field = self.parent.field_id_map['Fix Version/s']
+        for ver in self.fields[field]:
+            found = re.match(r'^((\d+)(\.\d+)*).*$|^(\w+\-\d+)$', ver['name'])
+            if not found:
+                return True
         return False
-    return False
-
-  def getIncompatibleChange(self):
-    if (self.incompat is None):
-      field = self.parent.fieldIdMap['Hadoop Flags']
-      self.reviewed=False
-      self.incompat=False
-      if (self.fields.has_key(field)):
-        if self.fields[field]:
-          for hf in self.fields[field]:
-            if hf['value'] == "Incompatible change":
-              self.incompat=True
-            if hf['value'] == "Reviewed":
-              self.reviewed=True
-    return self.incompat
-
-  def checkMissingComponent(self):
-      if (len(self.fields['components'])>0):
-          return False
-      return True
-
-  def checkMissingAssignee(self):
-      if (self.fields['assignee'] is not None):
-          return False
-      return True
-
-  def checkVersionString(self):
-      field = self.parent.fieldIdMap['Fix Version/s']
-      for h in self.fields[field]:
-          found = re.match('^((\d+)(\.\d+)*).*$|^(\w+\-\d+)$', h['name'])
-          if not found:
-              return True
-      return False
-
-  def getReleaseDate(self,version):
-    for j in range(len(self.fields['fixVersions'])):
-      if self.fields['fixVersions'][j]==version:
-        return(self.fields['fixVersions'][j]['releaseDate'])
-    return None
-
-class JiraIter:
-  """An Iterator of JIRAs"""
-
-  def __init__(self, version, projects):
-    self.version = version
-    self.projects = projects
-    v=str(version).replace("-SNAPSHOT","")
-
-    resp = urllib2.urlopen("https://issues.apache.org/jira/rest/api/2/field")
-    data = json.loads(resp.read())
-
-    self.fieldIdMap = {}
-    for part in data:
-      self.fieldIdMap[part['name']] = part['id']
-
-    self.jiras = []
-    at=0
-    end=1
-    count=100
-    while (at < end):
-      params = urllib.urlencode({'jql': "project in ('"+"' , '".join(projects)+"') and fixVersion
in ('"+v+"') and resolution = Fixed", 'startAt':at, 'maxResults':count})
-      resp = urllib2.urlopen("https://issues.apache.org/jira/rest/api/2/search?%s"%params)
-      data = json.loads(resp.read())
-      if (data.has_key('errorMessages')):
-        raise Exception(data['errorMessages'])
-      at = data['startAt'] + data['maxResults']
-      end = data['total']
-      self.jiras.extend(data['issues'])
-
-      needaversion=False
-      if v not in releaseVersion:
-        needaversion=True
-
-      if needaversion is True:
-        for i in range(len(data['issues'])):
-          for j in range(len(data['issues'][i]['fields']['fixVersions'])):
-            if 'releaseDate' in data['issues'][i]['fields']['fixVersions'][j]:
-              releaseVersion[data['issues'][i]['fields']['fixVersions'][j]['name']]=\
-                             data['issues'][i]['fields']['fixVersions'][j]['releaseDate']
-
-    self.iter = self.jiras.__iter__()
-
-  def __iter__(self):
-    return self
-
-  def next(self):
-    data = self.iter.next()
-    j = Jira(data, self)
-    return j
-
-class Outputs:
-  """Several different files to output to at the same time"""
-
-  def __init__(self, base_file_name, file_name_pattern, keys, params={}):
-    self.params = params
-    self.base = open(base_file_name%params, 'w')
-    self.others = {}
-    for key in keys:
-      both = dict(params)
-      both['key'] = key
-      self.others[key] = open(file_name_pattern%both, 'w')
-
-  def writeAll(self, pattern):
-    both = dict(self.params)
-    both['key'] = ''
-    self.base.write(pattern%both)
-    for key in self.others.keys():
-      both = dict(self.params)
-      both['key'] = key
-      self.others[key].write(pattern%both)
-
-  def writeKeyRaw(self, key, str):
-    self.base.write(str)
-    if (self.others.has_key(key)):
-      self.others[key].write(str)
-
-  def close(self):
-    self.base.close()
-    for fd in self.others.values():
-      fd.close()
-
-  def writeList(self, mylist):
-    for jira in sorted(mylist):
-      line = '| [%s](https://issues.apache.org/jira/browse/%s) | %s |  %s | %s | %s | %s
|\n' \
-        % (notableclean(jira.getId()), notableclean(jira.getId()),
-           notableclean(jira.getSummary()),
-           notableclean(jira.getPriority()),
-           formatComponents(jira.getComponents()),
-           notableclean(jira.getReporter()),
-           notableclean(jira.getAssignee()))
-      self.writeKeyRaw(jira.getProject(), line)
+
+    def get_release_date(self, version):
+        fix_versions = self.fields['fixVersions']
+        for j in range(len(fix_versions)):
+            if fix_versions[j] == version:
+                return fix_versions[j]['releaseDate']
+        return None
+
+class JiraIter(object):
+    """An Iterator of JIRAs"""
+
+    def __init__(self, version, projects):
+        self.version = version
+        self.projects = projects
+        ver = str(version).replace("-SNAPSHOT", "")
+
+        resp = urllib2.urlopen("https://issues.apache.org/jira/rest/api/2/field")
+        data = json.loads(resp.read())
+
+        self.field_id_map = {}
+        for part in data:
+            self.field_id_map[part['name']] = part['id']
+
+        self.jiras = []
+        pos = 0
+        end = 1
+        count = 100
+        while pos < end:
+            pjs = "','".join(projects)
+            jql = "project in ('%s') and fixVersion in ('%s') and resolution = Fixed" % (pjs,
ver)
+            params = urllib.urlencode({'jql': jql, 'startAt':pos, 'maxResults':count})
+            resp = urllib2.urlopen("https://issues.apache.org/jira/rest/api/2/search?%s"
% params)
+            data = json.loads(resp.read())
+            if data.has_key('error_messages'):
+                raise Exception(data['error_messages'])
+            pos = data['startAt'] + data['maxResults']
+            end = data['total']
+            self.jiras.extend(data['issues'])
+
+            needaversion = False
+            if ver not in RELEASE_VERSION:
+                needaversion = True
+
+            if needaversion is True:
+                issues = data['issues']
+                for i in range(len(issues)):
+                    fix_versions = issues[i]['fields']['fixVersions']
+                    for j in range(len(fix_versions)):
+                        fields = fix_versions[j]
+                        if 'releaseDate' in fields:
+                            RELEASE_VERSION[fields['name']] = fields['releaseDate']
+
+        self.iter = self.jiras.__iter__()
+
+    def __iter__(self):
+        return self
+
+    def next(self):
+        data = self.iter.next()
+        j = Jira(data, self)
+        return j
+
+class Outputs(object):
+    """Several different files to output to at the same time"""
+
+    def __init__(self, base_file_name, file_name_pattern, keys, params=None):
+        if params is None:
+            params = {}
+        self.params = params
+        self.base = open(base_file_name%params, 'w')
+        self.others = {}
+        for key in keys:
+            both = dict(params)
+            both['key'] = key
+            self.others[key] = open(file_name_pattern%both, 'w')
+
+    def write_all(self, pattern):
+        both = dict(self.params)
+        both['key'] = ''
+        self.base.write(pattern%both)
+        for key in self.others.keys():
+            both = dict(self.params)
+            both['key'] = key
+            self.others[key].write(pattern%both)
+
+    def write_key_raw(self, key, _str):
+        self.base.write(_str)
+        if self.others.has_key(key):
+            self.others[key].write(_str)
+
+    def close(self):
+        self.base.close()
+        for value in self.others.values():
+            value.close()
+
+    def write_list(self, mylist):
+        for jira in sorted(mylist):
+            line = '| [%s](https://issues.apache.org/jira/browse/%s) | %s |  %s | %s | %s
| %s |\n'
+            line = line % (notableclean(jira.get_id()),
+                           notableclean(jira.get_id()),
+                           notableclean(jira.get_summary()),
+                           notableclean(jira.get_priority()),
+                           format_components(jira.get_components()),
+                           notableclean(jira.get_reporter()),
+                           notableclean(jira.get_assignee()))
+            self.write_key_raw(jira.get_project(), line)
 
 def main():
-  parser = OptionParser(usage="usage: %prog --project PROJECT [--project PROJECT] --version
VERSION [--version VERSION2 ...]",
-		epilog=
-               "Markdown-formatted CHANGES and RELEASENOTES files will be stored in a directory"
-               " named after the highest version provided.")
-  parser.add_option("-i","--index", dest="index", action="store_true",
-             default=False, help="build an index file")
-  parser.add_option("-l","--license", dest="license", action="store_false",
-             default=True, help="Add an ASF license")
-  parser.add_option("-n","--lint", dest="lint", action="store_true",
-             help="use lint flag to exit on failures")
-  parser.add_option("-p", "--project", dest="projects",
-             action="append", type="string",
-             help="projects in JIRA to include in releasenotes", metavar="PROJECT")
-  parser.add_option("-r", "--range", dest="range", action="store_true",
-             default=False, help="Given versions are a range")
-  parser.add_option("-t", "--projecttitle", dest="title",
-             type="string",
-             help="Title to use for the project (default is Apache PROJECT)")
-  parser.add_option("-u","--usetoday", dest="usetoday", action="store_true",
-             default=False, help="use current date for unreleased versions")
-  parser.add_option("-v", "--version", dest="versions",
-             action="append", type="string",
-             help="versions in JIRA to include in releasenotes", metavar="VERSION")
-  (options, args) = parser.parse_args()
-
-  if (options.versions is None):
-    parser.error("At least one version needs to be supplied")
-
-  proxy = urllib2.ProxyHandler()
-  opener = urllib2.build_opener(proxy)
-  urllib2.install_opener(opener)
-
-  projects = options.projects
-  if projects is None:
-    parser.error("At least one project needs to be supplied")
-
-  if (options.range is True):
-    versions = [ Version(v) for v in GetVersions(options.versions, projects).getlist() ]
-  else:
-    versions = [ Version(v) for v in options.versions ]
-  versions.sort();
-
-  if (options.title is None):
-    title=projects[0]
-  else:
-    title=options.title
-
-  haderrors=False
-
-  for v in versions:
-    vstr=str(v)
-    jlist = JiraIter(vstr,projects)
-
-    if vstr in releaseVersion:
-      reldate=releaseVersion[vstr]
-    elif options.usetoday:
-      reldate=strftime("%Y-%m-%d", gmtime())
+    usage = "usage: %prog --project PROJECT [--project PROJECT] --version VERSION [--version
VERSION2 ...]"
+    parser = OptionParser(usage=usage,
+                          epilog="Markdown-formatted CHANGES and RELEASENOTES files will
be stored"
+                                 "in a directory named after the highest version provided.")
+    parser.add_option("-i", "--index", dest="index", action="store_true",
+                      default=False, help="build an index file")
+    parser.add_option("-l", "--license", dest="license", action="store_false",
+                      default=True, help="Add an ASF license")
+    parser.add_option("-n", "--lint", dest="lint", action="store_true",
+                      help="use lint flag to exit on failures")
+    parser.add_option("-p", "--project", dest="projects",
+                      action="append", type="string",
+                      help="projects in JIRA to include in releasenotes", metavar="PROJECT")
+    parser.add_option("-r", "--range", dest="range", action="store_true",
+                      default=False, help="Given versions are a range")
+    parser.add_option("-t", "--projecttitle", dest="title", type="string",
+                      help="Title to use for the project (default is Apache PROJECT)")
+    parser.add_option("-u", "--usetoday", dest="usetoday", action="store_true",
+                      default=False, help="use current date for unreleased versions")
+    parser.add_option("-v", "--version", dest="versions", action="append", type="string",
+                      help="versions in JIRA to include in releasenotes", metavar="VERSION")
+    (options, _) = parser.parse_args()
+
+    if options.versions is None:
+        parser.error("At least one version needs to be supplied")
+
+    proxy = urllib2.ProxyHandler()
+    opener = urllib2.build_opener(proxy)
+    urllib2.install_opener(opener)
+
+    projects = options.projects
+    if projects is None:
+        parser.error("At least one project needs to be supplied")
+
+    if options.range is True:
+        versions = [Version(v) for v in GetVersions(options.versions, projects).getlist()]
+    else:
+        versions = [Version(v) for v in options.versions]
+    versions.sort()
+
+    if options.title is None:
+        title = projects[0]
     else:
-      reldate="Unreleased"
-
-    if not os.path.exists(vstr):
-      os.mkdir(vstr)
-
-    reloutputs = Outputs("%(ver)s/RELEASENOTES.%(ver)s.md",
-      "%(ver)s/RELEASENOTES.%(key)s.%(ver)s.md",
-      [], {"ver":v, "date":reldate, "title":title})
-    choutputs = Outputs("%(ver)s/CHANGES.%(ver)s.md",
-      "%(ver)s/CHANGES.%(key)s.%(ver)s.md",
-      [], {"ver":v, "date":reldate, "title":title})
-
-    if (options.license is True):
-      reloutputs.writeAll(asflicense)
-      choutputs.writeAll(asflicense)
-
-    relhead = '# %(title)s %(key)s %(ver)s Release Notes\n\n' \
-      'These release notes cover new developer and user-facing incompatibilities, features,
and major improvements.\n\n'
-    chhead = '# %(title)s Changelog\n\n' \
-      '## Release %(ver)s - %(date)s\n'\
-      '\n'
-
-    reloutputs.writeAll(relhead)
-    choutputs.writeAll(chhead)
-    errorCount=0
-    warningCount=0
-    lintMessage=""
-    incompatlist=[]
-    buglist=[]
-    improvementlist=[]
-    newfeaturelist=[]
-    subtasklist=[]
-    tasklist=[]
-    testlist=[]
-    otherlist=[]
-
-    for jira in sorted(jlist):
-      if jira.getIncompatibleChange():
-        incompatlist.append(jira)
-      elif jira.getType() == "Bug":
-        buglist.append(jira)
-      elif jira.getType() == "Improvement":
-        improvementlist.append(jira)
-      elif jira.getType() == "New Feature":
-        newfeaturelist.append(jira)
-      elif jira.getType() == "Sub-task":
-        subtasklist.append(jira)
-      elif jira.getType() == "Task":
-       tasklist.append(jira)
-      elif jira.getType() == "Test":
-        testlist.append(jira)
-      else:
-         otherlist.append(jira)
-
-      line = '* [%s](https://issues.apache.org/jira/browse/%s) | *%s* | **%s**\n' \
-          % (notableclean(jira.getId()), notableclean(jira.getId()), notableclean(jira.getPriority()),
-             notableclean(jira.getSummary()))
-
-      if (jira.getIncompatibleChange()) and (len(jira.getReleaseNote())==0):
-        warningCount+=1
-        reloutputs.writeKeyRaw(jira.getProject(),"\n---\n\n")
-        reloutputs.writeKeyRaw(jira.getProject(), line)
-        line ='\n**WARNING: No release note provided for this incompatible change.**\n\n'
-        lintMessage += "\nWARNING: incompatible change %s lacks release notes." % (notableclean(jira.getId()))
-        reloutputs.writeKeyRaw(jira.getProject(), line)
-
-      if jira.checkVersionString():
-          warningCount+=1
-          lintMessage += "\nWARNING: Version string problem for %s " % jira.getId()
-
-      if (jira.checkMissingComponent() or jira.checkMissingAssignee()):
-          errorCount+=1
-          errorMessage=[]
-          jira.checkMissingComponent() and errorMessage.append("component")
-          jira.checkMissingAssignee() and errorMessage.append("assignee")
-          lintMessage += "\nERROR: missing %s for %s " %  (" and ".join(errorMessage) , jira.getId())
-
-      if (len(jira.getReleaseNote())>0):
-        reloutputs.writeKeyRaw(jira.getProject(),"\n---\n\n")
-        reloutputs.writeKeyRaw(jira.getProject(), line)
-        line ='\n%s\n\n' % (tableclean(jira.getReleaseNote()))
-        reloutputs.writeKeyRaw(jira.getProject(), line)
-
-    if (options.lint is True):
-        print lintMessage
-        print "======================================="
-        print "%s: Error:%d, Warning:%d \n" % (vstr, errorCount, warningCount)
-        if (errorCount>0):
-           haderrors=True
-           cleanOutputDir(vstr)
-           continue
-
-    reloutputs.writeAll("\n\n")
-    reloutputs.close()
-
-    choutputs.writeAll("### INCOMPATIBLE CHANGES:\n\n")
-    choutputs.writeAll("| JIRA | Summary | Priority | Component | Reporter | Contributor
|\n")
-    choutputs.writeAll("|:---- |:---- | :--- |:---- |:---- |:---- |\n")
-    choutputs.writeList(incompatlist)
-
-    choutputs.writeAll("\n\n### NEW FEATURES:\n\n")
-    choutputs.writeAll("| JIRA | Summary | Priority | Component | Reporter | Contributor
|\n")
-    choutputs.writeAll("|:---- |:---- | :--- |:---- |:---- |:---- |\n")
-    choutputs.writeList(newfeaturelist)
-
-    choutputs.writeAll("\n\n### IMPROVEMENTS:\n\n")
-    choutputs.writeAll("| JIRA | Summary | Priority | Component | Reporter | Contributor
|\n")
-    choutputs.writeAll("|:---- |:---- | :--- |:---- |:---- |:---- |\n")
-    choutputs.writeList(improvementlist)
-
-    choutputs.writeAll("\n\n### BUG FIXES:\n\n")
-    choutputs.writeAll("| JIRA | Summary | Priority | Component | Reporter | Contributor
|\n")
-    choutputs.writeAll("|:---- |:---- | :--- |:---- |:---- |:---- |\n")
-    choutputs.writeList(buglist)
-
-    choutputs.writeAll("\n\n### TESTS:\n\n")
-    choutputs.writeAll("| JIRA | Summary | Priority | Component | Reporter | Contributor
|\n")
-    choutputs.writeAll("|:---- |:---- | :--- |:---- |:---- |:---- |\n")
-    choutputs.writeList(testlist)
-
-    choutputs.writeAll("\n\n### SUB-TASKS:\n\n")
-    choutputs.writeAll("| JIRA | Summary | Priority | Component | Reporter | Contributor
|\n")
-    choutputs.writeAll("|:---- |:---- | :--- |:---- |:---- |:---- |\n")
-    choutputs.writeList(subtasklist)
-
-    choutputs.writeAll("\n\n### OTHER:\n\n")
-    choutputs.writeAll("| JIRA | Summary | Priority | Component | Reporter | Contributor
|\n")
-    choutputs.writeAll("|:---- |:---- | :--- |:---- |:---- |:---- |\n")
-    choutputs.writeList(otherlist)
-    choutputs.writeList(tasklist)
-
-    choutputs.writeAll("\n\n")
-    choutputs.close()
-
-  if options.index:
-    buildindex(title,options.license)
-
-  if haderrors is True:
-    sys.exit(1)
+        title = options.title
+
+    haderrors = False
+
+    for version in versions:
+        vstr = str(version)
+        jlist = JiraIter(vstr, projects)
+
+        if vstr in RELEASE_VERSION:
+            reldate = RELEASE_VERSION[vstr]
+        elif options.usetoday:
+            reldate = strftime("%Y-%m-%d", gmtime())
+        else:
+            reldate = "Unreleased"
+
+        if not os.path.exists(vstr):
+            os.mkdir(vstr)
+
+        reloutputs = Outputs("%(ver)s/RELEASENOTES.%(ver)s.md",
+                             "%(ver)s/RELEASENOTES.%(key)s.%(ver)s.md",
+                             [], {"ver":version, "date":reldate, "title":title})
+        choutputs = Outputs("%(ver)s/CHANGES.%(ver)s.md",
+                            "%(ver)s/CHANGES.%(key)s.%(ver)s.md",
+                            [], {"ver":version, "date":reldate, "title":title})
+
+        if options.license is True:
+            reloutputs.write_all(ASF_LICENSE)
+            choutputs.write_all(ASF_LICENSE)
+
+        relhead = '# %(title)s %(key)s %(ver)s Release Notes\n\n' \
+                  'These release notes cover new developer and user-facing ' \
+                  'incompatibilities, features, and major improvements.\n\n'
+        chhead = '# %(title)s Changelog\n\n' \
+                 '## Release %(ver)s - %(date)s\n'\
+                 '\n'
+
+        reloutputs.write_all(relhead)
+        choutputs.write_all(chhead)
+        error_count = 0
+        warning_count = 0
+        lint_message = ""
+        incompatlist = []
+        buglist = []
+        improvementlist = []
+        newfeaturelist = []
+        subtasklist = []
+        tasklist = []
+        testlist = []
+        otherlist = []
+
+        for jira in sorted(jlist):
+            if jira.get_incompatible_change():
+                incompatlist.append(jira)
+            elif jira.get_type() == "Bug":
+                buglist.append(jira)
+            elif jira.get_type() == "Improvement":
+                improvementlist.append(jira)
+            elif jira.get_type() == "New Feature":
+                newfeaturelist.append(jira)
+            elif jira.get_type() == "Sub-task":
+                subtasklist.append(jira)
+            elif jira.get_type() == "Task":
+                tasklist.append(jira)
+            elif jira.get_type() == "Test":
+                testlist.append(jira)
+            else:
+                otherlist.append(jira)
+
+            line = '* [%s](https://issues.apache.org/jira/browse/%s) | *%s* | **%s**\n' \
+                   % (notableclean(jira.get_id()), notableclean(jira.get_id()),
+                      notableclean(jira.get_priority()), notableclean(jira.get_summary()))
+
+            if jira.get_incompatible_change() and len(jira.get_release_note()) == 0:
+                warning_count += 1
+                reloutputs.write_key_raw(jira.get_project(), "\n---\n\n")
+                reloutputs.write_key_raw(jira.get_project(), line)
+                line = '\n**WARNING: No release note provided for this incompatible change.**\n\n'
+                lint_message += "\nWARNING: incompatible change %s lacks release notes."
% \
+                                (notableclean(jira.get_id()))
+                reloutputs.write_key_raw(jira.get_project(), line)
+
+            if jira.check_version_string():
+                warning_count += 1
+                lint_message += "\nWARNING: Version string problem for %s " % jira.get_id()
+
+            if jira.check_missing_component() or jira.check_missing_assignee():
+                error_count += 1
+                error_message = []
+                if jira.check_missing_component():
+                    error_message.append("component")
+                if jira.check_missing_assignee():
+                    error_message.append("assignee")
+                lint_message += "\nERROR: missing %s for %s " \
+                                % (" and ".join(error_message), jira.get_id())
+
+            if len(jira.get_release_note()) > 0:
+                reloutputs.write_key_raw(jira.get_project(), "\n---\n\n")
+                reloutputs.write_key_raw(jira.get_project(), line)
+                line = '\n%s\n\n' % (tableclean(jira.get_release_note()))
+                reloutputs.write_key_raw(jira.get_project(), line)
+
+        if options.lint is True:
+            print lint_message
+            print "======================================="
+            print "%s: Error:%d, Warning:%d \n" % (vstr, error_count, warning_count)
+            if error_count > 0:
+                haderrors = True
+                clean_output_dir(vstr)
+                continue
+
+        reloutputs.write_all("\n\n")
+        reloutputs.close()
+
+        choutputs.write_all("### INCOMPATIBLE CHANGES:\n\n")
+        choutputs.write_all("| JIRA | Summary | Priority | Component | Reporter | Contributor
|\n")
+        choutputs.write_all("|:---- |:---- | :--- |:---- |:---- |:---- |\n")
+        choutputs.write_list(incompatlist)
+
+        choutputs.write_all("\n\n### NEW FEATURES:\n\n")
+        choutputs.write_all("| JIRA | Summary | Priority | Component | Reporter | Contributor
|\n")
+        choutputs.write_all("|:---- |:---- | :--- |:---- |:---- |:---- |\n")
+        choutputs.write_list(newfeaturelist)
+
+        choutputs.write_all("\n\n### IMPROVEMENTS:\n\n")
+        choutputs.write_all("| JIRA | Summary | Priority | Component | Reporter | Contributor
|\n")
+        choutputs.write_all("|:---- |:---- | :--- |:---- |:---- |:---- |\n")
+        choutputs.write_list(improvementlist)
+
+        choutputs.write_all("\n\n### BUG FIXES:\n\n")
+        choutputs.write_all("| JIRA | Summary | Priority | Component | Reporter | Contributor
|\n")
+        choutputs.write_all("|:---- |:---- | :--- |:---- |:---- |:---- |\n")
+        choutputs.write_list(buglist)
+
+        choutputs.write_all("\n\n### TESTS:\n\n")
+        choutputs.write_all("| JIRA | Summary | Priority | Component | Reporter | Contributor
|\n")
+        choutputs.write_all("|:---- |:---- | :--- |:---- |:---- |:---- |\n")
+        choutputs.write_list(testlist)
+
+        choutputs.write_all("\n\n### SUB-TASKS:\n\n")
+        choutputs.write_all("| JIRA | Summary | Priority | Component | Reporter | Contributor
|\n")
+        choutputs.write_all("|:---- |:---- | :--- |:---- |:---- |:---- |\n")
+        choutputs.write_list(subtasklist)
+
+        choutputs.write_all("\n\n### OTHER:\n\n")
+        choutputs.write_all("| JIRA | Summary | Priority | Component | Reporter | Contributor
|\n")
+        choutputs.write_all("|:---- |:---- | :--- |:---- |:---- |:---- |\n")
+        choutputs.write_list(otherlist)
+        choutputs.write_list(tasklist)
+
+        choutputs.write_all("\n\n")
+        choutputs.close()
+
+    if options.index:
+        buildindex(title, options.license)
+
+    if haderrors is True:
+        sys.exit(1)
 
 if __name__ == "__main__":
-  main()
+    main()


Mime
View raw message