From 91e287be43b493eb9a598ad6989d0f631cb112c8 Mon Sep 17 00:00:00 2001 From: Simon Conseil Date: Mon, 30 Sep 2013 23:16:54 +0200 Subject: [PATCH] Re-add --version, update README & Changelog --- README.rst | 2 +- docs/changelog.rst | 7 +++++++ sigal/__init__.py | 3 +++ sigal/pkgmeta.py | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 4dedc16..1ca4854 100644 --- a/README.rst +++ b/README.rst @@ -18,7 +18,7 @@ The idea behind Sigal is to ease the use of the javascript librairies like `galleria`_. These librairies do a great job to display the images, Sigal does what is missing: resize images, create thumbnails, generate html pages. -Sigal is currently compatible only with Python 2. +Sigal is compatible with Python 2.7 and 3.3. Links : diff --git a/docs/changelog.rst b/docs/changelog.rst index 9faf201..9cf35d6 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -2,6 +2,13 @@ Changelog =========== +Version 0.6.dev +~~~~~~~~~~~~~~~ + +Released on 2013-xx-xx. + +- Add support for Python 3.3 + Version 0.5.1 ~~~~~~~~~~~~~ diff --git a/sigal/__init__.py b/sigal/__init__.py index 99c97a1..eb60a00 100644 --- a/sigal/__init__.py +++ b/sigal/__init__.py @@ -41,6 +41,7 @@ from argh import ArghParser, arg from logging import Formatter from .gallery import Gallery +from .pkgmeta import __version__ from .settings import read_settings _DEFAULT_CONFIG_FILE = 'sigal.conf.py' @@ -152,4 +153,6 @@ def serve(path): def main(): parser = ArghParser(description='Simple static gallery generator.') parser.add_commands([init, build, serve]) + parser.add_argument('--version', action='version', + version='%(prog)s {}'.format(__version__)) parser.dispatch() diff --git a/sigal/pkgmeta.py b/sigal/pkgmeta.py index 0264f42..0c76bc3 100644 --- a/sigal/pkgmeta.py +++ b/sigal/pkgmeta.py @@ -2,7 +2,7 @@ __title__ = 'sigal' __author__ = 'Simon Conseil' -__version__ = '0.5.1' +__version__ = '0.6.0-dev' __license__ = 'MIT' __url__ = 'https://github.com/saimn/sigal' __all__ = ['__title__', '__author__', '__version__', '__license__', '__url__']