diff options
| author | Arif Ali <arif.ali@canonical.com> | 2022-10-25 17:01:30 +0100 |
|---|---|---|
| committer | Jake Hunsaker <jhunsake@redhat.com> | 2022-10-26 10:40:52 -0400 |
| commit | 80dd424ca90c4cc1871fefa2b17d453ea400ddfb (patch) | |
| tree | 5dd9a44b84ec380c621e5d6167019575257b72c1 /snap/snapcraft.yaml | |
| parent | 91cce33a1c9b3cff0795c7e573813d3394cc4107 (diff) | |
| download | sos-80dd424ca90c4cc1871fefa2b17d453ea400ddfb.tar.gz | |
[snap] fix python_magic with snap
* Using the python from pip rather than the package
* Fine tune the environment, so less repetitive
Closes: #3044
Signed-off-by: Arif Ali <arif.ali@canonical.com>
Diffstat (limited to 'snap/snapcraft.yaml')
| -rw-r--r-- | snap/snapcraft.yaml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 0919e4f8..2fe65699 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -8,6 +8,8 @@ grade: stable base: core22 confinement: classic adopt-info: sos +environment: + PYTHONPATH: ${SNAP}/lib/python3.10/site-packages:${SNAP}/usr/lib/python3/dist-packages:${PYTHONPATH} parts: sos: @@ -22,19 +24,17 @@ parts: - snapcraft - gettext stage-packages: - - python3-magic - python3-venv + python-packages: + - pip + - setuptools + - wheel + - python_magic apps: sos: - environment: - PYTHONPATH: ${PYTHONPATH}:${SNAP}/lib/python3.10/site-packages:${SNAP}/usr/lib/python3/dist-packages command: bin/sos sosreport: - environment: - PYTHONPATH: ${PYTHONPATH}:${SNAP}/lib/python3.10/site-packages:${SNAP}/usr/lib/python3/dist-packages command: bin/sos report sos-collector: - environment: - PYTHONPATH: ${PYTHONPATH}:${SNAP}/lib/python3.10/site-packages:${SNAP}/usr/lib/python3/dist-packages command: bin/sos collector |