From: beierlm <mark.beierl@canonical.com>
Date: Mon, 28 Jun 2021 15:59:31 +0000 (-0400)
Subject: Adding dependencies
X-Git-Tag: v9.1.3^0
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F42%2F11042%2F1;p=osm%2Fosmclient.git

Adding dependencies

Adds missing dependencies for osmclient and required libraries
Fixes bug 1586

Change-Id: I4d42af70094a48f48fb58f013bceecbe54e555fd
Signed-off-by: beierlm <mark.beierl@canonical.com>
---

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 84635ae..11ba71e 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -16,7 +16,7 @@
 ##
 name: osmclient
 base: core18
-version: git
+adopt-info: client
 summary: A python client for orchestrating OSM
 description: |
   A python client for orchestrating Open Source Mano (OSM).
@@ -37,7 +37,7 @@ apps:
       - home
       - ssh-public-keys
     environment:
-      PATH: $SNAP/usr/bin:$SNAP/bin/:$PATH
+      PATH: $SNAP/usr/bin:$SNAP/bin/:$PATH:$SNAP/usr/local/bin/
       PYTHONPATH: $SNAP/usr/lib/python3/dist-packages:$PYTHONPATH
       MAGIC: $SNAP/usr/share/file/magic.mgc
 
@@ -52,7 +52,10 @@ parts:
       - git
       - make
       - wget
+      - libcurl4-openssl-dev
+      - libssl-dev
     stage-packages:
+      - libcurl4
       - libmagic1
       - python3
       - python3-dev
@@ -70,6 +73,8 @@ parts:
       git checkout $BRANCH_OR_TAG
       $SNAPCRAFT_PART_INSTALL/usr/bin/pip3 install .
       cd ../ && rm -rf IM/
+      $SNAPCRAFT_PART_INSTALL/usr/bin/pip3 install -r requirements.txt
       $SNAPCRAFT_PART_INSTALL/usr/bin/pip3 install .
       rm -rf .tox
+      snapcraftctl set-version $(git describe --match v* --tags --dirty)
       snapcraftctl build