diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1cc91e2221..a2c5d11fe7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,3 +9,9 @@ repos: hooks: - id: flake8 language_version: python3 +- repo: https://github.com/lovesegfault/beautysh + rev: master + hooks: + - id: beautysh + language_version: python3 + args: [-i, '2'] # 2-space indentaion diff --git a/scripts/build_package.sh b/scripts/build_package.sh index 1266ead8bf..4818d7a6e2 100755 --- a/scripts/build_package.sh +++ b/scripts/build_package.sh @@ -4,26 +4,26 @@ set -e set -x if [ ! -d "dvc" ]; then - echo "Please run this script from repository root" >&2 - exit 1 + echo "Please run this script from repository root" >&2 + exit 1 fi -echo 'PKG = "pip"' > dvc/utils/build.py +echo 'PKG = "pip"' >dvc/utils/build.py python setup.py sdist python setup.py bdist_wheel --universal # Make sure we have a correct version if [[ -n "$TRAVIS_TAG" ]]; then - pip uninstall -y dvc - if which dvc; then - echo "ERROR: dvc command still exists! Unable to verify dvc version." >&2 - exit 1 - fi - pip install dist/dvc-*.whl - if [[ "$(dvc --version)" != "$TRAVIS_TAG" ]]; then - echo "ERROR: 'dvc --version'$(dvc -V) doesn't match '$TRAVIS_TAG'" >&2 - exit 1 - fi - pip uninstall -y dvc + pip uninstall -y dvc + if which dvc; then + echo "ERROR: dvc command still exists! Unable to verify dvc version." >&2 + exit 1 + fi + pip install dist/dvc-*.whl + if [[ "$(dvc --version)" != "$TRAVIS_TAG" ]]; then + echo "ERROR: 'dvc --version'$(dvc -V) doesn't match '$TRAVIS_TAG'" >&2 + exit 1 + fi + pip uninstall -y dvc fi diff --git a/scripts/build_posix.sh b/scripts/build_posix.sh index 9903cf9043..83386e40d7 100755 --- a/scripts/build_posix.sh +++ b/scripts/build_posix.sh @@ -4,13 +4,13 @@ set -e set -x if [[ "$(uname)" == 'Linux' ]]; then - INSTALL_DIR=usr - FPM_FLAGS= + INSTALL_DIR=usr + FPM_FLAGS= else - INSTALL_DIR=usr/local - FPM_FLAGS='--osxpkg-identifier-prefix com.iterative' - FPM_FLAGS+=' --after-install scripts/fpm/after-install.sh' - FPM_FLAGS+=' --after-remove scripts/fpm/after-remove.sh' + INSTALL_DIR=usr/local + FPM_FLAGS='--osxpkg-identifier-prefix com.iterative' + FPM_FLAGS+=' --after-install scripts/fpm/after-install.sh' + FPM_FLAGS+=' --after-remove scripts/fpm/after-remove.sh' fi BUILD_DIR=build @@ -21,129 +21,121 @@ LIB_DIR=$BUILD_DIR/$INSTALL_DIR/lib FPM_PACKAGE_DIRS="usr" ZSH_CMPLT_DIR=usr/share/zsh/site-functions/_dvc if [[ "$(uname)" == 'Linux' ]]; then - BASH_CMPLT_DIR=etc/bash_completion.d - FPM_PACKAGE_DIRS="$FPM_PACKAGE_DIRS etc" + BASH_CMPLT_DIR=etc/bash_completion.d + FPM_PACKAGE_DIRS="$FPM_PACKAGE_DIRS etc" else - BASH_CMPLT_DIR=usr/local/etc/bash_completion.d + BASH_CMPLT_DIR=usr/local/etc/bash_completion.d fi -print_error() -{ - echo -e "\e[31m$1\e[0m" >&2 +print_error() { + echo -e "\e[31m$1\e[0m" >&2 } if [ ! -d "dvc" ]; then - print_error "Please run this script from repository root" - exit 1 + print_error "Please run this script from repository root" + exit 1 fi trap 'print_error "FAIL"; exit 1' ERR -print_info() -{ - echo -e "\e[32m$1\e[0m" +print_info() { + echo -e "\e[32m$1\e[0m" } -command_exists() -{ - command -v $1 > /dev/null 2>&1 +command_exists() { + command -v $1 >/dev/null 2>&1 } -fpm_build() -{ - print_info "Building $1..." - VERSION=$(python -c "import dvc; from dvc import __version__; print(str(__version__))") - fpm -s dir \ - -f \ - -t $1 \ - --description "$DESC" \ - $FPM_FLAGS \ - -n dvc \ - -v $VERSION \ - -C $BUILD_DIR \ - $FPM_PACKAGE_DIRS +fpm_build() { + print_info "Building $1..." + VERSION=$(python -c "import dvc; from dvc import __version__; print(str(__version__))") + fpm -s dir \ + -f \ + -t $1 \ + --description "$DESC" \ + $FPM_FLAGS \ + -n dvc \ + -v $VERSION \ + -C $BUILD_DIR \ + $FPM_PACKAGE_DIRS } -cleanup() -{ - print_info "Cleaning up..." - rm -rf build +cleanup() { + print_info "Cleaning up..." + rm -rf build } -install_dependencies() -{ - print_info "Installing fpm..." - if command_exists dnf; then - sudo dnf install ruby-devel gcc make rpm-build - elif command_exists yum; then - sudo yum install ruby-devel gcc make rpm-build - elif command_exists apt-get; then - sudo apt-get update -y - sudo apt-get install ruby-dev build-essential rpm python-pip python-dev - elif command_exists brew; then - brew install ruby - else - echo "Unable to install fpm dependencies" && exit 1 - fi - - gem install --no-document fpm - - # https://github.com/iterative/dvc/issues/2970 - gem uninstall -i /Users/travis/.rvm/gems/ruby-2.4.3@global rubygems-bundler - - print_info "Installing requirements..." - pip install .[all] - pip install -r scripts/build-requirements.txt +install_dependencies() { + print_info "Installing fpm..." + if command_exists dnf; then + sudo dnf install ruby-devel gcc make rpm-build + elif command_exists yum; then + sudo yum install ruby-devel gcc make rpm-build + elif command_exists apt-get; then + sudo apt-get update -y + sudo apt-get install ruby-dev build-essential rpm python-pip python-dev + elif command_exists brew; then + brew install ruby + else + echo "Unable to install fpm dependencies" && exit 1 + fi + + gem install --no-document fpm + + # https://github.com/iterative/dvc/issues/2970 + gem uninstall -i /Users/travis/.rvm/gems/ruby-2.4.3@global rubygems-bundler + + print_info "Installing requirements..." + pip install .[all] + pip install -r scripts/build-requirements.txt } -build_dvc() -{ - print_info "Building dvc binary..." - pyinstaller \ - --additional-hooks-dir $(pwd)/scripts/hooks dvc/__main__.py \ - --name dvc \ - --distpath $LIB_DIR \ - --specpath $BUILD_DIR - - $LIB_DIR/dvc/dvc --help - - # NOTE: in osxpkg fpm replaces symlinks with actual file that it - # points to, so we need to use after-install hook. See FPM_FLAGS - # above. - if [[ "$(uname)" == 'Linux' ]]; then - mkdir -p $BIN_DIR - pushd $BIN_DIR - ln -s ../lib/dvc/dvc dvc - popd - $BIN_DIR/dvc --help - fi - - # NOTE: temporarily not adding scripts to mac package. See [1] - # [1] https://github.com/iterative/dvc/issues/2585 - if [[ "$(uname)" == 'Linux' ]]; then - mkdir -p $BUILD_DIR/$BASH_CMPLT_DIR - cp scripts/completion/dvc.bash $BUILD_DIR/$BASH_CMPLT_DIR/dvc - - mkdir -p $BUILD_DIR/$ZSH_CMPLT_DIR - cp scripts/completion/dvc.zsh $BUILD_DIR/$ZSH_CMPLT_DIR - fi +build_dvc() { + print_info "Building dvc binary..." + pyinstaller \ + --additional-hooks-dir $(pwd)/scripts/hooks dvc/__main__.py \ + --name dvc \ + --distpath $LIB_DIR \ + --specpath $BUILD_DIR + + $LIB_DIR/dvc/dvc --help + + # NOTE: in osxpkg fpm replaces symlinks with actual file that it + # points to, so we need to use after-install hook. See FPM_FLAGS + # above. + if [[ "$(uname)" == 'Linux' ]]; then + mkdir -p $BIN_DIR + pushd $BIN_DIR + ln -s ../lib/dvc/dvc dvc + popd + $BIN_DIR/dvc --help + fi + + # NOTE: temporarily not adding scripts to mac package. See [1] + # [1] https://github.com/iterative/dvc/issues/2585 + if [[ "$(uname)" == 'Linux' ]]; then + mkdir -p $BUILD_DIR/$BASH_CMPLT_DIR + cp scripts/completion/dvc.bash $BUILD_DIR/$BASH_CMPLT_DIR/dvc + + mkdir -p $BUILD_DIR/$ZSH_CMPLT_DIR + cp scripts/completion/dvc.zsh $BUILD_DIR/$ZSH_CMPLT_DIR + fi } -build() -{ - cleanup - echo "PKG = \"$1\"" > dvc/utils/build.py - build_dvc - fpm_build $1 +build() { + cleanup + echo "PKG = \"$1\"" >dvc/utils/build.py + build_dvc + fpm_build $1 } install_dependencies if [[ "$(uname)" == 'Linux' ]]; then - build rpm - build deb + build rpm + build deb else - build osxpkg + build osxpkg fi cleanup diff --git a/scripts/build_snap.sh b/scripts/build_snap.sh index ce78aea583..93e7d51cc5 100755 --- a/scripts/build_snap.sh +++ b/scripts/build_snap.sh @@ -18,8 +18,8 @@ sudo snap install --dangerous --classic dvc_*.snap if [[ -n "$TRAVIS_TAG" ]]; then # Make sure we have a correct version if [[ "$(dvc --version)" != "$TRAVIS_TAG" ]]; then - echo "ERROR: 'dvc --version'$(dvc -V) doesn't match '$TRAVIS_TAG'" >&2 - exit 1 + echo "ERROR: 'dvc --version'$(dvc -V) doesn't match '$TRAVIS_TAG'" >&2 + exit 1 fi fi # ensure basic commands can run diff --git a/scripts/ci/before_install.sh b/scripts/ci/before_install.sh index 2e9461be41..451179c9bb 100644 --- a/scripts/ci/before_install.sh +++ b/scripts/ci/before_install.sh @@ -6,53 +6,53 @@ set -e scriptdir="$(dirname $0)" if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - ulimit -a - sudo sysctl -w kern.maxproc=2048 - sudo sysctl -w kern.maxprocperuid=2048 - echo '\nulimit -u 2048' >> ~/.bash_profile - ulimit -a + ulimit -a + sudo sysctl -w kern.maxproc=2048 + sudo sysctl -w kern.maxprocperuid=2048 + echo '\nulimit -u 2048' >>~/.bash_profile + ulimit -a fi -echo > env.sh +echo >env.sh if [[ "$TRAVIS_BUILD_STAGE_NAME" == "Test" ]]; then - if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then - # NOTE: ssh keys for ssh test to be able to ssh to the localhost - ssh-keygen -t rsa -N "" -f mykey - mkdir -p ~/.ssh - cp mykey ~/.ssh/id_rsa - cp mykey.pub ~/.ssh/id_rsa.pub - cat mykey.pub >> ~/.ssh/authorized_keys - ssh-keyscan localhost >> ~/.ssh/known_hosts - ssh localhost ls &> /dev/null - ssh-keyscan 127.0.0.1 >> ~/.ssh/known_hosts - ssh 127.0.0.1 ls &> /dev/null - ssh-keyscan 0.0.0.0 >> ~/.ssh/known_hosts - ssh 0.0.0.0 ls &> /dev/null - fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then - bash "$scriptdir/install_azurite.sh" - bash "$scriptdir/install_oss.sh" - bash "$scriptdir/install_hadoop.sh" - fi - - if [[ "$TRAVIS_OS_NAME" == "osx" && "$TRAVIS_PULL_REQUEST" == "false" ]]; then - brew install openssl - $scriptdir/retry.sh brew cask install google-cloud-sdk - fi + if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then + # NOTE: ssh keys for ssh test to be able to ssh to the localhost + ssh-keygen -t rsa -N "" -f mykey + mkdir -p ~/.ssh + cp mykey ~/.ssh/id_rsa + cp mykey.pub ~/.ssh/id_rsa.pub + cat mykey.pub >>~/.ssh/authorized_keys + ssh-keyscan localhost >>~/.ssh/known_hosts + ssh localhost ls &>/dev/null + ssh-keyscan 127.0.0.1 >>~/.ssh/known_hosts + ssh 127.0.0.1 ls &>/dev/null + ssh-keyscan 0.0.0.0 >>~/.ssh/known_hosts + ssh 0.0.0.0 ls &>/dev/null + fi + + if [ "$TRAVIS_OS_NAME" == "linux" ]; then + bash "$scriptdir/install_azurite.sh" + bash "$scriptdir/install_oss.sh" + bash "$scriptdir/install_hadoop.sh" + fi + + if [[ "$TRAVIS_OS_NAME" == "osx" && "$TRAVIS_PULL_REQUEST" == "false" ]]; then + brew install openssl + $scriptdir/retry.sh brew cask install google-cloud-sdk + fi fi if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then - $scriptdir/retry.sh choco install python --version 3.7.5 - echo 'PATH="/c/Python37:/c/Python37/Scripts:$PATH"' >> env.sh + $scriptdir/retry.sh choco install python --version 3.7.5 + echo 'PATH="/c/Python37:/c/Python37/Scripts:$PATH"' >>env.sh elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - ln -s -f /usr/local/bin/python3 /usr/local/bin/python - ln -s -f /usr/local/bin/pip3 /usr/local/bin/pip + ln -s -f /usr/local/bin/python3 /usr/local/bin/python + ln -s -f /usr/local/bin/pip3 /usr/local/bin/pip fi if [[ -n "$TRAVIS_TAG" ]]; then - echo "export SNAP_CHANNEL=stable" >> env.sh + echo "export SNAP_CHANNEL=stable" >>env.sh else - echo "export SNAP_CHANNEL=edge" >> env.sh + echo "export SNAP_CHANNEL=edge" >>env.sh fi diff --git a/scripts/ci/check_patch.sh b/scripts/ci/check_patch.sh index 0ee8f8302c..f357086349 100755 --- a/scripts/ci/check_patch.sh +++ b/scripts/ci/check_patch.sh @@ -3,7 +3,7 @@ set -x set -e -pip install Pygments collective.checkdocs pre-commit +pip install Pygments collective.checkdocs pre-commit # stop the build if there are any readme formatting errors python setup.py checkdocs diff --git a/scripts/ci/check_python.sh b/scripts/ci/check_python.sh index 08e256cc46..b4ca089329 100644 --- a/scripts/ci/check_python.sh +++ b/scripts/ci/check_python.sh @@ -4,11 +4,11 @@ set -e set -x if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then - where python - where pip + where python + where pip else - which python - which pip + which python + which pip fi py_ver="$(python -c 'import sys; print(sys.version[0])')" diff --git a/scripts/ci/deploy_condition.sh b/scripts/ci/deploy_condition.sh index 9c2a600b5d..6b95494347 100755 --- a/scripts/ci/deploy_condition.sh +++ b/scripts/ci/deploy_condition.sh @@ -3,7 +3,7 @@ set -e if [[ $TRAVIS_EVENT_TYPE = pull_request || $TRAVIS_EVENT_TPYE = cron ]]; then - exit 2 + exit 2 fi # positional args are assumed to be file glob patterns to deploy diff --git a/scripts/ci/install.sh b/scripts/ci/install.sh index d91c207be5..425b6eaf62 100644 --- a/scripts/ci/install.sh +++ b/scripts/ci/install.sh @@ -14,9 +14,9 @@ git config --global user.email "dvctester@example.com" git config --global user.name "DVC Tester" if [[ "$TRAVIS_SECURE_ENV_VARS" == "true" ]]; then - aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID - aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY - aws configure set region us-east-2 + aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID + aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY + aws configure set region us-east-2 - openssl enc -d -aes-256-cbc -md md5 -k $GCP_CREDS -in scripts/ci/gcp-creds.json.enc -out scripts/ci/gcp-creds.json + openssl enc -d -aes-256-cbc -md md5 -k $GCP_CREDS -in scripts/ci/gcp-creds.json.enc -out scripts/ci/gcp-creds.json fi diff --git a/scripts/ci/install_azurite.sh b/scripts/ci/install_azurite.sh index 813d5c03b3..d02223d8a0 100755 --- a/scripts/ci/install_azurite.sh +++ b/scripts/ci/install_azurite.sh @@ -4,18 +4,18 @@ set -e set -x # install docker - export DEBIAN_FRONTEND=noninteractive - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - sudo apt-get update - sudo apt-get install -y docker-ce +export DEBIAN_FRONTEND=noninteractive +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - +sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" +sudo apt-get update +sudo apt-get install -y docker-ce # run azurite sudo docker run -d --restart always -e executable=blob -p 10000:10000 \ - --tmpfs /opt/azurite/folder \ - mcr.microsoft.com/azure-storage/azurite:3.3.0-preview \ - azurite -l /data --blobHost 0.0.0.0 + --tmpfs /opt/azurite/folder \ + mcr.microsoft.com/azure-storage/azurite:3.3.0-preview \ + azurite -l /data --blobHost 0.0.0.0 # save secrets -echo "export AZURE_STORAGE_CONTAINER_NAME='travis-tests'" >> env.sh -echo "export AZURE_STORAGE_CONNECTION_STRING='DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;'" >> env.sh +echo "export AZURE_STORAGE_CONTAINER_NAME='travis-tests'" >>env.sh +echo "export AZURE_STORAGE_CONNECTION_STRING='DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://127.0.0.1:10000/devstoreaccount1;'" >>env.sh diff --git a/scripts/ci/install_hadoop.sh b/scripts/ci/install_hadoop.sh index ee7e74845c..eaf50e977b 100755 --- a/scripts/ci/install_hadoop.sh +++ b/scripts/ci/install_hadoop.sh @@ -17,14 +17,14 @@ sudo mkdir hadoop sudo mv hadoop-2.6.5/* hadoop/ popd -echo "export HADOOP_HOME=/usr/local/hadoop" >> env.sh -echo "export HADOOP_MAPRED_HOME=/usr/local/hadoop" >> env.sh -echo "export HADOOP_COMMON_HOME=/usr/local/hadoop" >> env.sh -echo "export HADOOP_HDFS_HOME=/usr/local/hadoop" >> env.sh -echo "export YARN_HOME=/usr/local/hadoop" >> env.sh -echo "export HADOOP_COMMON_LIB_NATIVE_DIR=/usr/local/hadoop/lib/native" >> env.sh -echo "export JAVA_HOME=/usr/" >> env.sh -echo "export PATH=\$PATH:/usr/local/hadoop/sbin:/usr/local/hadoop/bin:$JAVA_PATH/bin" >> env.sh +echo "export HADOOP_HOME=/usr/local/hadoop" >>env.sh +echo "export HADOOP_MAPRED_HOME=/usr/local/hadoop" >>env.sh +echo "export HADOOP_COMMON_HOME=/usr/local/hadoop" >>env.sh +echo "export HADOOP_HDFS_HOME=/usr/local/hadoop" >>env.sh +echo "export YARN_HOME=/usr/local/hadoop" >>env.sh +echo "export HADOOP_COMMON_LIB_NATIVE_DIR=/usr/local/hadoop/lib/native" >>env.sh +echo "export JAVA_HOME=/usr/" >>env.sh +echo "export PATH=\$PATH:/usr/local/hadoop/sbin:/usr/local/hadoop/bin:$JAVA_PATH/bin" >>env.sh source env.sh diff --git a/scripts/ci/install_oss.sh b/scripts/ci/install_oss.sh index 11f4da7cd0..a56ac7cb79 100644 --- a/scripts/ci/install_oss.sh +++ b/scripts/ci/install_oss.sh @@ -5,6 +5,6 @@ set -euo pipefail git clone https://github.com/iterative/oss-emulator.git sudo docker image build -t oss:1.0 oss-emulator sudo docker run --detach --restart always -p 8880:8880 --name oss-emulator oss:1.0 -echo "export OSS_ENDPOINT='localhost:8880'" >> env.sh -echo "export OSS_ACCESS_KEY_ID='AccessKeyID'" >> env.sh -echo "export OSS_ACCESS_KEY_SECRET='AccessKeySecret'" >> env.sh +echo "export OSS_ENDPOINT='localhost:8880'" >>env.sh +echo "export OSS_ACCESS_KEY_ID='AccessKeyID'" >>env.sh +echo "export OSS_ACCESS_KEY_SECRET='AccessKeySecret'" >>env.sh diff --git a/scripts/ci/retry.sh b/scripts/ci/retry.sh index 490f92908a..07458c9948 100755 --- a/scripts/ci/retry.sh +++ b/scripts/ci/retry.sh @@ -4,8 +4,8 @@ set -e N_RETRIES=3 for i in $(seq $N_RETRIES); do - echo "Attempt #$i" - $@ && exit $? + echo "Attempt #$i" + $@ && exit $? done exit $? diff --git a/scripts/ci/script.sh b/scripts/ci/script.sh index 48e7db623a..37bfa37f02 100644 --- a/scripts/ci/script.sh +++ b/scripts/ci/script.sh @@ -5,8 +5,7 @@ set -e python -mtests -if [[ "$TRAVIS_PULL_REQUEST" == "false" && \ - "$TRAVIS_SECURE_ENV_VARS" == "true" ]]; then - pip install codecov - codecov +if [[ "$TRAVIS_PULL_REQUEST" == "false" && "$TRAVIS_SECURE_ENV_VARS" == "true" ]]; then + pip install codecov + codecov fi diff --git a/scripts/completion/dvc.bash b/scripts/completion/dvc.bash index 8c2d3b0612..0f56bbc09a 100644 --- a/scripts/completion/dvc.bash +++ b/scripts/completion/dvc.bash @@ -9,8 +9,8 @@ #---------------------------------------------------------- _dvc_commands='add cache checkout commit config destroy diff fetch get-url get gc \ - import-url import init install lock metrics move pipeline pull push \ - remote remove repro root run status unlock unprotect update version' + import-url import init install lock metrics move pipeline pull push \ + remote remove repro root run status unlock unprotect update version' _dvc_options='-h --help -V --version' _dvc_global_options='-h --help -q --quiet -v --verbose' @@ -71,8 +71,8 @@ _dvc_version='' # x="hello" # ${!x} -> ${hello} -> "world" # -_dvc () { - replace_hyphen () { +_dvc() { + replace_hyphen() { echo $(echo $1 | sed 's/-/_/g') } @@ -83,7 +83,7 @@ _dvc () { if [ "${COMP_CWORD}" -eq 1 ]; then case "$word" in -*) COMPREPLY=($(compgen -W "$_dvc_options" -- "$word")) ;; - *) COMPREPLY=($(compgen -W "$_dvc_commands" -- "$word")) ;; + *) COMPREPLY=($(compgen -W "$_dvc_commands" -- "$word")) ;; esac elif [ "${COMP_CWORD}" -eq 2 ]; then local options_list="_dvc_$(replace_hyphen ${COMP_WORDS[1]})" diff --git a/scripts/completion/dvc.zsh b/scripts/completion/dvc.zsh index 03f9fa69c1..4e718026c7 100644 --- a/scripts/completion/dvc.zsh +++ b/scripts/completion/dvc.zsh @@ -275,34 +275,34 @@ _arguments \ '*::args:->args' case $words[1] in - add) _arguments $_dvc_global_options $_dvc_add ;; - cache) _arguments $_dvc_global_options $_dvc_cache ;; - checkout) _arguments $_dvc_global_options $_dvc_checkout ;; - commit) _arguments $_dvc_global_options $_dvc_commit ;; - config) _arguments $_dvc_global_options $_dvc_config ;; - destroy) _arguments $_dvc_global_options $_dvc_destroy ;; - diff) _arguments $_dvc_global_options $_dvc_diff ;; - fetch) _arguments $_dvc_global_options $_dvc_fetch ;; - get-url) _arguments $_dvc_global_options $_dvc_geturl ;; - get) _arguments $_dvc_global_options $_dvc_get ;; - gc) _arguments $_dvc_global_options $_dvc_gc ;; - import-url) _arguments $_dvc_global_options $_dvc_importurl ;; - import) _arguments $_dvc_global_options $_dvc_import ;; - init) _arguments $_dvc_global_options $_dvc_init ;; - install) _arguments $_dvc_global_options $_dvc_install ;; - lock) _arguments $_dvc_global_options $_dvc_lock ;; - metrics) _arguments $_dvc_global_options $_dvc_metrics ;; - move) _arguments $_dvc_global_options $_dvc_move ;; - pipeline) _arguments $_dvc_global_options $_dvc_pipeline ;; - pull) _arguments $_dvc_global_options $_dvc_pull ;; - push) _arguments $_dvc_global_options $_dvc_push ;; - remote) _arguments $_dvc_global_options $_dvc_remote ;; - remove) _arguments $_dvc_global_options $_dvc_remove ;; - repro) _arguments $_dvc_global_options $_dvc_repro ;; - root) _arguments $_dvc_global_options $_dvc_root ;; - run) _arguments $_dvc_global_options $_dvc_run ;; - status) _arguments $_dvc_global_options $_dvc_status ;; - unlock) _arguments $_dvc_global_options $_dvc_unlock ;; - unprotect) _arguments $_dvc_global_options $_dvc_unprotect ;; - update) _arguments $_dvc_global_options $_dvc_update ;; + add) _arguments $_dvc_global_options $_dvc_add ;; + cache) _arguments $_dvc_global_options $_dvc_cache ;; + checkout) _arguments $_dvc_global_options $_dvc_checkout ;; + commit) _arguments $_dvc_global_options $_dvc_commit ;; + config) _arguments $_dvc_global_options $_dvc_config ;; + destroy) _arguments $_dvc_global_options $_dvc_destroy ;; + diff) _arguments $_dvc_global_options $_dvc_diff ;; + fetch) _arguments $_dvc_global_options $_dvc_fetch ;; + get-url) _arguments $_dvc_global_options $_dvc_geturl ;; + get) _arguments $_dvc_global_options $_dvc_get ;; + gc) _arguments $_dvc_global_options $_dvc_gc ;; + import-url) _arguments $_dvc_global_options $_dvc_importurl ;; + import) _arguments $_dvc_global_options $_dvc_import ;; + init) _arguments $_dvc_global_options $_dvc_init ;; + install) _arguments $_dvc_global_options $_dvc_install ;; + lock) _arguments $_dvc_global_options $_dvc_lock ;; + metrics) _arguments $_dvc_global_options $_dvc_metrics ;; + move) _arguments $_dvc_global_options $_dvc_move ;; + pipeline) _arguments $_dvc_global_options $_dvc_pipeline ;; + pull) _arguments $_dvc_global_options $_dvc_pull ;; + push) _arguments $_dvc_global_options $_dvc_push ;; + remote) _arguments $_dvc_global_options $_dvc_remote ;; + remove) _arguments $_dvc_global_options $_dvc_remove ;; + repro) _arguments $_dvc_global_options $_dvc_repro ;; + root) _arguments $_dvc_global_options $_dvc_root ;; + run) _arguments $_dvc_global_options $_dvc_run ;; + status) _arguments $_dvc_global_options $_dvc_status ;; + unlock) _arguments $_dvc_global_options $_dvc_unlock ;; + unprotect) _arguments $_dvc_global_options $_dvc_unprotect ;; + update) _arguments $_dvc_global_options $_dvc_update ;; esac diff --git a/scripts/pypi_upload.sh b/scripts/pypi_upload.sh index 572bc0a2ee..5c9115662d 100755 --- a/scripts/pypi_upload.sh +++ b/scripts/pypi_upload.sh @@ -3,8 +3,8 @@ set -e if [ ! -d "dvc" ]; then - echo "Please run this script from repository root" - exit 1 + echo "Please run this script from repository root" + exit 1 fi rm -rf dist/