Drop oauth2client as a submodule.
Previously, we'd kept `oauth2client` as a submodule, so that we could easily
track changes at HEAD. Going forward, we won't need to do this, so we switch
to having an explicit dependency in `setup.py`.
diff --git a/.gitmodules b/.gitmodules
index fa27151..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "oauth2client"]
- path = oauth2client
- url = https://github.com/google/oauth2client.git
diff --git a/oauth2client b/oauth2client
deleted file mode 160000
index ff74634..0000000
--- a/oauth2client
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ff74634c30ed501ba81df265d0a0f1ad4c9c7528
diff --git a/setup.py b/setup.py
index 8926391..79a5050 100644
--- a/setup.py
+++ b/setup.py
@@ -22,18 +22,19 @@
import sys
if sys.version_info <= (2, 6):
- print('oauth2client requires python version >= 2.6.', file=sys.stderr)
+ print('google-api-python-client requires python version >= 2.6.',
+ file=sys.stderr)
sys.exit(1)
from setuptools import setup
packages = [
'googleapiclient',
- 'oauth2client',
]
install_requires = [
'httplib2>=0.8',
+ 'oauth2client>=1.3',
'uritemplate>=0.6',
]
@@ -63,7 +64,4 @@
'Operating System :: POSIX',
'Topic :: Internet :: WWW/HTTP',
],
- package_dir={
- 'oauth2client':'oauth2client/oauth2client',
- },
)