Fix makefile for tests and remove absolute imports again

Author: tsterbak

Makefile

@@ -14,7 +14,7 @@ lint:
 test:
 	poetry run black .
 	poetry run ruff openandroidinstaller/ --ignore E501
-	poetry run pytest --cov=openandroidinstaller tests/
+	PYTHONPATH=openandroidinstaller:$(PYTHONPATH) poetry run pytest --cov=openandroidinstaller tests/
 
 app:
 	poetry run python openandroidinstaller/openandroidinstaller.py

openandroidinstaller/__init__.py

@@ -16,7 +16,7 @@
 from pathlib import Path
 
 from flet import ProgressBar
-from openandroidinstaller.installer_config import _load_config
+from installer_config import _load_config
 
 
 class AppState:

openandroidinstaller/app_state.py

@@ -19,7 +19,6 @@
 from pathlib import Path
 
 import flet as ft
-from app_state import AppState
 from flet import (
     AppBar,
     Banner,
@@ -38,6 +37,8 @@
     icons,
 )
 from loguru import logger
+
+from app_state import AppState
 from views import SelectFilesView, StepView, SuccessView, StartView, RequirementsView
 from tooling import run_command
 

openandroidinstaller/openandroidinstaller.py

@@ -1,6 +1,6 @@
-from openandroidinstaller.views.base import BaseView  # noqa
-from openandroidinstaller.views.start_view import StartView  # noqa
-from openandroidinstaller.views.requirements_view import RequirementsView  # noqa
-from openandroidinstaller.views.select_view import SelectFilesView  # noqa
-from openandroidinstaller.views.step_view import StepView  # noqa
-from openandroidinstaller.views.success_view import SuccessView  # noqa
+from .base import BaseView  # noqa
+from .start_view import StartView  # noqa
+from .requirements_view import RequirementsView  # noqa
+from .select_view import SelectFilesView  # noqa
+from .step_view import StepView  # noqa
+from .success_view import SuccessView  # noqa

openandroidinstaller/views/__init__.py

@@ -13,7 +13,7 @@
 # If not, see <https://www.gnu.org/licenses/>."""
 # Author: Tobias Sterbak
 
-from openandroidinstaller.app_state import AppState
+from app_state import AppState
 
 from flet import (
     Column,

openandroidinstaller/views/base.py

@@ -28,9 +28,9 @@
     icons,
 )
 
-from openandroidinstaller.views import BaseView
-from openandroidinstaller.app_state import AppState
-from openandroidinstaller.widgets import get_title
+from views import BaseView
+from app_state import AppState
+from widgets import get_title
 
 
 class RequirementsView(BaseView):

openandroidinstaller/views/requirements_view.py

@@ -29,10 +29,10 @@
     FilePickerResultEvent,
 )
 
-from openandroidinstaller.views import BaseView
-from openandroidinstaller.app_state import AppState
-from openandroidinstaller.widgets import get_title, confirm_button
-from openandroidinstaller.utils import (
+from views import BaseView
+from app_state import AppState
+from widgets import get_title, confirm_button
+from utils import (
     get_download_link,
     image_recovery_works_with_device,
 )

openandroidinstaller/views/select_view.py

@@ -31,10 +31,10 @@
     icons,
 )
 
-from openandroidinstaller.views import BaseView
-from openandroidinstaller.app_state import AppState
-from openandroidinstaller.widgets import get_title
-from openandroidinstaller.tooling import search_device
+from views import BaseView
+from app_state import AppState
+from widgets import get_title
+from tooling import search_device
 
 
 class StartView(BaseView):

openandroidinstaller/views/start_view.py

@@ -33,10 +33,10 @@
     ProgressBar,
 )
 
-from openandroidinstaller.views import BaseView
-from openandroidinstaller.installer_config import Step
-from openandroidinstaller.app_state import AppState
-from openandroidinstaller.tooling import (
+from views import BaseView
+from installer_config import Step
+from app_state import AppState
+from tooling import (
     adb_reboot,
     adb_reboot_bootloader,
     adb_reboot_download,
@@ -49,7 +49,7 @@
     fastboot_unlock_with_code,
     heimdall_flash_recovery,
 )
-from openandroidinstaller.widgets import (
+from widgets import (
     call_button,
     confirm_button,
     get_title,