wip

.github/workflows/ci.yaml

@@ -3,83 +3,82 @@ name: CI
 on: [ pull_request ]
 
 jobs:
-  pre-commit:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - uses: snok/install-poetry@v1
-        with:
-          virtualenvs-create: true
-          virtualenvs-in-project: true
-          installer-parallel: true
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.10"
-          cache: 'poetry'
-      - name: Install dependencies
-        run: poetry install --no-interaction --no-root
-      - run: source .venv/bin/activate
-      - uses: pre-commit/[email protected]
-
-  fast-tests:
-    runs-on: ubuntu-22.04
-    needs: [ pre-commit ]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Unit tests
-        run: ./scripts/unit_tests.sh
-      - name: Execute Mypy
-        run: ./scripts/mypy.sh
-      - name: Build aspect integration tests
-        run: |
-          cd test/aspect
-          bazel build //...
-      - name: Build examples
-        run: |
-          cd examples
-          bazel build //...
+  #  pre-commit:
+  #    runs-on: ubuntu-22.04
+  #    steps:
+  #      - uses: actions/checkout@v4
+  #      - uses: snok/install-poetry@v1
+  #        with:
+  #          virtualenvs-create: true
+  #          virtualenvs-in-project: true
+  #          installer-parallel: true
+  #      - uses: actions/setup-python@v5
+  #        with:
+  #          python-version: "3.10"
+  #          cache: 'poetry'
+  #      - name: Install dependencies
+  #        run: poetry install --no-interaction --no-root
+  #      - run: source .venv/bin/activate
+  #      - uses: pre-commit/[email protected]
+  #
+  #  fast-tests:
+  #    runs-on: ubuntu-22.04
+  #    needs: [ pre-commit ]
+  #    steps:
+  #      - uses: actions/checkout@v4
+  #      - name: Unit tests
+  #        run: ./scripts/unit_tests.sh
+  #      - name: Execute Mypy
+  #        run: ./scripts/mypy.sh
+  #      - name: Build aspect integration tests
+  #        run: |
+  #          cd test/aspect
+  #          bazel build //...
+  #      - name: Build examples
+  #        run: |
+  #          cd examples
+  #          bazel build //...
 
   integration-tests-aspect:
     strategy:
       matrix:
-        os: [ ubuntu-22.04, macos-12 ]
+        os: [ ubuntu-22.04, windows-2022 ]
     runs-on: ${{ matrix.os }}
-    needs: [ fast-tests ]
     steps:
       - uses: actions/checkout@v4
       - name: Integration tests - Aspect
         run: |
           cd test
           cd aspect
-          python execute_tests.py
+          python execute_tests.py -t using_transitive_dep/detect_using_transitive_dep -v -b 7.0.0 -p 3.11.6
 
-  integration-tests-apply-fixes:
-    runs-on: ubuntu-22.04
-    needs: [ fast-tests ]
-    steps:
-      - run: |
-          mkdir --parents /tmp/bin
-          wget --no-verbose https://github.com/bazelbuild/buildtools/releases/download/v6.4.0/buildozer-linux-amd64 -O /tmp/bin/buildozer
-          chmod +x /tmp/bin/buildozer
-      - uses: actions/checkout@v4
-      - name: Integration tests - Applying fixes
-        run: |
-          export PATH=/tmp/bin:$PATH
-          ./test/apply_fixes/execute_tests.py
+#  integration-tests-apply-fixes:
+#    runs-on: ubuntu-22.04
+#    needs: [ fast-tests ]
+#    steps:
+#      - run: |
+#          mkdir --parents /tmp/bin
+#          wget --no-verbose https://github.com/bazelbuild/buildtools/releases/download/v6.4.0/buildozer-linux-amd64 -O /tmp/bin/buildozer
+#          chmod +x /tmp/bin/buildozer
+#      - uses: actions/checkout@v4
+#      - name: Integration tests - Applying fixes
+#        run: |
+#          export PATH=/tmp/bin:$PATH
+#          ./test/apply_fixes/execute_tests.py
 
-  integration-tests-examples:
-    strategy:
-      matrix:
-        os: [ ubuntu-22.04, macos-12, windows-2022 ]
-    runs-on: ${{ matrix.os }}
-    needs: [ fast-tests ]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Integration tests - Examples
-        run: |
-          cd examples
-          python test.py
-      - name: Integration tests - Examples with legacy WORKSPACE setup
-        run: |
-          cd examples
-          python test.py --legacy-workspace
+#  integration-tests-examples:
+#    strategy:
+#      matrix:
+#        os: [ ubuntu-22.04, macos-12, windows-2022 ]
+#    runs-on: ${{ matrix.os }}
+#    needs: [ fast-tests ]
+#    steps:
+#      - uses: actions/checkout@v4
+#      - name: Integration tests - Examples
+#        run: |
+#          cd examples
+#          python test.py
+#      - name: Integration tests - Examples with legacy WORKSPACE setup
+#        run: |
+#          cd examples
+#          python test.py --legacy-workspace

src/aspect/dwyu.bzl

@@ -203,15 +203,15 @@ def dwyu_aspect_impl(target, ctx):
         defines = _gather_defines(ctx, target_compilation_context = target[CcInfo].compilation_context),
         output_path = "{}_processed_target_under_inspection.json".format(target.label.name),
         is_target_under_inspection = True,
-        verbose = False,
+        verbose = True,
     )
 
     target_deps, target_impl_deps = _preprocess_deps(ctx)
 
     # TODO Investigate if we can prevent running this multiple times for the same dep if multiple
     #      target_under_inspection have the same dependency
-    processed_deps = _process_dependencies(ctx, target = target, deps = target_deps, verbose = False)
-    processed_impl_deps = _process_dependencies(ctx, target = target, deps = target_impl_deps, verbose = False)
+    processed_deps = _process_dependencies(ctx, target = target, deps = target_deps, verbose = True)
+    processed_impl_deps = _process_dependencies(ctx, target = target, deps = target_impl_deps, verbose = True)
 
     report_file = ctx.actions.declare_file("{}_dwyu_report.json".format(target.label.name))
     args = ctx.actions.args()

test/aspect/execution_logic.py

@@ -3,7 +3,6 @@
 import logging
 import subprocess
 from importlib.machinery import SourceFileLoader
-from os import environ
 from pathlib import Path
 from typing import TYPE_CHECKING
 
@@ -75,7 +74,7 @@ def main(
     versions = [TestedVersions(bazel=bazel, python=python)] if bazel and python else tested_versions
 
     failed_tests = []
-    output_root = Path(environ["HOME"]) / ".cache" / "bazel" / workspace_path.relative_to("/")
+    output_root = Path.home() / ".cache" / "bazel" / "dwyu"
     for version in versions:
         output_base = output_root / f"aspect_integration_tests_bazel_{version.bazel}_python_{version.python}"
         output_base.mkdir(parents=True, exist_ok=True)