From 24b469cfd145fa83ae051d9710a50088b4ac8c9a Mon Sep 17 00:00:00 2001 From: Prakhar Gupta Date: Jul 15 2020 12:34:08 +0000 Subject: Added version flag in cli --- diff --git a/fedora_business_cards/__init__.py b/fedora_business_cards/__init__.py index ad4d354..e9a18b8 100644 --- a/fedora_business_cards/__init__.py +++ b/fedora_business_cards/__init__.py @@ -26,5 +26,10 @@ on a SVG, then exports that to a PDF and PNG. from pkg_resources import get_distribution, DistributionNotFound -__version__ = '1.beta1' +""" +fedora-business-cards package version. + +NOTE: Version string defined here will be picked by setup.py automatically. +""" +__version__ = '2.2.1' __all__ = ('common', 'export', 'frontend', 'generators') diff --git a/fedora_business_cards/frontend/cmdline.py b/fedora_business_cards/frontend/cmdline.py index f5e378c..effdf3b 100644 --- a/fedora_business_cards/frontend/cmdline.py +++ b/fedora_business_cards/frontend/cmdline.py @@ -31,13 +31,17 @@ from fedora_business_cards import common from fedora_business_cards import export # hah from fedora_business_cards import generators - def main(): """ Call this to make things happen. """ # Setup option parser parser = argparse.ArgumentParser() + + # Version + version_parser = argparse.ArgumentParser() + version_parser.add_argument("--version", dest="version", action="store_true", help="print version information") + # General options parser.add_argument("--list-generators", dest="showgen", default=False, action="store_true", help="display list of generators") @@ -87,6 +91,12 @@ def main(): except ImportError: pass + # version information + opts = version_parser.parse_args() + if opts.version: + print(common.__version__) + sys.exit() + # Parse arguments options = parser.parse_args() diff --git a/setup.py b/setup.py index b7a0c17..cfcfcdf 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,14 @@ from setuptools import setup, find_packages +import re, io + +__version__ = re.search( + r'__version__\s*=\s*[\'"]([^\'"]*)[\'"]', + io.open('fedora_business_cards/__init__.py', encoding='utf_8_sig').read() + ).group(1) setup( name = 'fedora-business-cards', - version = '2.2', + version = __version__, packages = find_packages(), author = 'Brian Exelbierd',