Merge pull request #89 from betatim/third-release

[MRG] Reformatting and bump version to 0.0.3

docs/conf.py

@@ -20,7 +20,7 @@
 # import os
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
-
+import osfclient
 
 # -- General configuration ------------------------------------------------
 
@@ -57,9 +57,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = 'v0.0.2'
+version = osfclient.__version__
 # The full version, including alpha/beta/rc tags.
-release = 'v0.0.2'
+release = osfclient.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

osfclient/__init__.py

@@ -3,4 +3,5 @@
 
 __all__ = ['OSF']
 
-__version__ = '0.0.2'
+# update `setup.py` as well
+__version__ = '0.0.3'

osfclient/__main__.py

@@ -5,6 +5,7 @@
 from textwrap import dedent
 
 from .cli import clone, fetch, list_, remove, upload, init
+from . import __version__
 
 
 def main():
@@ -28,8 +29,11 @@ def main():
         formatter_class=argparse.RawDescriptionHelpFormatter)
     parser.add_argument('-u', '--username', default=None,
                         help=('OSF username. Provide your password via '
-                              'OSF_PASSWORD environment variable.'))
-    parser.add_argument('-p', '--project', default=None, help='OSF project ID')
+                              'OSF_PASSWORD environment variable'))
+    parser.add_argument('-p', '--project', default=None,
+                        help='OSF project ID')
+    parser.add_argument('-v', '--version', action='version',
+                        version='%(prog)s {}'.format(__version__))
     # dest=command stores the name of the command in a variable, this is
     # used later on to retrieve the correct sub-parser
     subparsers = parser.add_subparsers(dest='command')
@@ -76,7 +80,7 @@ def _add_subparser(name, description, aliases=[]):
                                help='Force overwriting of remote file',
                                action='store_true')
     upload_parser.add_argument('-r', '--recursive',
-                               help='Recursively upload entire directories.',
+                               help='Recursively upload entire directories',
                                action='store_true')
     upload_parser.add_argument('source', help='Local file')
     upload_parser.add_argument('destination', help='Remote file path')

setup.py

@@ -4,10 +4,11 @@
 
 setup(
     name='osfclient',
-    version='0.0.2',
+    # update `osfclient/__init__.py` as well
+    version='0.0.3',
 
-    description='An OSF command line library',
-    long_description='An OSF command line library.',
+    description='An OSF command-line library',
+    long_description='An OSF command-line client and library.',
 
     # The project's main homepage.
     url='https://github.com/dib-lab/osf-cli',