From c3c0cb6e6c8f79d8bd0b812765c19a2f38995524 Mon Sep 17 00:00:00 2001
From: nicolargo <nicolas@nicolargo.com>
Date: Fri, 19 May 2023 09:21:29 +0200
Subject: Try to migrate SnapCraft Core 20 to 22 (following guide:
 https://forum.snapcraft.io/t/micro-howto-migrate-from-core20-to-core22/30188)

---
 snap/snapcraft.yaml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 9188d818..d00373fe 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -52,8 +52,8 @@ parts:
     #        https://bugs.launchpad.net/snapcraft/+bug/1813364
     parse-info: [setup.py]
     override-pull: |
-      snapcraftctl pull
-      "$SNAPCRAFT_STAGE"/scriptlets/selective-checkout
+      craftctl pull
+      "$CRAFT_STAGE"/scriptlets/selective-checkout
 
   bottle:
     plugin: python
@@ -61,8 +61,8 @@ parts:
     source-branch: release-0.12
     source-depth: 1
     override-build: |
-      mkdir -p $SNAPCRAFT_PART_BUILD/dist
-      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/bottle-dist
+      mkdir -p $CRAFT_PART_BUILD/dist
+      cp -r $CRAFT_PART_BUILD/dist $CRAFT_PART_INSTALL/bottle-dist
     organize:
       bottle-dist: bottle/dist
 
@@ -72,8 +72,8 @@ parts:
     source-tag: '6.1.2'
     source-depth: 1
     override-build: |
-      mkdir -p $SNAPCRAFT_PART_BUILD/dist
-      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/docker-dist
+      mkdir -p $CRAFT_PART_BUILD/dist
+      cp -r $CRAFT_PART_BUILD/dist $CRAFT_PART_INSTALL/docker-dist
     organize:
       docker-dist: docker/dist
 
@@ -83,8 +83,8 @@ parts:
     source-tag: '2.8.2'
     source-depth: 1
     override-build: |
-      mkdir -p $SNAPCRAFT_PART_BUILD/dist
-      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/python-dateutil-dist
+      mkdir -p $CRAFT_PART_BUILD/dist
+      cp -r $CRAFT_PART_BUILD/dist $CRAFT_PART_INSTALL/python-dateutil-dist
     organize:
       python-dateutil-dist: python-dateutil/dist
 
@@ -94,8 +94,8 @@ parts:
     source-tag: '1.16.0'
     source-depth: 1
     override-build: |
-      mkdir -p $SNAPCRAFT_PART_BUILD/dist
-      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/six-dist
+      mkdir -p $CRAFT_PART_BUILD/dist
+      cp -r $CRAFT_PART_BUILD/dist $CRAFT_PART_INSTALL/six-dist
     organize:
       six-dist: six/dist
 
@@ -105,8 +105,8 @@ parts:
     source-tag: '4.5.0'
     source-depth: 1
     override-build: |
-      mkdir -p $SNAPCRAFT_PART_BUILD/dist
-      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/podman-dist
+      mkdir -p $CRAFT_PART_BUILD/dist
+      cp -r $CRAFT_PART_BUILD/dist $CRAFT_PART_INSTALL/podman-dist
     organize:
       podman-dist: podman/dist
 
@@ -116,8 +116,8 @@ parts:
     source-tag: '23.1'
     source-depth: 1
     override-build: |
-      mkdir -p $SNAPCRAFT_PART_BUILD/dist
-      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/packaging-dist
+      mkdir -p $CRAFT_PART_BUILD/dist
+      cp -r $CRAFT_PART_BUILD/dist $CRAFT_PART_INSTALL/packaging-dist
     organize:
       packaging-dist: packaging/dist
 
-- 
cgit v1.2.3


From ef57106facef39d0d2bc9dcf9e188063f3b18380 Mon Sep 17 00:00:00 2001
From: nicolargo <nicolas@nicolargo.com>
Date: Fri, 19 May 2023 09:48:31 +0200
Subject: Snap is a pain in the ass

---
 snap/snapcraft.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index d00373fe..e49e717f 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -52,7 +52,7 @@ parts:
     #        https://bugs.launchpad.net/snapcraft/+bug/1813364
     parse-info: [setup.py]
     override-pull: |
-      craftctl pull
+      craftctl default
       "$CRAFT_STAGE"/scriptlets/selective-checkout
 
   bottle:
-- 
cgit v1.2.3


From 2da2cb714ee6382a7e3cdf0b3a627f0b6acf8488 Mon Sep 17 00:00:00 2001
From: nicolargo <nicolas@nicolargo.com>
Date: Fri, 19 May 2023 10:04:19 +0200
Subject: SNAP is PITA

---
 snap/snapcraft.yaml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index e49e717f..99db9bd1 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -128,10 +128,15 @@ parts:
       '*': bin/
 
   selective-checkout:
-    plugin: nil
+    source: https://github.com/brlin-tw/selective-checkout.git
+    source-tag: v3.0.1
+    plugin: dump
     build-packages:
-    - git
-    stage-snaps:
-    - selective-checkout
+      - curl
+      - jq
+      - sed
+      - git
+    stage:
+      - scriptlets/selective-checkout
     prime:
-    - -*
+      - -*
-- 
cgit v1.2.3


From ed46b6a3e26c115e8ec17843d3ea04a9cd4356ec Mon Sep 17 00:00:00 2001
From: nicolargo <nicolas@nicolargo.com>
Date: Fri, 19 May 2023 10:15:12 +0200
Subject: Get back to Core20 because Snap is PISA

---
 snap/snapcraft.yaml | 47 ++++++++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 99db9bd1..130481e9 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -7,7 +7,7 @@ description: |
   Web based interface. It can adapt dynamically the displayed information
   depending on the user interface size.
 
-base: core22
+base: core20
 grade: stable
 confinement: strict
 
@@ -40,7 +40,6 @@ plugs:
       - /etc/glances/glances.conf
 
 parts:
-
   glances:
     after:
     - selective-checkout
@@ -52,17 +51,16 @@ parts:
     #        https://bugs.launchpad.net/snapcraft/+bug/1813364
     parse-info: [setup.py]
     override-pull: |
-      craftctl default
-      "$CRAFT_STAGE"/scriptlets/selective-checkout
-
+      snapcraftctl pull
+      "$SNAPCRAFT_STAGE"/scriptlets/selective-checkout
   bottle:
     plugin: python
     source: https://github.com/bottlepy/bottle.git
     source-branch: release-0.12
     source-depth: 1
     override-build: |
-      mkdir -p $CRAFT_PART_BUILD/dist
-      cp -r $CRAFT_PART_BUILD/dist $CRAFT_PART_INSTALL/bottle-dist
+      mkdir -p $SNAPCRAFT_PART_BUILD/dist
+      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/bottle-dist
     organize:
       bottle-dist: bottle/dist
 
@@ -72,8 +70,8 @@ parts:
     source-tag: '6.1.2'
     source-depth: 1
     override-build: |
-      mkdir -p $CRAFT_PART_BUILD/dist
-      cp -r $CRAFT_PART_BUILD/dist $CRAFT_PART_INSTALL/docker-dist
+      mkdir -p $SNAPCRAFT_PART_BUILD/dist
+      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/docker-dist
     organize:
       docker-dist: docker/dist
 
@@ -83,8 +81,8 @@ parts:
     source-tag: '2.8.2'
     source-depth: 1
     override-build: |
-      mkdir -p $CRAFT_PART_BUILD/dist
-      cp -r $CRAFT_PART_BUILD/dist $CRAFT_PART_INSTALL/python-dateutil-dist
+      mkdir -p $SNAPCRAFT_PART_BUILD/dist
+      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/python-dateutil-dist
     organize:
       python-dateutil-dist: python-dateutil/dist
 
@@ -94,8 +92,8 @@ parts:
     source-tag: '1.16.0'
     source-depth: 1
     override-build: |
-      mkdir -p $CRAFT_PART_BUILD/dist
-      cp -r $CRAFT_PART_BUILD/dist $CRAFT_PART_INSTALL/six-dist
+      mkdir -p $SNAPCRAFT_PART_BUILD/dist
+      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/six-dist
     organize:
       six-dist: six/dist
 
@@ -105,8 +103,8 @@ parts:
     source-tag: '4.5.0'
     source-depth: 1
     override-build: |
-      mkdir -p $CRAFT_PART_BUILD/dist
-      cp -r $CRAFT_PART_BUILD/dist $CRAFT_PART_INSTALL/podman-dist
+      mkdir -p $SNAPCRAFT_PART_BUILD/dist
+      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/podman-dist
     organize:
       podman-dist: podman/dist
 
@@ -116,8 +114,8 @@ parts:
     source-tag: '23.1'
     source-depth: 1
     override-build: |
-      mkdir -p $CRAFT_PART_BUILD/dist
-      cp -r $CRAFT_PART_BUILD/dist $CRAFT_PART_INSTALL/packaging-dist
+      mkdir -p $SNAPCRAFT_PART_BUILD/dist
+      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/packaging-dist
     organize:
       packaging-dist: packaging/dist
 
@@ -128,15 +126,10 @@ parts:
       '*': bin/
 
   selective-checkout:
-    source: https://github.com/brlin-tw/selective-checkout.git
-    source-tag: v3.0.1
-    plugin: dump
+    plugin: nil
     build-packages:
-      - curl
-      - jq
-      - sed
-      - git
-    stage:
-      - scriptlets/selective-checkout
+    - git
+    stage-snaps:
+    - selective-checkout
     prime:
-      - -*
+    - -*
-- 
cgit v1.2.3


From f3cf3aa77b31b0ce61491a774df2a4bd5ecc8686 Mon Sep 17 00:00:00 2001
From: nicolargo <nicolas@nicolargo.com>
Date: Fri, 19 May 2023 10:30:46 +0200
Subject: Get back to Core20 because Snap is PISA again

---
 snap/snapcraft.yaml | 46 +---------------------------------------------
 1 file changed, 1 insertion(+), 45 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 130481e9..4af96e96 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -67,7 +67,7 @@ parts:
   docker:
     plugin: python
     source: https://github.com/docker/docker-py.git
-    source-tag: '6.1.2'
+    source-tag: '3.7.3'
     source-depth: 1
     override-build: |
       mkdir -p $SNAPCRAFT_PART_BUILD/dist
@@ -75,50 +75,6 @@ parts:
     organize:
       docker-dist: docker/dist
 
-  python-dateutil:
-    plugin: python
-    source: https://github.com/dateutil/dateutil.git
-    source-tag: '2.8.2'
-    source-depth: 1
-    override-build: |
-      mkdir -p $SNAPCRAFT_PART_BUILD/dist
-      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/python-dateutil-dist
-    organize:
-      python-dateutil-dist: python-dateutil/dist
-
-  six:
-    plugin: python
-    source: https://github.com/benjaminp/six.git
-    source-tag: '1.16.0'
-    source-depth: 1
-    override-build: |
-      mkdir -p $SNAPCRAFT_PART_BUILD/dist
-      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/six-dist
-    organize:
-      six-dist: six/dist
-
-  podman:
-    plugin: python
-    source: https://github.com/containers/podman-py.git
-    source-tag: '4.5.0'
-    source-depth: 1
-    override-build: |
-      mkdir -p $SNAPCRAFT_PART_BUILD/dist
-      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/podman-dist
-    organize:
-      podman-dist: podman/dist
-
-  packaging:
-    plugin: python
-    source: https://github.com/pypa/packaging.git
-    source-tag: '23.1'
-    source-depth: 1
-    override-build: |
-      mkdir -p $SNAPCRAFT_PART_BUILD/dist
-      cp -r $SNAPCRAFT_PART_BUILD/dist $SNAPCRAFT_PART_INSTALL/packaging-dist
-    organize:
-      packaging-dist: packaging/dist
-
   launchers:
     source: snap/local/launchers
     plugin: dump
-- 
cgit v1.2.3