-
-
Notifications
You must be signed in to change notification settings - Fork 225
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #599 from automl/development
New release
- Loading branch information
Showing
148 changed files
with
7,352 additions
and
5,222 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,141 +1,2 @@ | ||
| #!/bin/bash | ||
|
|
||
| # This script is mostly taken from https://github.com/scikit-learn/scikit-learn/blob/master/build_tools/travis/flake8_diff.sh | ||
|
|
||
| # This script is used in Travis to check that PRs do not add obvious | ||
| # flake8 violations. It relies on two things: | ||
| # - find common ancestor between branch and | ||
| # automl/auto-sklearn remote | ||
| # - run flake8 --diff on the diff between the branch and the common | ||
| # ancestor | ||
| # | ||
| # Additional features: | ||
| # - the line numbers in Travis match the local branch on the PR | ||
| # author machine. | ||
| # - ./build_tools/travis/flake8_diff.sh can be run locally for quick | ||
| # turn-around | ||
|
|
||
| set -e | ||
| # pipefail is necessary to propagate exit codes | ||
| set -o pipefail | ||
|
|
||
| PROJECT=automl/SMAC3 | ||
| PROJECT_URL=https://github.com/$PROJECT.git | ||
|
|
||
| # Find the remote with the project name (upstream in most cases) | ||
| REMOTE=$(git remote -v | grep $PROJECT | cut -f1 | head -1 || echo '') | ||
|
|
||
| # Add a temporary remote if needed. For example this is necessary when | ||
| # Travis is configured to run in a fork. In this case 'origin' is the | ||
| # fork and not the reference repo we want to diff against. | ||
| if [[ -z "$REMOTE" ]]; then | ||
| TMP_REMOTE=tmp_reference_upstream | ||
| REMOTE=$TMP_REMOTE | ||
| git remote add $REMOTE $PROJECT_URL | ||
| fi | ||
|
|
||
| echo "Remotes:" | ||
| echo '--------------------------------------------------------------------------------' | ||
| git remote --verbose | ||
|
|
||
| # Travis does the git clone with a limited depth. | ||
| # This may not be enough to find the common ancestor with | ||
| # $REMOTE/development so we unshallow the git checkout | ||
| if [[ -a .git/shallow ]]; then | ||
| echo -e '\nTrying to unshallow the repo:' | ||
| echo '--------------------------------------------------------------------------------' | ||
| git fetch --unshallow | ||
| fi | ||
|
|
||
| if [[ "$TRAVIS" == "true" ]]; then | ||
| if [[ "$TRAVIS_PULL_REQUEST" == "false" ]] | ||
| then | ||
| # In main repo, using TRAVIS_COMMIT_RANGE to test the commits | ||
| # that were pushed into a branch | ||
| if [[ "$PROJECT" == "$TRAVIS_REPO_SLUG" ]]; then | ||
| if [[ -z "$TRAVIS_COMMIT_RANGE" ]]; then | ||
| echo "New branch, no commit range from Travis so passing this test by convention" | ||
| exit 0 | ||
| fi | ||
| COMMIT_RANGE=$TRAVIS_COMMIT_RANGE | ||
| fi | ||
| else | ||
| # We want to fetch the code as it is in the PR branch and not | ||
| # the result of the merge into development. This way line numbers | ||
| # reported by Travis will match with the local code. | ||
| LOCAL_BRANCH_REF=travis_pr_$TRAVIS_PULL_REQUEST | ||
| # In Travis the PR target is always origin | ||
| git fetch origin pull/$TRAVIS_PULL_REQUEST/head:refs/$LOCAL_BRANCH_REF | ||
| fi | ||
| fi | ||
|
|
||
| # If not using the commit range from Travis we need to find the common | ||
| # ancestor between $LOCAL_BRANCH_REF and $REMOTE/development | ||
| if [[ -z "$COMMIT_RANGE" ]]; then | ||
| if [[ -z "$LOCAL_BRANCH_REF" ]]; then | ||
| LOCAL_BRANCH_REF=$(git rev-parse --abbrev-ref HEAD) | ||
| fi | ||
| echo -e "\nLast 2 commits in $LOCAL_BRANCH_REF:" | ||
| echo '--------------------------------------------------------------------------------' | ||
| git --no-pager log -2 $LOCAL_BRANCH_REF | ||
|
|
||
| REMOTE_DEVELOPMENT_REF="$REMOTE/development" | ||
| # Make sure that $REMOTE_DEVELOPMENT_REF is a valid reference | ||
| echo -e "\nFetching $REMOTE_DEVELOPMENT_REF" | ||
| echo '--------------------------------------------------------------------------------' | ||
| git fetch $REMOTE development:refs/remotes/$REMOTE_DEVELOPMENT_REF | ||
| LOCAL_BRANCH_SHORT_HASH=$(git rev-parse --short $LOCAL_BRANCH_REF) | ||
| REMOTE_DEVELOPMENT_SHORT_HASH=$(git rev-parse --short $REMOTE_DEVELOPMENT_REF) | ||
|
|
||
| COMMIT=$(git merge-base $LOCAL_BRANCH_REF $REMOTE_DEVELOPMENT_REF) || \ | ||
| echo "No common ancestor found for $(git show $LOCAL_BRANCH_REF -q) and $(git show $REMOTE_DEVELOPMENT_REF -q)" | ||
|
|
||
| if [ -z "$COMMIT" ]; then | ||
| exit 1 | ||
| fi | ||
|
|
||
| COMMIT_SHORT_HASH=$(git rev-parse --short $COMMIT) | ||
|
|
||
| echo -e "\nCommon ancestor between $LOCAL_BRANCH_REF ($LOCAL_BRANCH_SHORT_HASH)"\ | ||
| "and $REMOTE_DEVELOPMENT_REF ($REMOTE_DEVELOPMENT_SHORT_HASH) is $COMMIT_SHORT_HASH:" | ||
| echo '--------------------------------------------------------------------------------' | ||
| git --no-pager show --no-patch $COMMIT_SHORT_HASH | ||
|
|
||
| COMMIT_RANGE="$COMMIT_SHORT_HASH..$LOCAL_BRANCH_SHORT_HASH" | ||
|
|
||
| if [[ -n "$TMP_REMOTE" ]]; then | ||
| git remote remove $TMP_REMOTE | ||
| fi | ||
|
|
||
| else | ||
| echo "Got the commit range from Travis: $COMMIT_RANGE" | ||
| fi | ||
|
|
||
| echo -e '\nRunning flake8 on the diff in the range' "$COMMIT_RANGE" \ | ||
| "($(git rev-list $COMMIT_RANGE | wc -l) commit(s)):" | ||
| echo '--------------------------------------------------------------------------------' | ||
|
|
||
| # We need the following command to exit with 0 hence the echo in case | ||
| # there is no match | ||
| MODIFIED_FILES="$(git diff --name-only $COMMIT_RANGE || echo "no_match")" | ||
|
|
||
| check_files() { | ||
| files="$1" | ||
| shift | ||
| options="$*" | ||
| if [ -n "$files" ]; then | ||
| # Conservative approach: diff without context (--unified=0) so that code | ||
| # that was not changed does not create failures | ||
| git diff --unified=0 $COMMIT_RANGE -- $files | flake8 --diff --max-line-length=120 --show-source $options | ||
| fi | ||
| } | ||
|
|
||
| if [[ "$MODIFIED_FILES" == "no_match" ]]; then | ||
| echo "No file has been modified" | ||
| else | ||
|
|
||
| check_files "$(echo "$MODIFIED_FILES" | grep -v ^examples)" | ||
| check_files "$(echo "$MODIFIED_FILES" | grep ^examples)" \ | ||
| --config ./examples/.flake8 | ||
| fi | ||
| echo -e "No problem detected by flake8\n" | ||
| flake8 --max-line-length=120 --show-source $options --ignore W605,E402,W503 --exclude .git,__pycache__,doc,build,dist,examples/spear_qcp/target_algorithm |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,19 @@ | ||
| MYPYPATH=smac/ | ||
| MYPYOPTS="--ignore-missing-imports --strict" | ||
| MYPYOPTS="$MYPYOPS --disallow-any-unimported --disallow-any-expr --disallow-any-decorated --disallow-any-explicit --disallow-any-generics --disallow-untyped-defs" | ||
| mypy $MYPYOPTS $MYPYPATH | ||
| exit 0 | ||
| #MYPYPATH=smac | ||
| MYPYOPTS="" | ||
|
|
||
| MYPYOPS="$MYPYOPS --ignore-missing-imports --follow-imports skip" | ||
| # We would like to have the following options set, but for now we have to use the ones above to get started | ||
| #MYPYOPTS="--ignore-missing-imports --strict" | ||
| #MYPYOPTS="$MYPYOPS --disallow-any-unimported" | ||
| #MYPYOPTS="$MYPYOPS --disallow-any-expr" | ||
| #MYPYOPTS="$MYPYOPS --disallow-any-decorated" | ||
| #MYPYOPTS="$MYPYOPS --disallow-any-explicit" | ||
| #MYPYOPTS="$MYPYOPS --disallow-any-generics" | ||
| MYPYOPTS="$MYPYOPS --disallow-untyped-decorators" | ||
| MYPYOPTS="$MYPYOPS --disallow-incomplete-defs" | ||
| MYPYOPTS="$MYPYOPS --disallow-untyped-defs" | ||
| # Add the following once the scenario is removed from teh main code or typed | ||
| # https://mypy.readthedocs.io/en/stable/command_line.html#configuring-warnings | ||
| # MYPYOPTS="$MYPYOPS --warn-unused-ignores" | ||
|
|
||
| mypy $MYPYOPTS --show-error-codes smac |
Oops, something went wrong.