Drop oauth2client as a submodule.

craigcitro · craigcitro · commit 28467c87c3c9 · 2014-10-09T00:15:00.000-07:00
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
@@ -1,3 +0,0 @@
-[submodule "oauth2client"]
-	path = oauth2client
-	url = https://github.com/google/oauth2client.git
diff --git a/oauth2client b/oauth2client
diff --git 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',
-    },
 )

Original file line number	Diff line number	Diff line change
`@@ -1,3 +0,0 @@`
`1`		`-[submodule "oauth2client"]`
`2`		`- path = oauth2client`
`3`		`- url = https://github.com/google/oauth2client.git`