Merge branch 'develop' into tom-cg-7930-remove-now-unused-imports-after-moving-symbol-out-of-file

Author: EdwardJXLi

.circleci/config.yml

@@ -17,17 +17,12 @@ executors:
     machine:
       image: ubuntu-2404:current
 orbs:
-  aws-cli: circleci/[email protected].2
+  aws-cli: circleci/[email protected].3
   codecov: codecov/[email protected]
-  node: circleci/node@7.0.0
+  node: circleci/node@7.1.0
   github-cli: circleci/[email protected]
   slack: circleci/[email protected]
 
-
-
-
-
-
 commands:
   install-lfs:
     steps:
@@ -66,33 +61,12 @@ commands:
           paths:
             - $GITHUB_WORKSPACE
           key: repos-<<parameters.extra_repos>>
-  fetch-verified-codemods:
-    steps:
-      - run:
-          command: |
-            uv run --frozen python -m tests.shared.codemod.commands fetch-verified-codemods --cli-api-key ${PROD_CLI_API_KEY}
-  cache-verified-codemod-repos:
-    steps:
-      - restore_cache:
-          keys:
-            - v1-verified-codemod-repos-{{ checksum "tests/integration/verified_codemods/codemod_data/repo_commits.json" }}-{{.Environment.CIRCLE_NODE_INDEX}}-{{.Environment.CIRCLE_NODE_TOTAL}}
-      - run:
-          command: |
-            uv run --frozen python -m tests.shared.codemod.commands clone-repos --verified-codemod-repos --token ${CODEGEN_BOT_GHE_TOKEN}
-      - save_cache:
-          paths:
-            - $GITHUB_WORKSPACE
-          key: v1-verified-codemod-repos-{{ checksum "tests/integration/verified_codemods/codemod_data/repo_commits.json" }}-{{.Environment.CIRCLE_NODE_INDEX}}-{{.Environment.CIRCLE_NODE_TOTAL}}
   build-wheels:
-    parameters:
-      base_packages:
-        type: boolean
-        default: false
     steps:
     - install-uv
     - restore_cache:
         keys:
-          - cibuildwheel-cache-<<pipeline.parameters.python_version>>-{{ .Environment.CIRCLE_JOB }}-{{ checksum "uv.lock" }}--{{ checksum "pyproject.toml" }}
+          - cibuildwheel-cache-<<pipeline.parameters.python_version>>-{{ .Environment.CIRCLE_JOB }}-{{ checksum "uv.lock" }}--{{ checksum "pyproject.toml" }}-{{ arch }}
     - run:
         command: |
           uv run --frozen cibuildwheel --output-dir dist
@@ -102,7 +76,7 @@ commands:
     - save_cache:
         paths:
           - /home/circleci/.cache/cibuildwheel
-        key: cibuildwheel-cache-<<pipeline.parameters.python_version>>-{{ .Environment.CIRCLE_JOB }}-{{ checksum "uv.lock" }}--{{ checksum "pyproject.toml" }}
+        key: cibuildwheel-cache-<<pipeline.parameters.python_version>>-{{ .Environment.CIRCLE_JOB }}-{{ checksum "uv.lock" }}--{{ checksum "pyproject.toml" }}-{{ arch }}
   setup-uv:
     steps:
     - install-lfs
@@ -121,19 +95,6 @@ commands:
           - ~/.cache/uv
         key: uv-cache-1-<<pipeline.parameters.python_version>>-{{ .Environment.CIRCLE_WORKING_DIRECTORY }}-{{ arch }}-{{ checksum "uv.lock" }}
     - setup-lfs
-  setup-pre-commit:
-    steps:
-      - restore_cache:
-          keys:
-            - pre-commit-cache-<<pipeline.parameters.python_version>>-{{ checksum ".pre-commit-config.yaml" }}
-      - run:
-          command: uv run --frozen pre-commit install-hooks
-          name: Install pre-commit hooks
-      - save_cache:
-          paths:
-            - ~/.cache/pre-commit
-            - ~/.cache/uv
-          key: pre-commit-cache-<<pipeline.parameters.python_version>>-{{ checksum ".pre-commit-config.yaml" }}
   upload-tests:
       steps:
         - store_test_results:
@@ -181,7 +142,7 @@ commands:
                     TESTS_TO_RUN=$(cat codecov_ats/tests_to_run.txt)
                     echo $TESTS_TO_RUN
                     echo $TESTS_TO_RUN | circleci tests run --command "xargs uv run --frozen pytest --cov \
-                    -o junit_suite_name="${CIRCLE_JOB}" \
+                    -o junit_suite_name="${CIRCLE_JOB}-${CIRCLE_NODE_INDEX}" \
                     -n auto \
                     -vv \
                     --cov \
@@ -197,65 +158,18 @@ commands:
                     cat codecov_ats/tests_to_run.txt | xargs uv run --frozen pytest \
                     --cov \
                     -vv \
