chore(ci): enter venv in CI

Signed-off-by: Dori Medini <[email protected]>

Author: dorimedini-starkware

.github/workflows/main.yml

@@ -62,7 +62,8 @@ jobs:
       - name: Setup Python venv
         run: |
           python3 -m venv ci
-          ci/bin/pip install -r scripts/requirements.txt
+          . ci/bin/activate
+          pip install -r scripts/requirements.txt
 
       # Check Cargo.lock is up to date.
       - name: "Check Cargo.lock"
@@ -77,13 +78,13 @@ jobs:
       # Run code style on PR.
       - name: "Run TODO style pull request"
         if: github.event_name == 'pull_request'
-        run: ci/bin/python scripts/named_todos.py --commit_id ${{ github.event.pull_request.base.sha }}
+        run: scripts/named_todos.py --commit_id ${{ github.event.pull_request.base.sha }}
       - name: "Run clippy pull request"
         if: github.event_name == 'pull_request'
-        run: ci/bin/python scripts/run_tests.py --command clippy --changes_only --commit_id ${{ github.event.pull_request.base.sha }}
+        run: scripts/run_tests.py --command clippy --changes_only --commit_id ${{ github.event.pull_request.base.sha }}
       - name: "Run cargo doc pull request"
         if: github.event_name == 'pull_request'
-        run: ci/bin/python scripts/run_tests.py --command doc --changes_only --commit_id ${{ github.event.pull_request.base.sha }}
+        run: scripts/run_tests.py --command doc --changes_only --commit_id ${{ github.event.pull_request.base.sha }}
 
       # Run code style on push.
       - name: "Run rustfmt"
@@ -93,10 +94,10 @@ jobs:
 
       - name: "Run clippy on push"
         if: github.event_name == 'push'
-        run: ci/bin/python scripts/run_tests.py --command clippy
+        run: scripts/run_tests.py --command clippy
       - name: "Run cargo doc on push"
         if: github.event_name == 'push'
-        run: ci/bin/python scripts/run_tests.py --command doc
+        run: scripts/run_tests.py --command doc
 
       - name: "Run taplo"
         run: scripts/taplo.sh
@@ -140,8 +141,9 @@ jobs:
         if: github.event_name == 'pull_request'
         run: |
           python3 -m venv ci
-          ci/bin/pip install -r scripts/requirements.txt
-          ci/bin/python scripts/run_tests.py --command test --changes_only --include_dependencies --commit_id ${{ github.event.pull_request.base.sha }}
+          . ci/bin/activate
+          pip install -r scripts/requirements.txt
+          scripts/run_tests.py --command test --changes_only --include_dependencies --commit_id ${{ github.event.pull_request.base.sha }}
         env:
           SEED: 0
 
@@ -150,10 +152,11 @@ jobs:
         # TODO(Tsabary): Find a better way to set the ephemeral port range.
         run: |
           python3 -m venv ci
-          ci/bin/pip install -r scripts/requirements.txt
+          . ci/bin/activate
+          pip install -r scripts/requirements.txt
           echo "net.ipv4.ip_local_port_range = 40000 40200" | sudo tee /etc/sysctl.conf
           sudo sysctl -p
-          ci/bin/python scripts/run_tests.py --command integration --changes_only --include_dependencies --commit_id ${{ github.event.pull_request.base.sha }}
+          scripts/run_tests.py --command integration --changes_only --include_dependencies --commit_id ${{ github.event.pull_request.base.sha }}
         env:
           SEED: 0
 
@@ -162,8 +165,9 @@ jobs:
         # TODO(AdiY/Dori): Better support for running tests on push.
         run: |
           python3 -m venv ci
-          ci/bin/pip install -r scripts/requirements.txt
-          ci/bin/python scripts/run_tests.py --command test
+          . ci/bin/activate
+          pip install -r scripts/requirements.txt
+          scripts/run_tests.py --command test
         env:
           SEED: 0
 

.github/workflows/main_nightly.yml

@@ -53,8 +53,9 @@ jobs:
       - name: Setup Python venv
         run: |
           python3 -m venv ci
-          ci/bin/pip install -r scripts/requirements.txt
+          . ci/bin/activate
+          pip install -r scripts/requirements.txt
 
       # Run feature combo test.
       - name: "Run feature combo on all crates."
-        run: ci/bin/python scripts/run_feature_combos_test.py
+        run: scripts/run_feature_combos_test.py

.github/workflows/merge_queue_ci.yml

@@ -36,7 +36,9 @@ jobs:
       - name: Setup Python venv
         run: |
           python3 -m venv ci
-          ci/bin/pip install -r scripts/requirements.txt
+          . ci/bin/activate
+          pip install -r scripts/requirements.txt
+          install -r scripts/requirements.txt
 
       # Check Cargo.lock is up to date.
       - name: "Check Cargo.lock"
@@ -45,7 +47,7 @@ jobs:
           git diff --exit-code Cargo.lock
 
       - name: "Run clippy on merge queue"
-        run: ci/bin/python scripts/run_tests.py --command clippy
+        run: scripts/run_tests.py --command clippy
 
       - name: "Run rustfmt on merge queue"
         # The nightly here is coupled with the one in install_rust/action.yml.

scripts/named_todos.py

@@ -1,3 +1,5 @@
+#!/bin/env python3
+
 import os
 import re
 

scripts/run_tests.py

@@ -80,11 +80,11 @@ def build_cmds(with_feature: bool) -> List[List[str]]:
 
             # Only run cairo_native feature if the blockifier crate is modified.
             if CAIRO_NATIVE_CRATE_TRIGGERS.isdisjoint(crates):
-                return (cmds_no_feat)
+                return cmds_no_feat
 
             print(f"Composing sequencer integration test commands with cairo_native feature.")
             cmds_with_feat = build_cmds(with_feature=True) + run_cmds
-            return (cmds_no_feat + cmds_with_feat)
+            return cmds_no_feat + cmds_with_feat
 
         raise NotImplementedError(f"Command {self} not implemented.")
 
@@ -111,7 +111,10 @@ def test_crates(crates: Set[str], base_command: BaseCommand):
 
 
 def run_test(
-    changes_only: bool, commit_id: Optional[str], base_command: BaseCommand, include_dependencies: bool
+    changes_only: bool,
+    commit_id: Optional[str],
+    base_command: BaseCommand,
+    include_dependencies: bool,
 ):
     """
     Runs tests.