Skip to content

Commit

Permalink
Use git describe to retrieve tag
Browse files Browse the repository at this point in the history
  • Loading branch information
testcraftsman committed Aug 31, 2018
1 parent e0cf4f7 commit decdf3c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 14 deletions.
7 changes: 2 additions & 5 deletions Makefile
Expand Up @@ -4,7 +4,7 @@ include defs.mk
DESTDIR=/
BUILDIR=$(CURDIR)/debian/testpool
PROJECT=testpool
export VERSION:=`python ./setup.py --version`
export VERSION:=`git describe --abbrev=0 --tag`

##
# Use find when __init__.py does not exist in the directory.
Expand Down Expand Up @@ -39,16 +39,13 @@ clean::
rm -rf ../testpool_* testpool-* deb_dist testpool.egg-info
find . -name '*.pyc' -delete

testpool/version.py: debian/changelog
dpkg-parsechangelog | sed -rne 's,^Version: (.*),PACKAGE_VERSION="\1", p' > testpool/version.py

.PHONY: rpm.build
rpm.build:
python setup.py bdist_rpm --post-install=rpm/postinstall \
--pre-uninstall=rpm/preuninstall

.PHONY: deb.source
deb.source: testpool/version.py
deb.source:
python setup.py -q --command-packages=stdeb.command sdist_dsc

.PHONY: deb.build
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Expand Up @@ -3,15 +3,16 @@
"""

import os
import subprocess
from setuptools import setup, find_packages
import testpool.version

AUTHOR = "Mark Hamilton"
AUTHOR_EMAIL = "mark.lee.hamilton@gmail.com"

##
# Figure out version based on debian changelog
VERSION = testpool.version.PACKAGE_VERSION
CMD = "git describe --abbrev=0 --tag"
VERSION = subprocess.check_output(CMD, shell=True).replace("\n", "")
##

with open(os.path.join(os.path.dirname(__file__), 'README.md')) as readme:
Expand Down
3 changes: 0 additions & 3 deletions testpool/core/commands.py
Expand Up @@ -10,7 +10,6 @@
import traceback
import unittest
import testpool.settings
import testpool.version
from testpool.core import logger
from testpool.core import pool
from testpool.core import resource
Expand All @@ -28,8 +27,6 @@ def argparser(progname):
""" Create top level argument parser. """

arg_parser = argparse.ArgumentParser(prog=progname)
arg_parser.add_argument('--version', action="version",
version=testpool.version.PACKAGE_VERSION)
arg_parser.add_argument('--verbose', '-v', required=False, action="count",
help="enable debug verbosity.")
return arg_parser
Expand Down
4 changes: 0 additions & 4 deletions testpool/version.py

This file was deleted.

0 comments on commit decdf3c

Please sign in to comment.