Merge ~pwlars/checkbox-core-snap:support-new-eddystone-series20 into checkbox-core-snap:master

[Paul Larson]

This is the one for series20, also needs this to land: https://code.launchpad.net/~pwlars/checkbox-support/+git/checkbox-support/+merge/399751

[Jonathan Cave (jocave)]

I'm a little surprised that -dev packages would be needed at runtime, they make me think header files etc.

Is it possible they are needed just during the pip install process to build something? If so those packages might be more appropriately included in `build-packages`.

[Jonathan Cave (jocave)]

So I've tried out some alternative specifications for checkbox-support and (at least for checkbox20) I think this is preferable as having the -dev debs in stage-packages is quite a bump to the snap size:

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index b25870f..00976e3 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -132,6 +132,9 @@ parts:
     source-depth: 1
     plugin: python
     source: git://git.launchpad.net/checkbox-support
+ build-packages:
+ - libbluetooth-dev
+ - python3-dev
     stage-packages:
       # actual requirements
       - python3-requests-unixsocket
@@ -148,8 +151,7 @@ parts:
       - python3-distutils
       - python3-pkg-resources
       - python3.8-minimal
- - libbluetooth-dev
- - python3-dev
+ - libbluetooth3
     python-packages:
       - pynmea2
       - pybluez
@@ -162,6 +164,7 @@ parts:
       - -**/__pycache__
     build-environment:
       - PYTHONPATH: $SNAPCRAFT_PART_INSTALL/usr/lib/python3/dist-packages:$PYTHONPATH
+ - CFLAGS: -I/usr/include/python3.*
     override-stage: |
       snapcraftctl stage
       sed -i 's|except OSError: # Command not found|except subprocess.CalledProcessError: # Command not found|g' lib/python3.*/site-packages/distro.py

[Jonathan Cave (jocave)]

Oh some weird formatting but hopefully that helps ^

review: Needs Fixing

[Paul Larson (pwlars)]

This has been replaced by a newer one, which is hopefully better

review: Disapprove

Unmerged commits

c642aea... by Paul Larson on 2021-03-31

Add support for the updated eddystone test in checkbox-support

5a3e185... by Jonathan Cave on 2021-03-23

TEMP: use working acpi-tools tag

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index a0bb950..b25870f 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -148,8 +148,12 @@ parts:
       - python3-distutils
       - python3-pkg-resources
       - python3.8-minimal
+      - libbluetooth-dev
+      - python3-dev
     python-packages:
       - pynmea2
+      - pybluez
+      - beacontools[scan]
     after: [acpi-tools]
     stage:
       - -pyvenv.cfg