From 82e6a2c771886e05da92b6a4b62a64f3ff616bcc Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Thu, 28 Oct 2021 14:45:25 +0100
Subject: [PATCH] Rebase to core20

Misc updates to support rebase of snap on core20:
 - Python plugin is py3 only.
 - No need to massage site.py.
 - Correct path to python3 binary.

Change-Id: I979e6a0e8eab9caaf313f232c6eaf78245157a5b
---
 snapcraft.yaml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 8734cd6..f1ea308 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -14,7 +14,7 @@ description: |
   project specific command-line clients.
 confinement: strict
 grade: stable
-base: core18
+base: core20
 environment:
   REQUESTS_CA_BUNDLE: /etc/ssl/certs/ca-certificates.crt
   PYTHONIOENCODING: utf-8
@@ -149,7 +149,6 @@ apps:
 parts:
   openstackclients:
     plugin: python
-    python-version: python3
     python-packages:
       - aodhclient
       - osc-placement
@@ -198,11 +197,8 @@ parts:
       - cargo
     override-prime: |
       snapcraftctl prime
-      # Now that everything is built, let's disable user site-packages
-      # as stated in PEP-0370
-      sed -i usr/lib/python3.6/site.py -e 's/^ENABLE_USER_SITE = None$/ENABLE_USER_SITE = False/'
       # This is the last step, let's now compile all our pyc files.
-      ./usr/bin/python3 -m compileall .
+      ./bin/python3 -m compileall .
       # Generate completer script snippets
       mkdir -p usr/share/bash-completion/completions
       ./bin/openstack complete > usr/share/bash-completion/completions/openstack