From f4a275b6d72ed8f7ce879cd045a3858424ad5641 Mon Sep 17 00:00:00 2001 From: clee2000 <44682903+clee2000@users.noreply.github.com> Date: Fri, 10 Jan 2025 14:43:42 -0800 Subject: [PATCH] [CI] Enable NEWLINE linter (#6162) * Copy over newlines_linter.py from https://github.com/pytorch/pytorch/blob/a94ec0a9a5ac91fcd9f69d6640ab0fe1efd068ae/tools/linter/adapters/newlines_linter.py * Enable NEWLINE linter in CI * Adds some files to the ignore list that probably shouldn't be changed * Applies the linter `lintrunner -a --all-files --take NEWLINE` We should move some of the adapter to some common place at some point, or make it so that init will take them from pytorch automatically --- .github/workflows/lint.yml | 2 +- .github/workflows/tflint.yml | 1 - .lintrunner.toml | 3 +++ .../modules/runner-binaries-syncer/variables.tf | 1 - tools/rockset_migration/README.md | 1 - tools/self-hosted-runner-utils/list-vpc-dependencies.sh | 1 - torchci/clickhouse_queries/cost_job_per_gpu/query.sql | 1 - .../clickhouse_queries/cost_job_per_owning_account/query.sql | 1 - torchci/clickhouse_queries/cost_job_per_platform/query.sql | 1 - torchci/clickhouse_queries/cost_job_per_provider/query.sql | 1 - torchci/clickhouse_queries/cost_job_per_runner_type/query.sql | 1 - .../clickhouse_queries/cost_job_per_workflow_name/query.sql | 1 - torchci/clickhouse_queries/duration_job_per_gpu/query.sql | 1 - torchci/clickhouse_queries/duration_job_per_job_name/query.sql | 1 - .../duration_job_per_owning_account/query.sql | 1 - torchci/clickhouse_queries/duration_job_per_platform/query.sql | 1 - torchci/clickhouse_queries/duration_job_per_provider/query.sql | 1 - torchci/clickhouse_queries/duration_job_per_repo/query.sql | 1 - .../clickhouse_queries/duration_job_per_runner_type/query.sql | 1 - .../duration_job_per_workflow_name/query.sql | 1 - 20 files changed, 4 insertions(+), 19 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a0e34353be..f00e197208 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -37,7 +37,7 @@ jobs: - name: Run lintrunner on all files - Linux run: | set +e - if ! lintrunner -v --force-color --all-files --tee-json=lint.json --take ACTIONLINT,MYPY,RUSTFMT,COPYRIGHT,LINTRUNNER_VERSION,UFMT; then + if ! lintrunner -v --force-color --all-files --tee-json=lint.json --take ACTIONLINT,MYPY,RUSTFMT,COPYRIGHT,LINTRUNNER_VERSION,UFMT,NEWLINE; then echo "" echo -e "\e[1m\e[36mYou can reproduce these results locally by using \`lintrunner -m main\`.\e[0m" exit 1 diff --git a/.github/workflows/tflint.yml b/.github/workflows/tflint.yml index 11cae1953d..6324045d29 100644 --- a/.github/workflows/tflint.yml +++ b/.github/workflows/tflint.yml @@ -123,4 +123,3 @@ jobs: - name: "Run terraform validate terraform-aws-github-runner" working-directory: terraform-aws-github-runner run: terraform validate - diff --git a/.lintrunner.toml b/.lintrunner.toml index d29b4a87c6..db94d33516 100644 --- a/.lintrunner.toml +++ b/.lintrunner.toml @@ -111,6 +111,9 @@ exclude_patterns=[ '**/*.ptl', '**/fixtures/**', '**/snapshots/**', + '.github/actions/setup-ssh/index.js', + 'aws/lambda/log-classifier/data/**', + 'tools/clang-tidy-checks/*-patches/**', ] command = [ 'python3', diff --git a/terraform-aws-github-runner/modules/runner-binaries-syncer/variables.tf b/terraform-aws-github-runner/modules/runner-binaries-syncer/variables.tf index e874ff96bf..22f2c7a52f 100644 --- a/terraform-aws-github-runner/modules/runner-binaries-syncer/variables.tf +++ b/terraform-aws-github-runner/modules/runner-binaries-syncer/variables.tf @@ -55,4 +55,3 @@ variable "runner_allow_prerelease_binaries" { type = bool default = false } - diff --git a/tools/rockset_migration/README.md b/tools/rockset_migration/README.md index fe6052c2e8..c410aa183b 100644 --- a/tools/rockset_migration/README.md +++ b/tools/rockset_migration/README.md @@ -1,2 +1 @@ This folder contains tools/scripts used to help with migrating away from Rockset - diff --git a/tools/self-hosted-runner-utils/list-vpc-dependencies.sh b/tools/self-hosted-runner-utils/list-vpc-dependencies.sh index 18bbb1b8a5..b77ec17b4d 100644 --- a/tools/self-hosted-runner-utils/list-vpc-dependencies.sh +++ b/tools/self-hosted-runner-utils/list-vpc-dependencies.sh @@ -15,4 +15,3 @@ aws ec2 describe-vpn-gateways --region $region --filters 'Name=attachment.vpc-id aws ec2 describe-network-interfaces --region $region --filters 'Name=vpc-id,Values='$vpc | grep NetworkInterfaceId aws ec2 describe-carrier-gateways --region $region --filters Name=vpc-id,Values=$vpc | grep CarrierGatewayId aws ec2 describe-local-gateway-route-table-vpc-associations --region $region --filters Name=vpc-id,Values=$vpc | grep LocalGatewayRouteTableVpcAssociationId - diff --git a/torchci/clickhouse_queries/cost_job_per_gpu/query.sql b/torchci/clickhouse_queries/cost_job_per_gpu/query.sql index f3ffc4c70b..0d29eba12d 100644 --- a/torchci/clickhouse_queries/cost_job_per_gpu/query.sql +++ b/torchci/clickhouse_queries/cost_job_per_gpu/query.sql @@ -21,4 +21,3 @@ group by gpu order by granularity_bucket asc - diff --git a/torchci/clickhouse_queries/cost_job_per_owning_account/query.sql b/torchci/clickhouse_queries/cost_job_per_owning_account/query.sql index c8b3530fa9..ba09aa56d9 100644 --- a/torchci/clickhouse_queries/cost_job_per_owning_account/query.sql +++ b/torchci/clickhouse_queries/cost_job_per_owning_account/query.sql @@ -21,4 +21,3 @@ group by owning_account order by granularity_bucket asc - diff --git a/torchci/clickhouse_queries/cost_job_per_platform/query.sql b/torchci/clickhouse_queries/cost_job_per_platform/query.sql index dc3a28c977..856a410597 100644 --- a/torchci/clickhouse_queries/cost_job_per_platform/query.sql +++ b/torchci/clickhouse_queries/cost_job_per_platform/query.sql @@ -21,4 +21,3 @@ group by platform order by granularity_bucket asc - diff --git a/torchci/clickhouse_queries/cost_job_per_provider/query.sql b/torchci/clickhouse_queries/cost_job_per_provider/query.sql index cd745c92fc..67cd38c08f 100644 --- a/torchci/clickhouse_queries/cost_job_per_provider/query.sql +++ b/torchci/clickhouse_queries/cost_job_per_provider/query.sql @@ -21,4 +21,3 @@ group by rc.provider order by granularity_bucket asc - diff --git a/torchci/clickhouse_queries/cost_job_per_runner_type/query.sql b/torchci/clickhouse_queries/cost_job_per_runner_type/query.sql index ab00fd54b4..de189ad018 100644 --- a/torchci/clickhouse_queries/cost_job_per_runner_type/query.sql +++ b/torchci/clickhouse_queries/cost_job_per_runner_type/query.sql @@ -21,4 +21,3 @@ group by runner_type order by granularity_bucket asc - diff --git a/torchci/clickhouse_queries/cost_job_per_workflow_name/query.sql b/torchci/clickhouse_queries/cost_job_per_workflow_name/query.sql index 6cd579d10b..0267b7207e 100644 --- a/torchci/clickhouse_queries/cost_job_per_workflow_name/query.sql +++ b/torchci/clickhouse_queries/cost_job_per_workflow_name/query.sql @@ -21,4 +21,3 @@ group by workflow_name order by granularity_bucket asc - diff --git a/torchci/clickhouse_queries/duration_job_per_gpu/query.sql b/torchci/clickhouse_queries/duration_job_per_gpu/query.sql index cfcec1fe9e..8bddd4de11 100644 --- a/torchci/clickhouse_queries/duration_job_per_gpu/query.sql +++ b/torchci/clickhouse_queries/duration_job_per_gpu/query.sql @@ -21,4 +21,3 @@ group by gpu order by granularity_bucket asc - diff --git a/torchci/clickhouse_queries/duration_job_per_job_name/query.sql b/torchci/clickhouse_queries/duration_job_per_job_name/query.sql index 9094f46a17..d88c2c1a34 100644 --- a/torchci/clickhouse_queries/duration_job_per_job_name/query.sql +++ b/torchci/clickhouse_queries/duration_job_per_job_name/query.sql @@ -21,4 +21,3 @@ group by job_name order by granularity_bucket asc - diff --git a/torchci/clickhouse_queries/duration_job_per_owning_account/query.sql b/torchci/clickhouse_queries/duration_job_per_owning_account/query.sql index 20349e117a..39c57980d8 100644 --- a/torchci/clickhouse_queries/duration_job_per_owning_account/query.sql +++ b/torchci/clickhouse_queries/duration_job_per_owning_account/query.sql @@ -21,4 +21,3 @@ group by owning_account order by granularity_bucket asc - diff --git a/torchci/clickhouse_queries/duration_job_per_platform/query.sql b/torchci/clickhouse_queries/duration_job_per_platform/query.sql index 71e6843589..f48f57fa75 100644 --- a/torchci/clickhouse_queries/duration_job_per_platform/query.sql +++ b/torchci/clickhouse_queries/duration_job_per_platform/query.sql @@ -21,4 +21,3 @@ group by platform order by granularity_bucket asc - diff --git a/torchci/clickhouse_queries/duration_job_per_provider/query.sql b/torchci/clickhouse_queries/duration_job_per_provider/query.sql index 57e344cc94..5f3bf51a6f 100644 --- a/torchci/clickhouse_queries/duration_job_per_provider/query.sql +++ b/torchci/clickhouse_queries/duration_job_per_provider/query.sql @@ -21,4 +21,3 @@ group by rc.provider order by granularity_bucket asc - diff --git a/torchci/clickhouse_queries/duration_job_per_repo/query.sql b/torchci/clickhouse_queries/duration_job_per_repo/query.sql index 720b3945ed..2ac177c4e4 100644 --- a/torchci/clickhouse_queries/duration_job_per_repo/query.sql +++ b/torchci/clickhouse_queries/duration_job_per_repo/query.sql @@ -21,4 +21,3 @@ group by repo order by granularity_bucket asc - diff --git a/torchci/clickhouse_queries/duration_job_per_runner_type/query.sql b/torchci/clickhouse_queries/duration_job_per_runner_type/query.sql index 039486c311..9998556c0e 100644 --- a/torchci/clickhouse_queries/duration_job_per_runner_type/query.sql +++ b/torchci/clickhouse_queries/duration_job_per_runner_type/query.sql @@ -21,4 +21,3 @@ group by runner_type order by granularity_bucket asc - diff --git a/torchci/clickhouse_queries/duration_job_per_workflow_name/query.sql b/torchci/clickhouse_queries/duration_job_per_workflow_name/query.sql index 8827b01d18..73bb7d6df8 100644 --- a/torchci/clickhouse_queries/duration_job_per_workflow_name/query.sql +++ b/torchci/clickhouse_queries/duration_job_per_workflow_name/query.sql @@ -21,4 +21,3 @@ group by workflow_name order by granularity_bucket asc -