Merge branch 'main' into kf-6641-update-python-dependencies-second

canonical · Dec 10, 2024 · 2c4d2cf · 2c4d2cf
2 parents 6d54b09 + 42a656d
commit 2c4d2cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -21,9 +21,7 @@ jobs:
     steps:
     - name: Check out repo
       uses: actions/checkout@v3
-    - run: |
-        sudo apt update
-        sudo apt install tox
+    - run: pip install tox
     - run: tox -vve argo-controller-lint
 
   unit:
@@ -32,9 +30,7 @@ jobs:
     steps:
     - name: Check out repo
       uses: actions/checkout@v3
-    - run: |
-        sudo apt update
-        sudo apt install tox
+    - run: pip install tox
     - run: tox -vve argo-controller-unit
 
   terraform-checks:

diff --git a/tox.ini b/tox.ini
@@ -20,7 +20,7 @@ setenv =
     integration: TYPE = integration
     update-requirements: TYPE = update-requirements
 commands =
-    tox -vve {env:TYPE} -c {toxinidir}/charms/{env:CHARM}
+    tox  -c {toxinidir}/charms/{env:CHARM} -vve {env:TYPE}
 
 [testenv:update-requirements]
 allowlist_externals =