Merge pull request #1196 from mulkieran/abs2rel

Add abs2rel to formatters used

Author: mulkieran

.github/workflows/main.yml

@@ -45,7 +45,9 @@ jobs:
               PATH=${PATH}:/github/home/.local/bin PYTHONPATH=./src
               make -f Makefile lint
           - dependencies: black python3-isort
-            task: make -f Makefile fmt-ci
+            task:
+              PATH=${PATH}:/github/home/.local/bin PYTHONPATH=./src
+              make -f Makefile fmt-ci
           - dependencies: shfmt
             task: make -f Makefile fmt-shell-ci
     runs-on: ubuntu-latest
@@ -63,6 +65,8 @@ jobs:
         run: python --version
       - name: Install pyright
         run: pip install --user pyright
+      - name: Install abs2rel
+        run: pip install --user abs2rel
       - name: Run test
         run: ${{ matrix.task }}
 

.github/workflows/push.yml

@@ -80,8 +80,12 @@ jobs:
       - name: Apply annotations
         run: PYTHONPATH=./src make apply
         working-directory: stratis-cli
+      - name: Install abs2rel
+        run: pip install --user abs2rel
       - name: Format result
-        run: make fmt
+        run:
+          PATH=${PATH}:/github/home/.local/bin
+          make fmt
         working-directory: stratis-cli
       - name: Install pyright
         run: pip install --user pyright

Makefile

@@ -49,6 +49,7 @@ lint:
 
 .PHONY: fmt
 fmt:
+	(cd src; yes | abs2rel)
 	isort setup.py bin/stratis src tests
 	black ./bin/stratis .
 

src/stratis_cli/_actions/_bind.py

@@ -19,9 +19,6 @@
 import json
 from argparse import Namespace
 
-# isort: LOCAL
-from stratis_cli._constants import PoolId
-
 from .._constants import EncryptionMethod, IdType, PoolId
 from .._errors import StratisCliEngineError, StratisCliNoChangeError
 from .._stratisd_constants import StratisdErrors

src/stratis_cli/_actions/_pool.py

@@ -31,9 +31,6 @@
 # isort: FIRSTPARTY
 from dbus_python_client_gen import DPClientMarshallingError
 
-# isort: LOCAL
-from stratis_cli._stratisd_constants import BlockDevTiers
-
 from .._alerts import PoolAlert
 from .._constants import IntegrityOption, IntegrityTagSpec, PoolId, UnlockMethod
 from .._errors import (