From bacc0cf5947f9b92ee88fd40338f795baeb2bf16 Mon Sep 17 00:00:00 2001 From: Marco Hinz Date: Thu, 21 Nov 2019 21:12:46 +0100 Subject: [PATCH] Use pkg_resources to show current version --- Makefile | 5 +---- nvr/nvr.py | 5 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 8331e65..fc27d86 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,6 @@ default: install -version_synced: - [[ $$(grep -A1 '# version-marker' nvr/nvr.py | tail -n1 | grep -o '[0-9\.]\+') = $$(grep version setup.py | grep -o '[0-9\.]\+') ]] - -install: version_synced +install: python3 setup.py install test: diff --git a/nvr/nvr.py b/nvr/nvr.py index c6d7a2a..a3cf414 100644 --- a/nvr/nvr.py +++ b/nvr/nvr.py @@ -387,8 +387,9 @@ def main(argv=sys.argv, env=os.environ): options, arguments = parse_args(argv) if options.version: - # version-marker - print('nvr 2.2.3') + import pkg_resources + version = pkg_resources.require('neovim-remote')[0].version + print('nvr {}'.format(version)) return if options.serverlist: