Merge ~sylvain-pineau/checkbox-core-snap:base22_fixes into checkbox-core-snap:master

[Sylvain Pineau]

Fixes required to build checkbox22.

Tested in a jammy lxc container

[Sylvain Pineau (sylvain-pineau)]

joc rebased his py10 branch on this one and was merged last week:

https://git.launchpad.net/checkbox-core-snap/commit/?id=e01595e9aebd75bc562f2a92a6fd1029be2105cb

Unmerged commits

0799fc8... by Sylvain Pineau on 2022-03-14

base core22 fixes

- install pybluez from debs
- Fix the checkbox plugin get_build_environment() to adjust PYTHONPATH

diff --git a/snap/plugins/checkbox_provider.py b/snap/plugins/checkbox_provider.py
index 4dedb20..9fc2286 100644
--- a/snap/plugins/checkbox_provider.py
+++ b/snap/plugins/checkbox_provider.py
@@ -38,7 +38,7 @@ class PluginImpl(PluginV2):
 
     def get_build_environment(self) -> Dict[str, str]:
         if self.project._get_build_base() == "core22":
-            site_pkg_path = "$SNAPCRAFT_STAGE/lib/python3.9/site-packages"
+            site_pkg_path = "$SNAPCRAFT_STAGE/local/lib/python3.10/dist-packages:$SNAPCRAFT_STAGE/usr/lib/python3/dist-packages"
         else:
             site_pkg_path = "$SNAPCRAFT_STAGE/lib/python3.8/site-packages"
         return {"PYTHONPATH": site_pkg_path}
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 33fa234..f044865 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -134,6 +134,7 @@ parts:
     source: git://git.launchpad.net/checkbox-support
     stage-packages:
       # actual requirements
+      - python3-bluez
       - python3-requests-unixsocket
       - python3-systemd
       # added to stage python:
@@ -153,7 +154,6 @@ parts:
       - python3-dev
     python-packages:
       - pynmea2
-      - pybluez
     after: [acpi-tools]
     stage:
       - -pyvenv.cfg