zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix spack flake8 to use Travis's target as base when needed

Browse Source
This commit is contained in:
Todd Gamblin 2019-04-22 21:55:20 +09:00 committed by Peter Scheibel
parent f41103770d
commit 8e5e36dc0b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -211,7 +211,7 @@ before_script:
- git config --global user.name "Test User" - git config --global user.name "Test User"
# Need this to be able to compute the list of changed files # 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 # Set up external deps for build tests, b/c they take too long to compile
- if [[ "$TEST_SUITE" == "build" ]]; then - if [[ "$TEST_SUITE" == "build" ]]; then

8
lib/spack/spack/cmd/flake8.py
View File

@ -96,7 +96,11 @@ def changed_files(args):
git = which('git', required=True) 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 = [ git_args = [
# Add changed files committed since branching off of develop # Add changed files committed since branching off of develop
@ -193,7 +197,7 @@ def filter_file(source, dest, output=False):
def setup_parser(subparser): def setup_parser(subparser):
subparser.add_argument( 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") help="select base branch for collecting list of modified files")
subparser.add_argument( subparser.add_argument(
'-k', '--keep-temp', action='store_true', '-k', '--keep-temp', action='store_true',