-                    -o junit_suite_name="${CIRCLE_JOB}" \
+                    -o junit_suite_name="${CIRCLE_JOB}-${CIRCLE_NODE_INDEX}" \
                     -n auto \
                     --cov-append \
                     <<parameters.collect_args>>
         - upload-tests
         - codecov/upload:
             flags: <<parameters.codecov_flags>>
             plugins: pycoverage,compress-pycoverage
+            files: coverage.codecov.json
  # Define a job to be invoked later in a workflow.
 # See: https://circleci.com/docs/jobs-steps/#jobs-overview & https://circleci.com/docs/configuration-reference/#jobs
 jobs:
-  unit-tests:
-    parallelism: 8
-    executor: default_image
-    resource_class: "xlarge"
-    steps:
-    - setup-uv
-    - node/install:
-        use-nvm-cache: true
-    - run_ats:
-        default_tests: "tests/unit"
-        collect_args: --timeout 50
-  integration-tests:
-    executor: default_image
-    resource_class: "large"
-    steps:
-      - setup-uv
-      - run:
-          command: |
-            uv run --frozen pytest -o junit_suite_name="${CIRCLE_JOB}" -n auto tests/integration/codegen
-      - upload-tests
-  doctests:
-    executor: default_image
-    steps:
-    - setup-uv
-    - run:
-        command: |
-          uv run --frozen pytest -o junit_suite_name="${CIRCLE_JOB}" -n auto docs
-    - upload-tests
-  codemod-tests:
-    parallelism: 8
-    executor: default_vm
-    resource_class: "2xlarge+"
-    steps:
-    - install-uv
-    - setup-uv
-    - fetch-verified-codemods
-    - cache-verified-codemod-repos
-    - run_ats:
-        default_tests: "tests/integration/codemod/test_verified_codemods.py"
-        codecov_flags: "smart-tests-codemod"
-        collect_args: --cli-api-key ${PROD_CLI_API_KEY} --token ${CODEGEN_BOT_GHE_TOKEN}
-        ats_collect_args: --cli-api-key=${PROD_CLI_API_KEY},--token=${CODEGEN_BOT_GHE_TOKEN},
-        split_tests: false
-    - slack/notify:
-        event: fail
-        branch_pattern: "develop"
-        channel: "alerts-codemod-tests"
-        template: basic_fail_1
   oss-codemod-tests:
     parameters:
       sync_graph:
@@ -322,34 +236,19 @@ jobs:
               channel: "alerts-parse-tests"
               template: basic_fail_1
 
-  pre-commit:
-    executor: default_image
-    resource_class: large
-    steps:
-      - setup-uv
-      - node/install:
-          use-nvm-cache: true
-      - setup-pre-commit
-      - run:
-          command: uv run --frozen pre-commit run --all-files --show-diff-on-failure --color=always
-          name: run pre-commit
   linux-wheels:
     parameters:
       resource_class:
         type: string
         default: "large"
-      base_packages:
-        type: boolean
-        default: false
     working_directory: ~/linux-wheels
     machine:
       image: ubuntu-2404:2024.05.1
       docker_layer_caching: true
     resource_class: <<parameters.resource_class>>
     steps:
       - checkout
-      - build-wheels:
-          base_packages: << parameters.base_packages >>
+      - build-wheels
       - persist_to_workspace:
           root: .
           paths:
@@ -366,21 +265,6 @@ jobs:
           root: .
           paths:
             - dist/
-  release-aws:
-    executor: default_image
-    steps:
-    - checkout
-    - attach_workspace:
-        at: .
-    - aws-cli/setup:
-          role_arn:  $AWS_OIDC_ARN
-    - run:
-        name: Release
-        command: |
-          uv tool install keyring --with keyrings.codeartifact
-          export UV_PUBLISH_PASSWORD="$(aws codeartifact get-authorization-token --domain codegen --domain-owner 922078275900 --region us-east-1 --query authorizationToken --output text)"
-          export UV_PUBLISH_USERNAME=aws
-          uv publish
   release-pypi:
     executor: default_image
     steps:
@@ -403,119 +287,20 @@ jobs:
         channel: "release"
         template: success_tagged_deploy_1
 workflows:
