Merge ~stub/juju-lint:snap into juju-lint:master

Proposed by Stuart Bishop
Status: Merged
Approved by: James Troup
Approved revision: 5144da46ebe545635345daf947dc996973d122e2
Merged at revision: 9ed2941d8442fa77df26218a5f635398495f89a9
Proposed branch: ~stub/juju-lint:snap
Merge into: juju-lint:master
Diff against target: 13 lines (+1/-1)
1 file modified
snap/snapcraft.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Juju Lint maintainers Pending
Review via email: mp+353615@code.launchpad.net

Commit message

Avoid dependencies in snap's version-script

We cannot use setup.py to emit the debian/changelog version, as
setuptools is not available as a build dependency at that level.
Instead, use sed to extract the most recent debian/changelog
version.

To post a comment you must log in.
Revision history for this message
Stuart Bishop (stub) wrote :

(it was working locally and under cleanbuild, but not in the LP build)

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 9ed2941d8442fa77df26218a5f635398495f89a9

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
2index 1ea2104..ddf7ea5 100644
3--- a/snap/snapcraft.yaml
4+++ b/snap/snapcraft.yaml
5@@ -5,7 +5,7 @@ description: Linter for Juju models to compare deployments with configurable pol
6 grade: stable
7 confinement: classic
8 version-script: |
9- echo `python3 setup.py -V`-`git describe --dirty --always --tags | sed -r 's/v(.*)/\1/g'`
10+ echo `head -1 debian/changelog | sed -rn 's/.*\((.*)\).*/\1/p'`-`git describe --dirty --always --tags | sed -r 's/v(.*)/\1/g'`
11 apps:
12 juju-lint:
13 command: usr/bin/python3 $SNAP/bin/juju-lint

Subscribers

People subscribed via source and target branches