Merge 8575c7ff04 into 780ccfe137

pelican/__init__.py

@@ -382,6 +382,16 @@ def get_instance(args):
 
 def main():
     args = parse_arguments()
+    prepare(args)
+
+
+def prepare(args):
+    """ preapres settings received from an argparse or mocked argparse
+        from different application that imports pelican.
+
+    	:param args: argparse.ArgumentParser or mocked argparse Class object
+	:type args: argparse.ArgumentParser or mocked argparse
+    """
     init(args.verbosity)
     pelican, settings = get_instance(args)
     readers = Readers(settings)

setup.py

@@ -21,7 +21,7 @@ CHANGELOG = open('docs/changelog.rst').read()
 
 setup(
     name="pelican",
-    version="3.6.1.dev",
+    version="3.7.0.dev",
     url='http://getpelican.com/',
     author='Alexis Metaireau',
     author_email='authors@getpelican.com',