x/snap-openstackclients
Code Issues Proposed changes

Rebase to core20

Browse Source 
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
This commit is contained in:
James Page 2021-10-28 14:45:25 +01:00
parent 545d6ca761
commit 82e6a2c771
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
snapcraft.yaml
View File

@ -14,7 +14,7 @@ description: |
project specific command-line clients. project specific command-line clients.
confinement: strict confinement: strict
grade: stable grade: stable
base: core18 base: core20
environment: environment:
REQUESTS_CA_BUNDLE: /etc/ssl/certs/ca-certificates.crt REQUESTS_CA_BUNDLE: /etc/ssl/certs/ca-certificates.crt
PYTHONIOENCODING: utf-8 PYTHONIOENCODING: utf-8
@ -149,7 +149,6 @@ apps:
parts: parts:
openstackclients: openstackclients:
plugin: python plugin: python
python-version: python3
python-packages: python-packages:
- aodhclient - aodhclient
- osc-placement - osc-placement
@ -198,11 +197,8 @@ parts:
- cargo - cargo
override-prime: | override-prime: |
snapcraftctl 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. # 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 # Generate completer script snippets
mkdir -p usr/share/bash-completion/completions mkdir -p usr/share/bash-completion/completions
./bin/openstack complete > usr/share/bash-completion/completions/openstack ./bin/openstack complete > usr/share/bash-completion/completions/openstack