Merge branch 'main' into work/CRAFT-2921

canonical · Jun 11, 2024 · 07fdc6a · 07fdc6a
2 parents 28ac793 + b48b8c5
commit 07fdc6a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/charmcraft/templates/init-kubernetes/tox.ini.j2 b/charmcraft/templates/init-kubernetes/tox.ini.j2
@@ -29,7 +29,7 @@ deps =
     ruff
 commands =
     ruff format {[vars]all_path}
-    ruff --fix {[vars]all_path}
+    ruff check --fix {[vars]all_path}
 
 [testenv:lint]
 description = Check code against coding style standards
@@ -41,7 +41,7 @@ commands =
     # and uncomment the following line
     # codespell {[vars]lib_path}
     codespell {tox_root}
-    ruff {[vars]all_path}
+    ruff check {[vars]all_path}
     ruff format --check --diff {[vars]all_path}
 
 [testenv:unit]

diff --git a/charmcraft/templates/init-machine/tox.ini.j2 b/charmcraft/templates/init-machine/tox.ini.j2
@@ -29,7 +29,7 @@ deps =
     ruff
 commands =
     ruff format {[vars]all_path}
-    ruff --fix {[vars]all_path}
+    ruff check --fix {[vars]all_path}
 
 [testenv:lint]
 description = Check code against coding style standards
@@ -41,7 +41,7 @@ commands =
     # and uncomment the following line
     # codespell {[vars]lib_path}
     codespell {tox_root}
-    ruff {[vars]all_path}
+    ruff check {[vars]all_path}
     ruff format --check --diff {[vars]all_path}
 
 [testenv:unit]

diff --git a/charmcraft/templates/init-simple/tox.ini.j2 b/charmcraft/templates/init-simple/tox.ini.j2
@@ -29,7 +29,7 @@ deps =
     ruff
 commands =
     ruff format {[vars]all_path}
-    ruff --fix {[vars]all_path}
+    ruff check --fix {[vars]all_path}
 
 [testenv:lint]
 description = Check code against coding style standards
@@ -41,7 +41,7 @@ commands =
     # and uncomment the following line
     # codespell {[vars]lib_path}
     codespell {tox_root}
-    ruff {[vars]all_path}
+    ruff check {[vars]all_path}
     ruff format --check --diff {[vars]all_path}
 
 [testenv:unit]