-  # develop-checks:
-  #   jobs:
-  #     - hold-parse-tests:
-  #         type: approval
-  #         filters:
-  #           branches:
-  #             ignore: develop
-  #     - parse-tests:
-  #         name: Manual-Parse-Tests
-  #         filters:
-  #           branches:
-  #             ignore: develop
-  #         context:
-  #           - GHE
-  #         requires:
-  #           - hold-parse-tests
-  #         matrix:
-  #           parameters:
-  #             extra_repos: [true, false]
-      # - parse-tests:
-      #     context:
-      #       - GHE
-      #       - slack
-      #     filters:
-      #       branches:
-      #         only: develop
-      #     extra_repos: true
-      # - parse-tests:
-      #     name: oss-parse-tests
-      #     context:
-      #       - GHE
-      #       - slack
-      #     filters:
-      #       branches:
-      #         only: develop
-      #     extra_repos: false
-      # - oss-codemod-tests:
-      #     name: oss-codemod-tests
-      #     context:
-      #       - GHE
-      #       - slack
-      #     filters:
-      #       branches:
-      #         only: develop
-      #     matrix:
-      #       parameters:
-      #         sync_graph: [true, false]
-      #         size: [small, large]
-  pr_checks:
-    jobs:
-      - unit-tests
-      - integration-tests
-      # - hold-codemod-tests:
-      #     type: approval
-      #     filters:
-      #       branches:
-      #         ignore: develop
-      # - hold-large-oss-codemod-tests:
-      #     type: approval
-      #     filters:
-      #       branches:
-      #         ignore: develop
-      # - codemod-tests:
-      #     context:
-      #       - GHE
-      #       - Codemod
-      #       - slack
-      #     requires:
-      #       - hold-codemod-tests
-      - pre-commit
-      # - doctests
-      # - oss-codemod-tests:
-      #     filters:
-      #       branches:
-      #         ignore: develop
-      #     context:
-      #       - GHE
-      #       - slack
-      #     matrix:
-      #       parameters:
-      #         sync_graph: [true, false]
-      #         size: [small]
-      # - oss-codemod-tests:
-      #     name: large-oss-codemod-tests
-      #     context:
-      #       - GHE
-      #       - slack
-      #     matrix:
-      #       parameters:
-      #         sync_graph: [true, false]
-      #         size: [large]
-      #     requires:
-      #       - hold-large-oss-codemod-tests
   publish-packages:
     jobs:
       - linux-wheels:
           filters:
             tags:
               only: /^v.*/
-          base_packages: true
+          matrix:
+            parameters:
+              resource_class: [large, arm.large]
+
       - osx-wheels:
           filters:
             tags:
               only: /^v.*/
-      - release-aws:
-          filters:
-            tags:
-              only: /^v.*/
-          context:
-            - AWS
-          requires:
-          - linux-wheels
-          - osx-wheels
       - release-pypi:
           filters:
             tags:

.gitattributes

@@ -1,6 +1,7 @@
-**/expected_diff.txt filter=lfs diff=lfs merge=lfs -text
 tests/integration/codemod/repos/extra/*.json filter=lfs diff=lfs merge=lfs -text
-**/expected_diff.patch filter=lfs diff=lfs merge=lfs -text
+**/test_codegen/expected_diff.patch filter=lfs diff=lfs merge=lfs -text
+**/test_codegen/expected_diff.patch.skip filter=lfs diff=lfs merge=lfs -text
+**/test_codegen_frontend/expected_diff.patch filter=lfs diff=lfs merge=lfs -text
 tests/integration/codemod/repos/repos.json filter=lfs diff=lfs merge=lfs -text
 tests/integration/verified_codemods/** filter=lfs diff=lfs merge=lfs -text
 .github/disallowed-words.txt filter=lfs diff=lfs merge=lfs -text

.github/actions/report/action.yml

@@ -0,0 +1,27 @@
+name: report
+description: "Publish Test Reports"
+inputs:
+  flag:
+    required: true
+    description: "Relevant codecov flag"
+  codecov_token:
+    required: true
+    description: "Codecov token"
+runs:
+  using: "composite"
+  steps:
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@v1
+        with:
+          token: ${{ inputs.codecov_token }}
+          files: build/test-results/test/TEST.xml
+      - name: Upload coverage reports to Codecov
+        if: (success() || failure()) # always upload coverage reports even if the tests fail
+        continue-on-error: true
+        uses: codecov/[email protected]
+        with:
+          token: ${{ inputs.codecov_token }}
+          files: coverage.xml
+          flags: ${{ inputs.flag }}
+          plugins: pycoverage,compress-pycoverage