diff --git a/.meta/.snapcraft.yml b/.meta/.snapcraft.yml index be3f78f..0f80416 100644 --- a/.meta/.snapcraft.yml +++ b/.meta/.snapcraft.yml @@ -1,7 +1,6 @@ name: git-fame summary: Pretty-print `git` repository collaborators sorted by contributions -description: | - {description} +version: '{version}' adopt-info: git-fame grade: stable confinement: strict diff --git a/.travis.yml b/.travis.yml index a383126..dae1af4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -155,6 +155,7 @@ jobs: - sudo /snap/bin/lxd waitready - sudo /snap/bin/lxd init --auto install: + - pip install setuptools_scm - pip install . script: - make snapcraft.yaml diff --git a/Makefile b/Makefile index 4202e59..1a56398 100644 --- a/Makefile +++ b/Makefile @@ -72,10 +72,9 @@ gitfame/git-fame.1: .meta/.git-fame.1.md gitfame/_gitfame.py pandoc -o "$@" -s -t man snapcraft.yaml: .meta/.snapcraft.yml - cat "$<" | sed -e 's/{version}/'"`python -m gitfame --version`"'/g' \ - -e 's/{commit}/'"`git describe --always`"'/g' \ - -e 's/{source}/./g' \ - -e 's/{description}/https:\/\/github.com\/casperdcl\/git-fame/g' > "$@" + cat "$<" | sed -e "s/{version}/$$(python -m gitfame --version 2>&1)/g" \ + -e "s/{commit}/$$(git describe --always)/g" \ + -e 's/{source}/./g' > "$@" .dockerignore: echo '*' > $@