Skip to content

Commit

Permalink
Fix Py3 installation.
Browse files Browse the repository at this point in the history
  • Loading branch information
braincore committed Aug 26, 2015
1 parent 07c2c98 commit bfc5de6
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 7 deletions.
3 changes: 3 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
include ez_setup.py
include LICENSE
include *.rst
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@
# built documents.
#
# The short X.Y version.
version = '3.13'
version = '3.14'
# The full version, including alpha/beta/rc tags.
release = '3.13'
release = '3.14'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion dropbox/dropbox.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
]

# TODO(kelkabany): We need to auto populate this as done in the v1 SDK.
__version__ = '3.13'
__version__ = '3.14'

import json
import logging
Expand Down
2 changes: 1 addition & 1 deletion dropbox/rest.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
raise ImportError('Dropbox python client requires urllib3.')


SDK_VERSION = "3.13"
SDK_VERSION = "3.14"

TRUSTED_CERT_FILE = pkg_resources.resource_filename(__name__, 'trusted-certs.crt')

Expand Down
15 changes: 12 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
# Don't import unicode_literals because of a bug in py2 setuptools
# where package_data is expected to be str and not unicode.
from __future__ import absolute_import, division, print_function

# Ensure setuptools is available
import sys

from ez_setup import use_setuptools
use_setuptools()
try:
from ez_setup import use_setuptools
use_setuptools()
except ImportError:
# Try to use ez_setup, but if not, continue anyway. The import is known
# to fail when installing from a tar.gz.
print('Could not import ez_setup', file=sys.stderr)

from setuptools import setup

Expand All @@ -16,7 +25,7 @@

dist = setup(
name='dropbox',
version='3.13',
version='3.14',
description='Official Dropbox API Client',
author='Dropbox',
author_email='[email protected]',
Expand Down

0 comments on commit bfc5de6

Please sign in to comment.