From 7e3f62f8656f0c50dfcbca56317705cce0bc8dfc Mon Sep 17 00:00:00 2001 From: Francisco Massa Date: Wed, 2 Dec 2020 11:34:11 +0100 Subject: [PATCH] Miscellaneous linter fixes Replace tabs with spaces, add newlines to files and replace whitelist with allowlist --- .circleci/config.yml | 2 +- .circleci/regenerate.py | 1 + .circleci/unittest/linux/scripts/environment.yml | 2 +- .circleci/unittest/linux/scripts/post_process.sh | 2 +- .circleci/unittest/windows/scripts/setup_env.sh | 2 +- .gitignore | 2 +- packaging/conda/build_vision.sh | 4 ++-- packaging/wheel/relocate.py | 8 ++++---- references/video_classification/README.md | 2 +- torchvision/models/video/README.md | 2 +- 10 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2f6c41357fe..92e0b7891e3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2876,4 +2876,4 @@ workflows: - master jobs: - smoke_test_docker_image_build: - context: org-member \ No newline at end of file + context: org-member diff --git a/.circleci/regenerate.py b/.circleci/regenerate.py index 20847059f32..43f87d93246 100755 --- a/.circleci/regenerate.py +++ b/.circleci/regenerate.py @@ -212,6 +212,7 @@ def cmake_workflows(indentation=6): loader=jinja2.FileSystemLoader(d), lstrip_blocks=True, autoescape=False, + keep_trailing_newline=True, ) with open(os.path.join(d, 'config.yml'), 'w') as f: diff --git a/.circleci/unittest/linux/scripts/environment.yml b/.circleci/unittest/linux/scripts/environment.yml index 91275ff31bd..b2d5efdf533 100644 --- a/.circleci/unittest/linux/scripts/environment.yml +++ b/.circleci/unittest/linux/scripts/environment.yml @@ -15,4 +15,4 @@ dependencies: - future - pillow>=4.1.1 - scipy - - av \ No newline at end of file + - av diff --git a/.circleci/unittest/linux/scripts/post_process.sh b/.circleci/unittest/linux/scripts/post_process.sh index b05be6da37e..a84a0dea55e 100755 --- a/.circleci/unittest/linux/scripts/post_process.sh +++ b/.circleci/unittest/linux/scripts/post_process.sh @@ -5,4 +5,4 @@ set -e eval "$(./conda/bin/conda shell.bash hook)" conda activate ./env -codecov \ No newline at end of file +codecov diff --git a/.circleci/unittest/windows/scripts/setup_env.sh b/.circleci/unittest/windows/scripts/setup_env.sh index 9b8d26a3e94..b0b70631112 100644 --- a/.circleci/unittest/windows/scripts/setup_env.sh +++ b/.circleci/unittest/windows/scripts/setup_env.sh @@ -36,4 +36,4 @@ conda activate "${env_dir}" # 3. Install Conda dependencies printf "* Installing dependencies (except PyTorch)\n" -conda env update --file "${this_dir}/environment.yml" --prune \ No newline at end of file +conda env update --file "${this_dir}/environment.yml" --prune diff --git a/.gitignore b/.gitignore index c332dda4f4a..3c7e579c23c 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,4 @@ gen.yml .vscode/ .idea/ *.orig -*-checkpoint.ipynb \ No newline at end of file +*-checkpoint.ipynb diff --git a/packaging/conda/build_vision.sh b/packaging/conda/build_vision.sh index 79a40cb2cb5..b326012cf22 100755 --- a/packaging/conda/build_vision.sh +++ b/packaging/conda/build_vision.sh @@ -164,9 +164,9 @@ for py_ver in "${DESIRED_PYTHON[@]}"; do mkdir "$output_folder" if [[ "$py_ver" == 3.5 ]]; then - export CONDA_TYPING_CONSTRAINT="- typing" + export CONDA_TYPING_CONSTRAINT="- typing" else - export CONDA_TYPING_CONSTRAINT="" + export CONDA_TYPING_CONSTRAINT="" fi export VSTOOLCHAIN_PACKAGE=vs2017 diff --git a/packaging/wheel/relocate.py b/packaging/wheel/relocate.py index e9bd07bef97..dd2c5d2a4ce 100644 --- a/packaging/wheel/relocate.py +++ b/packaging/wheel/relocate.py @@ -21,7 +21,7 @@ from wheel.bdist_wheel import get_abi_tag -WHITELIST = { +ALLOWLIST = { 'libgcc_s.so.1', 'libstdc++.so.6', 'libm.so.6', 'libdl.so.2', 'librt.so.1', 'libc.so.6', 'libnsl.so.1', 'libutil.so.1', 'libpthread.so.0', @@ -31,7 +31,7 @@ 'libglib-2.0.so.0', 'ld-linux-x86-64.so.2', 'ld-2.17.so' } -WINDOWS_WHITELIST = { +WINDOWS_ALLOWLIST = { 'MSVCP140.dll', 'KERNEL32.dll', 'VCRUNTIME140_1.dll', 'VCRUNTIME140.dll', 'api-ms-win-crt-heap-l1-1-0.dll', @@ -164,7 +164,7 @@ def relocate_elf_library(patchelf, output_dir, output_library, binary): print('Omitting {0}'.format(library)) continue - if library in WHITELIST: + if library in ALLOWLIST: # Omit glibc/gcc/system libraries print('Omitting {0}'.format(library)) continue @@ -275,7 +275,7 @@ def relocate_dll_library(dumpbin, output_dir, output_library, binary): while binary_queue != []: library, parent = binary_queue.pop(0) - if library in WINDOWS_WHITELIST or library.startswith('api-ms-win'): + if library in WINDOWS_ALLOWLIST or library.startswith('api-ms-win'): print('Omitting {0}'.format(library)) continue diff --git a/references/video_classification/README.md b/references/video_classification/README.md index 9a201c646ca..ef7db6dcd90 100644 --- a/references/video_classification/README.md +++ b/references/video_classification/README.md @@ -31,4 +31,4 @@ python -m torch.distributed.launch --nproc_per_node=8 --use_env train.py --data- ```bash python train.py --data-path=/data/kinectics400 --train-dir=train --val-dir=val --batch-size=8 --cache-dataset -``` \ No newline at end of file +``` diff --git a/torchvision/models/video/README.md b/torchvision/models/video/README.md index 7f6e76b7d92..23dd673d053 100644 --- a/torchvision/models/video/README.md +++ b/torchvision/models/video/README.md @@ -57,4 +57,4 @@ This translates in the following set of command-line arguments (please note that [0] _D. Tran, H. Wang, L. Torresani, J. Ray, Y. LeCun and M. Paluri_: A Closer Look at Spatiotemporal Convolutions for Action Recognition. _CVPR 2018_ ([paper](https://research.fb.com/wp-content/uploads/2018/04/a-closer-look-at-spatiotemporal-convolutions-for-action-recognition.pdf)) -[1] _W. Kay, J. Carreira, K. Simonyan, B. Zhang, C. Hillier, S. Vijayanarasimhan, F. Viola, T. Green, T. Back, P. Natsev, M. Suleyman, A. Zisserman_: The Kinetics Human Action Video Dataset ([paper](https://arxiv.org/abs/1705.06950)) \ No newline at end of file +[1] _W. Kay, J. Carreira, K. Simonyan, B. Zhang, C. Hillier, S. Vijayanarasimhan, F. Viola, T. Green, T. Back, P. Natsev, M. Suleyman, A. Zisserman_: The Kinetics Human Action Video Dataset ([paper](https://arxiv.org/abs/1705.06950))