plutopluto

commit

27f65ef8047ea7cc1cd9b46599d94422d86c908b

parent

eac45281e73f2f0bee6fc7bf1f869e33be0e5009

Author

Tobias Bengfort <tobias.bengfort@gmx.net>

Date

2015-11-12 05:25

support more version conventions

Diffstat

2 files changed, 14 insertions, 2 deletions

diff --git a/plutopluto/__init__.py b/plutopluto/__init__.py

@@ -1,5 +1,7 @@
    1     1 #!/usr/bin/env python
    2     2 
   -1     3 __version__ = '1.1.0'
   -1     4 
    3     5 import sys
    4     6 import os
    5     7 from time import mktime, time
@@ -105,6 +107,7 @@ def config():
  105   107 
  106   108 def main():
  107   109 	parser = argparse.ArgumentParser(description='simple feed aggregator')
   -1   110 	parser.add_argument('--version', '-V', action='version', version=__version__)
  108   111 	parser.add_argument('-d', '--debug', action='store_true')
  109   112 	parser.add_argument('-c', '--config', metavar='FILE')
  110   113 	parser.add_argument('urls', metavar='URL', nargs='*',

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

@@ -1,13 +1,22 @@
    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 README = open(rel('README.rst')).read()
   -1    11 INIT = open(rel('plutopluto', '__init__.py')).read()
   -1    12 VERSION = re.search("__version__ = '([^']+)'", INIT).group(1)
   -1    13 
    5    14 
    6    15 setup(
    7    16 	name='plutopluto',
    8    -1 	version='1.1.0',
   -1    17 	version=VERSION,
    9    18 	description="simple feed aggregator",
   10    -1 	long_description=open('README.rst').read(),
   -1    19 	long_description=README,
   11    20 	url='https://github.com/xi/plutopluto',
   12    21 	author='Tobias Bengfort',
   13    22 	author_email='tobias.bengfort@posteo.de',