From 98c0a1a8c82cf46549bc7337343039c5af941730 Mon Sep 17 00:00:00 2001
From: Spyros Trigazis <strigazi@gmail.com>
Date: Thu, 29 Jun 2017 18:52:05 +0200
Subject: [PATCH] Exclude test in find_packages (#720)

To avoid conflicts with projects that have tests in their top-level
directory:

* exlude tests in find_packages
* add include in MANIFEST.in

Closes: #688

Signed-off-by: Spyros Trigazis <strigazi@gmail.com>
---
 MANIFEST.in | 5 ++---
 setup.py    | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index a30e060..4f2ba45 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,2 @@
-include README.md
-include LICENSE
-recursive-exclude tests *
+include README.md LICENSE CHANGELOG.md
+recursive-include tests *
diff --git a/setup.py b/setup.py
index 6f6e371..47d86b7 100644
--- a/setup.py
+++ b/setup.py
@@ -61,7 +61,7 @@ setup(
     author_email='jonwayne+oauth2client@google.com',
     url='http://github.com/google/oauth2client/',
     install_requires=install_requires,
-    packages=find_packages(),
+    packages=find_packages(exclude=('tests*',)),
     license='Apache 2.0',
     keywords='google oauth 2.0 http client',
     classifiers=[