Centralized version definition to dropbox.dropbox.

braincore · braincore · commit 4908bc18843f · 2016-05-24T09:29:25.000-07:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -20,6 +20,8 @@
 # that may be in the sys.path.
 sys.path.insert(0, os.path.abspath('..'))
 
+import dropbox
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -59,9 +61,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '6.2'
+version = dropbox.__version__
 # The full version, including alpha/beta/rc tags.
-release = '6.2'
+release = dropbox.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/dropbox/__init__.py b/dropbox/__init__.py
@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 
-from .dropbox import __version__
-from .dropbox import Dropbox, DropboxTeam, create_session
+from .dropbox import __version__, Dropbox, DropboxTeam, create_session
 from .oauth import DropboxOAuth2Flow, DropboxOAuth2FlowNoRedirect
 
 # Compatibility with the deprecated v1 client.
diff --git a/dropbox/dropbox.py b/dropbox/dropbox.py
@@ -4,8 +4,7 @@
     'create_session',
 ]
 
-# TODO(kelkabany): We need to auto populate this as done in the v1 SDK.
-__version__ = '6.2'
+__version__ = '6.3.0'
 
 import contextlib
 import json
diff --git a/dropbox/rest.py b/dropbox/rest.py
@@ -31,7 +31,9 @@
 else:
     url_encode = urllib.urlencode
 
-SDK_VERSION = "6.2"
+from dropbox import __version__
+
+SDK_VERSION = __version__
 
 TRUSTED_CERT_FILE = pkg_resources.resource_filename(__name__, 'trusted-certs.crt')
 
diff --git a/setup.py b/setup.py
@@ -15,6 +15,8 @@
 
 from setuptools import setup
 
+from dropbox import __version__
+
 install_reqs = ['urllib3',
                 'requests>=2.5.1',
                 'six>=1.3.0']
@@ -25,7 +27,7 @@
 
 dist = setup(
     name='dropbox',
-    version='6.2',
+    version=__version__,
     description='Official Dropbox API Client',
     author='Dropbox',
     author_email='dev-platform@dropbox.com',
diff --git a/update_version.sh b/update_version.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+if [ -z $1 ]; then echo "error: $0 needs a version number as argument."; fi
+sed -i "s/^__version__.*/__version__ = '$1'/g" dropbox/dropbox.py

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,7 @@`
`4`	`4`	`'create_session',`
`5`	`5`	`]`
`6`	`6`
`7`		`-# TODO(kelkabany): We need to auto populate this as done in the v1 SDK.`
`8`		`-__version__ = '6.2'`
	`7`	`+__version__ = '6.3.0'`
`9`	`8`
`10`	`9`	`import contextlib`
`11`	`10`	`import json`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/bin/sh`
	`2`	`+if [ -z $1 ]; then echo "error: $0 needs a version number as argument."; fi`
	`3`	`+sed -i "s/^__version__.*/__version__ = '$1'/g" dropbox/dropbox.py`