From a7c9bf65dbab916715eb780034ad6245a67bda32 Mon Sep 17 00:00:00 2001 From: Thierry Carrez Date: Wed, 16 Nov 2016 17:17:28 +0100 Subject: [PATCH] No longer specify announcement list release.sh no longer processes the send-announcements-to directive, so stop requiring it. Change-Id: I53224100b821416f01ebbd5396b4fd9f632b2489 Depends-On: I37f24fe4a716c9b64f241d7a45da8e8bce8b55c2 --- README.rst | 14 -------------- openstack_releases/cmds/interactive_release.py | 8 -------- openstack_releases/cmds/validate.py | 15 --------------- tools/tag_history_from_git.py | 4 ---- tools/tag_history_from_lp.py | 4 ---- 5 files changed, 45 deletions(-) diff --git a/README.rst b/README.rst index 04c191f5b9..640f79521a 100644 --- a/README.rst +++ b/README.rst @@ -155,7 +155,6 @@ series to hold all of the metadata for all releases of that deliverable. For each release, we need to track: * the launchpad project name (such as ``oslo.config``) -* the email list to receive release announcements * the series (Kilo, Liberty, etc.) * the release model being used * for each repository @@ -197,15 +196,6 @@ The top level of a deliverable file is a mapping with keys: multiple repositories should use a hash to map each repository name to its notes URL. -``send-announcements-to`` - A string containing one or more email addresses to receive - announcements of new releases for the deliverable. Multiple - addresses should be separated by a comma (``,``) without any spaces. - - Internally consumed libraries should use - ``openstack-dev@lists.openstack.org``. Server projects and client - libraries should use ``openstack-announce@lists.openstack.org``. - ``include-pypi-link`` Either ``yes`` or ``no``, indicating whether the release announcement should include the link to the package on @@ -300,7 +290,6 @@ For example, one version of --- launchpad: oslo.config - send-announcements-to: openstack-dev@lists.openstack.org releases: - version: 1.12.0 projects: @@ -311,7 +300,6 @@ and then for the subsequent release it would be updated to contain:: --- launchpad: oslo.config - send-announcements-to: openstack-dev@lists.openstack.org releases: - version: 1.12.0 projects: @@ -333,7 +321,6 @@ be described by ``deliverables/mitaka/neutron.yaml`` containing: --- launchpad: neutron - send-announcements-to: openstack-announce@lists.openstack.org release-notes: openstack/neutron: http://docs.openstack.org/releasenotes/neutron/mitaka.html openstack/neutron-lbaas: http://docs.openstack.org/releasenotes/neutron-lbaas/mitaka.html @@ -358,7 +345,6 @@ To allow tagging for repositories without build artifacts, set the --- launchpad: astara - send-announcements-to: openstack-announce@lists.openstack.org repository-settings: openstack/astara-appliance: flags: diff --git a/openstack_releases/cmds/interactive_release.py b/openstack_releases/cmds/interactive_release.py index f0e7985cfe..aec6485eb1 100644 --- a/openstack_releases/cmds/interactive_release.py +++ b/openstack_releases/cmds/interactive_release.py @@ -36,7 +36,6 @@ from openstack_releases import gitutils from openstack_releases import yamlutils NOTES_URL_TPL = 'http://docs.openstack.org/releasenotes/%s/%s.html' -ANNOUNCE_EMAIL = 'openstack-dev@lists.openstack.org' RELEASE_INCREMENTS = { 'bugfix': (0, 0, 1), 'feature': (0, 1, 0), @@ -187,24 +186,17 @@ def maybe_create_release(release_repo_path, deliverable_info, default=notes_link) if deliverable_info: launchpad_project = to_unicode(deliverable_info['launchpad']) - announce_email = to_unicode( - deliverable_info['send-announcements-to']) else: launchpad_project = prompt( "Launchpad project name: ", validator=NoEmptyValidator(), default=to_unicode(short_project)) - announce_email = prompt( - "Announcement email address: ", - validator=NoEmptyValidator(), - default=ANNOUNCE_EMAIL) team = prompt("Project team: ", validator=NoEmptyValidator(), default=to_unicode(launchpad_project)) include_pypi_link = yes_no_prompt("Include pypi link? ") newest_release = collections.OrderedDict([ ('launchpad', launchpad_project), - ('send-announcements-to', announce_email), ('include-pypi-link', include_pypi_link), ('release-notes', notes_link), ('releases', []), diff --git a/openstack_releases/cmds/validate.py b/openstack_releases/cmds/validate.py index db66826f71..e6ae4ed212 100644 --- a/openstack_releases/cmds/validate.py +++ b/openstack_releases/cmds/validate.py @@ -137,21 +137,6 @@ def main(): # Look for the release-type release_type = deliverable_info.get('release-type', 'std') - # Look for an email address to receive release announcements - try: - announce_to = deliverable_info['send-announcements-to'] - except KeyError: - errors.append('No send-announcements-to in %s' - % filename) - print('no send-announcements-to found') - else: - print('send announcements to %s' % announce_to) - if ' ' in announce_to: - print('Found space in send-announcements-to: %r' % - announce_to) - errors.append('Space in send-announcements-to (%r) for %s' % - (announce_to, filename)) - # Make sure the release notes page exists, if it is specified. if 'release-notes' in deliverable_info: notes_link = deliverable_info['release-notes'] diff --git a/tools/tag_history_from_git.py b/tools/tag_history_from_git.py index c342bf1d97..f05f2e5e59 100755 --- a/tools/tag_history_from_git.py +++ b/tools/tag_history_from_git.py @@ -66,9 +66,6 @@ def date_to_release(tag_date): parser = argparse.ArgumentParser() parser.add_argument('project', help='launchpad project name') parser.add_argument('repo', help='repository directory') -parser.add_argument('--announce', default='openstack-dev@lists.openstack.org', - help=('Where to send release announcements. ' - '(Default: %(default)s)')) parser.add_argument('--release-type', dest='release_type', default='std', help=('Which release-type to use for this deliverable' '(Default: %(default)s)')) @@ -125,7 +122,6 @@ for series, milestones in sorted(series_data.items()): f.write('---\n') f.write('launchpad: %s\n' % args.project) f.write('team: %s\n' % args.project) - f.write('send-announcements-to: %s\n' % args.announce) f.write('release-type: %s\n' % args.release_type) f.write('releases:\n') milestones_sorted = \ diff --git a/tools/tag_history_from_lp.py b/tools/tag_history_from_lp.py index d15deda90c..c4621df578 100755 --- a/tools/tag_history_from_lp.py +++ b/tools/tag_history_from_lp.py @@ -44,9 +44,6 @@ parser = argparse.ArgumentParser() parser.add_argument('project', help='launchpad project name') parser.add_argument('repo', nargs='+', help='repository directory') parser.add_argument('--series', help='series to scan') -parser.add_argument('--announce', default='openstack-dev@lists.openstack.org', - help=('Where to send release announcements. ' - '(Default: %(default)s)')) parser.add_argument('--release-type', dest='release_type', default='std', help=('Which release-type to use for this deliverable ' '(Default: %(default)s)')) @@ -113,7 +110,6 @@ for series, milestones in sorted(series_data.items()): f.write('---\n') f.write('launchpad: %s\n' % args.project) f.write('team: %s\n' % args.project) - f.write('send-announcements-to: %s\n' % args.announce) f.write('release-type: %s\n' % args.release_type) f.write('releases:\n') milestones_sorted = \