refactor list_deliverable_changes.py prior to move to project-config
When we move the release tagging scripts to the project-config repository, they will need to have minimal dependencies and shouldn't need to import other local modules. Move the gitutils code needed by list_deliverable_changes.py into the file, and move the file out of the cmds subdirectory to be a regular script instead. Change-Id: I7076d45be04366b95b3d662ffc181373339ad6c6
This commit is contained in:
parent
2a37f4a961
commit
cbff5131a6
|
@ -0,0 +1,113 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
"""Lists the most recent versions in the deliverable files.
|
||||
"""
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import argparse
|
||||
import os.path
|
||||
import subprocess
|
||||
|
||||
import yaml
|
||||
|
||||
|
||||
def find_modified_deliverable_files(reporoot):
|
||||
"Return a list of files modified by the most recent commit."
|
||||
results = subprocess.check_output(
|
||||
['git', 'diff', '--name-only', '--pretty=format:', 'HEAD^'],
|
||||
cwd=reporoot,
|
||||
)
|
||||
filenames = [
|
||||
l.strip()
|
||||
for l in results.splitlines()
|
||||
if l.startswith('deliverables/')
|
||||
]
|
||||
return filenames
|
||||
|
||||
|
||||
def get_modified_deliverable_file_content(reporoot, filenames):
|
||||
"""Return a sequence of tuples containing the new versions.
|
||||
|
||||
Return tuples containing (deliverable name, series name, version
|
||||
number, list of repositories).
|
||||
"""
|
||||
# Determine which deliverable files to process by taking our
|
||||
# command line arguments or by scanning the git repository
|
||||
# for the most recent change.
|
||||
deliverable_files = filenames
|
||||
if not deliverable_files:
|
||||
deliverable_files = find_modified_deliverable_files(
|
||||
reporoot
|
||||
)
|
||||
|
||||
for basename in deliverable_files:
|
||||
filename = os.path.join(reporoot, basename)
|
||||
with open(filename, 'r') as f:
|
||||
deliverable_data = yaml.load(f.read())
|
||||
|
||||
# Determine where to send email announcements of
|
||||
# releases. Default to the development list, to cut down on
|
||||
# excessive emails to the announcement list.
|
||||
send_announcements_to = deliverable_data.get(
|
||||
'send-announcements-to',
|
||||
'openstack-dev@lists.openstack.org',
|
||||
)
|
||||
|
||||
# The series name is part of the filename, rather than the file
|
||||
# body. That causes release.sh to be called with series="_independent"
|
||||
# for release:independent projects, and release.sh to use master branch
|
||||
# to evaluate fixed bugs.
|
||||
series_name = os.path.basename(
|
||||
os.path.dirname(os.path.abspath(filename))
|
||||
)
|
||||
deliverable_name = os.path.splitext(os.path.basename(filename))[0]
|
||||
|
||||
all_versions = {
|
||||
rel['version']: rel for rel in deliverable_data['releases']
|
||||
}
|
||||
version = deliverable_data['releases'][-1]['version']
|
||||
this_version = all_versions[version]
|
||||
for project in this_version['projects']:
|
||||
yield (deliverable_name, series_name, version,
|
||||
project['repo'], project['hash'],
|
||||
send_announcements_to)
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument(
|
||||
'deliverable_file',
|
||||
nargs='*',
|
||||
help='paths to YAML files specifying releases',
|
||||
)
|
||||
parser.add_argument(
|
||||
'--releases-repo', '-r',
|
||||
default='.',
|
||||
help='path to the releases repository for automatic scanning',
|
||||
)
|
||||
args = parser.parse_args()
|
||||
|
||||
results = get_modified_deliverable_file_content(
|
||||
args.releases_repo,
|
||||
args.deliverable_file,
|
||||
)
|
||||
for r in results:
|
||||
print(' '.join(r))
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
|
@ -56,7 +56,7 @@ if [[ -z "$VIRTUAL_ENV" ]]; then
|
|||
source $TOOLSDIR/.tox/venv/bin/activate
|
||||
fi
|
||||
|
||||
list-deliverable-changes -r $RELEASES_REPO $DELIVERABLES \
|
||||
$TOOLSDIR/list_deliverable_changes.py -r $RELEASES_REPO $DELIVERABLES \
|
||||
| while read deliverable series version repo hash announce_to; do
|
||||
title "$repo $series $version $hash $announce_to"
|
||||
$TOOLSDIR/release.sh $announce $repo $series $version $hash $announce_to
|
||||
|
|
|
@ -1,49 +0,0 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
"""Lists the most recent versions in the deliverable files.
|
||||
"""
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import argparse
|
||||
|
||||
from releasetools import gitutils
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument(
|
||||
'deliverable_file',
|
||||
nargs='*',
|
||||
help='paths to YAML files specifying releases',
|
||||
)
|
||||
parser.add_argument(
|
||||
'--releases-repo', '-r',
|
||||
default='.',
|
||||
help='path to the releases repository for automatic scanning',
|
||||
)
|
||||
args = parser.parse_args()
|
||||
|
||||
results = gitutils.get_modified_deliverable_file_content(
|
||||
args.releases_repo,
|
||||
args.deliverable_file,
|
||||
)
|
||||
for r in results:
|
||||
print(' '.join(r))
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
|
@ -34,5 +34,4 @@ console_scripts =
|
|||
milestones-create = releasetools.cmds.milestones_create:main
|
||||
launchpad-login = releasetools.cmds.launchpad_login:main
|
||||
add-comment = releasetools.cmds.add_comment:main
|
||||
list-deliverable-changes = releasetools.cmds.list_deliverable_changes:main
|
||||
send-mail = releasetools.cmds.mail:main
|
Loading…
Reference in New Issue