From 8e5e36dc0bcb8a1740d764359b36627cb4a30cef Mon Sep 17 00:00:00 2001
From: Todd Gamblin <tgamblin@llnl.gov>
Date: Mon, 22 Apr 2019 21:55:20 +0900
Subject: [PATCH] Fix spack flake8 to use Travis's target as base when needed
---
.travis.yml | 2 +-
lib/spack/spack/cmd/flake8.py | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index edf18f7311..694ada8cc3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -211,7 +211,7 @@ before_script:
- git config --global user.name "Test User"
# Need this to be able to compute the list of changed files
- - git fetch origin develop:develop
+ - git fetch origin ${TRAVIS_BRANCH}:${TRAVIS_BRANCH}
# Set up external deps for build tests, b/c they take too long to compile
- if [[ "$TEST_SUITE" == "build" ]]; then
diff --git a/lib/spack/spack/cmd/flake8.py b/lib/spack/spack/cmd/flake8.py
index 534ab1c4ba..105ede2c70 100644
--- a/lib/spack/spack/cmd/flake8.py
+++ b/lib/spack/spack/cmd/flake8.py
@@ -96,7 +96,11 @@ def changed_files(args):
git = which('git', required=True)
- range = "{0}...".format(args.base)
+ base = args.base
+ if base is None:
+ base = os.environ.get('TRAVIS_BRANCH', 'develop')
+
+ range = "{0}...".format(base)
git_args = [
# Add changed files committed since branching off of develop
@@ -193,7 +197,7 @@ def filter_file(source, dest, output=False):
def setup_parser(subparser):
subparser.add_argument(
- '-b', '--base', action='store', default='develop',
+ '-b', '--base', action='store', default=None,
help="select base branch for collecting list of modified files")
subparser.add_argument(
'-k', '--keep-temp', action='store_true',
--
GitLab