cctool

commit

0e1a86331ac27444b0dec45ab491ddc98203fe1d

parent

6485ef6b30a05f4fba1cd4f7e6a89bbc7ba9c569

Author

Tobias Bengfort <tobias.bengfort@gmx.net>

Date

2015-11-12 05:43

support more version conventions

Diffstat

2 files changed, 13 insertions, 2 deletions

diff --git a/cctool.py b/cctool.py

@@ -68,11 +68,12 @@ try:  # pragma: nocover
   68    68 except ImportError as err:  # pragma: nocover
   69    69 	yaml = err
   70    70 
   71    -1 
   72    71 NOTSET = object()
   73    72 PERSON = ['abook', 'ldif']
   74    73 EVENT = ['bsdcal', 'ics']
   75    74 
   -1    75 __version__ = '0.1.1'
   -1    76 
   76    77 
   77    78 def _str(x):  # pragma: nocover
   78    79 	try:
@@ -454,6 +455,7 @@ def parse_args(argv=None):
  454   455 
  455   456 	parser = argparse.ArgumentParser(description=__doc__,
  456   457 		formatter_class=argparse.RawTextHelpFormatter)
   -1   458 	parser.add_argument('--version', '-V', action='version', version=__version__)
  457   459 	parser.add_argument('--from', '-f', choices=list(informats.keys()),
  458   460 		metavar='FORMAT', dest='informat')
  459   461 	parser.add_argument('--to', '-t', choices=list(outformats.keys()),

diff --git a/setup.py b/setup.py

@@ -1,10 +1,19 @@
    1     1 #!/usr/bin/env python
    2     2 
   -1     3 import os
   -1     4 import re
    3     5 from setuptools import setup
    4     6 
   -1     7 DIRNAME = os.path.abspath(os.path.dirname(__file__))
   -1     8 rel = lambda *parts: os.path.abspath(os.path.join(DIRNAME, *parts))
   -1     9 
   -1    10 MAIN = open(rel('cctool.py')).read()
   -1    11 VERSION = re.search("__version__ = '([^']+)'", MAIN).group(1)
   -1    12 
   -1    13 
    5    14 setup(
    6    15     name='cctool',
    7    -1     version='0.1.1',
   -1    16     version=VERSION,
    8    17     description="A tool for managing contacts and calendars.",
    9    18     author='Tobias Bengfort',
   10    19     author_email='tobias.bengfort@gmx.net',