Merge ~pfsmorigo/review-tools:pfsmorigo/move_to_newer_core into review-tools:master

[Paulo Flabiano Smorigo]

Changed the base to core20. The following modifications were necessary:

 - Snacraft complained about the missing "grade" field so I added it;
 - PYTHONPATH moved from override-build.sh to snapcraft.yaml under a new path;
 - The apps needs to be pointed to the specific directory, /bin in this case;
 - usr/bin/python3-swift executable was renamed to usr/bin/swift.
 - configflags now is called autotools-configure-parameters;

[Alex Murray (alexmurray)]

LGTM - thanks @pfsmorigo - I am a bit surprised about the need for setting PYTHONPATH during the build - I would have hoped snapcraft would do that for us.. but that is fine.

review: Approve

diff --git a/override-build.sh b/override-build.sh
index 0bcd038..d86fc64 100755
--- a/override-build.sh
+++ b/override-build.sh
@@ -5,8 +5,6 @@ set -e
 # Run tests
 #
 
-# needed when run from snapcraft
-export PYTHONPATH=./
 SNAPDIR="$(pwd)"
 export MAGIC="$SNAPDIR/../install/usr/share/misc/magic"
 
diff --git a/snapcraft.yaml b/snapcraft.yaml
index c2ec55a..b8e1c20 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -6,7 +6,8 @@ description: |
   related to snap review processes. These tools are used by the Ubuntu store
   and can be used to verify your snap before upload.
 confinement: strict
-base: core18
+base: core20
+grade: stable
 
 environment:
   LANG: C.UTF-8
@@ -15,33 +16,33 @@ environment:
 
 apps:
   snap-review:
-    command: snap-review
+    command: bin/snap-review
     plugs: [ home, mount-observe ]
     environment:
       FAKEROOTDONTTRYCHOWN: "1"
   unpack-package:
-    command: unpack-package
+    command: bin/unpack-package
     plugs: [ home ]
   snap-declaration:
-    command: create-snap-declaration
+    command: bin/create-snap-declaration
     plugs: [ mount-observe ]
   base-declaration:
-    command: get-base-declaration
+    command: bin/get-base-declaration
     plugs: [ mount-observe ]
   store-query:
-    command: store-query
+    command: bin/store-query
     plugs: [ mount-observe, network ]
   updates-available:
-    command: snap-updates-available
+    command: bin/snap-updates-available
     plugs: [ home, mount-observe, network ]
   rock-updates-available:
-    command: rock-updates-available
+    command: bin/rock-updates-available
     plugs: [ home, mount-observe, network ]
   check-notices:
-    command: snap-check-notices
+    command: bin/snap-check-notices
     plugs: [ home, mount-observe, network ]
   rock-check-notices:
-    command: rock-check-notices
+    command: bin/rock-check-notices
     plugs: [ home, mount-observe, network ]
   fetch-usn-db:
     command: bin/fetch-db
@@ -49,7 +50,7 @@ apps:
     environment:
       SYSTEM_WGETRC: $SNAP/etc/wgetrc
   swift:
-    command: usr/bin/python3-swift
+    command: usr/bin/swift
     plugs: [ mount-observe, network ]
   diffsquash:
     command: bin/diffsquash
@@ -64,6 +65,8 @@ parts:
       snapcraftctl set-version "0.48+$(git describe --tags | cut -c1-25)"
       cd $SNAPCRAFT_PART_BUILD
       ./override-build.sh
+    build-environment:
+      - PYTHONPATH: $SNAPCRAFT_PART_INSTALL/usr/lib/python3/dist-packages
     build-packages:
     - build-essential
     - execstack
@@ -137,7 +140,7 @@ parts:
     - libelf-dev
     - libpopt-dev
     - libselinux1-dev
-    configflags:
+    autotools-configure-parameters:
     - --disable-shared
     - --disable-libtool-lock
     - --disable-dependency-tracking