From 1ddba8208d75622bc6bff32901dacee9814bb9dc Mon Sep 17 00:00:00 2001 From: Kubilay Kocak Date: Sat, 5 Mar 2016 22:55:40 +1100 Subject: [PATCH] Exclude bundled thrift, install_requires it instead Correctly package evernote by excluding any bundled thrift modules from installation and use install_requires to depend on the (PyPI) package instead. This prevents package/installation conflicts between other Python packages that depend on thrift. --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0d3274ec..e7c3ad59 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ def read(fname): description='Evernote SDK for Python', long_description=read('README.md'), packages=find_packages('lib'), - package_dir={'': 'lib'}, + packages=find_packages('lib',exclude=["*.thrift", "*.thrift.*", "thrift.*", "thrift"]), classifiers=[ 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', @@ -28,6 +28,7 @@ def read(fname): ], license='BSD', install_requires=[ + 'thrift', 'oauth2', ], )