Switched to tox for testing.

braincore · braincore · commit b71ef6d875bd · 2015-09-28T14:28:21.000-07:00
diff --git a/README.rst b/README.rst
@@ -57,8 +57,9 @@ at functional parity.
 Running tests
 -------------
 
-In the ``test`` folder, run the ``run_tests.sh`` script. You'll need to specify
-a working Dropbox OAuth2 token::
+We use the `tox <https://tox.readthedocs.org/>`_ package to run tests in Python
+2 and 3. To install, use `pip install tox`. Once installed, run `tox` from the
+root directory. You'll need to specify a working Dropbox OAuth2 token::
 
-    $ DROPBOX_TOKEN=YOUR_TOKEN PYTHONPATH=.. ./run_tests.sh
+    $ DROPBOX_TOKEN=YOUR_TOKEN tox
 
diff --git a/docs/conf.py b/docs/conf.py
@@ -59,9 +59,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.34'
+version = '3.35'
 # The full version, including alpha/beta/rc tags.
-release = '3.34'
+release = '3.35'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/dropbox/dropbox.py b/dropbox/dropbox.py
@@ -3,7 +3,7 @@
 ]
 
 # TODO(kelkabany): We need to auto populate this as done in the v1 SDK.
-__version__ = '3.34'
+__version__ = '3.35'
 
 import contextlib
 import json
diff --git a/dropbox/rest.py b/dropbox/rest.py
@@ -31,7 +31,7 @@
 else:
     url_encode = urllib.urlencode
 
-SDK_VERSION = "3.34"
+SDK_VERSION = "3.35"
 
 TRUSTED_CERT_FILE = pkg_resources.resource_filename(__name__, 'trusted-certs.crt')
 
diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@
 
 dist = setup(
     name='dropbox',
-    version='3.34',
+    version='3.35',
     description='Official Dropbox API Client',
     author='Dropbox',
     author_email='dev-platform@dropbox.com',
diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,6 @@
+[tox]
+envlist = py27,py34
+[testenv]
+passenv = DROPBOX_TOKEN 
+deps = pytest
+commands = py.test

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`]`
`4`	`4`
`5`	`5`	`# TODO(kelkabany): We need to auto populate this as done in the v1 SDK.`
`6`		`-__version__ = '3.34'`
	`6`	`+__version__ = '3.35'`
`7`	`7`
`8`	`8`	`import contextlib`
`9`	`9`	`import json`