Add uritemplate as a dependency.

craigcitro · craigcitro · commit 951b75fb419d · 2014-08-18T23:14:20.000-07:00
We removed uritemplate from oauth2client, so now we re-add it as a normal
python package dependency.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,3 @@
-recursive-include uritemplate *.py
 recursive-include apiclient *.json *.py
 include CHANGELOG
 include LICENSE
diff --git a/setup.py b/setup.py
@@ -30,11 +30,11 @@
 packages = [
     'googleapiclient',
     'oauth2client',
-    'uritemplate',
 ]
 
 install_requires = [
     'httplib2>=0.8',
+    'uritemplate>=0.6',
 ]
 
 long_desc = """The Google API Client for Python is a client library for
@@ -65,6 +65,5 @@
     ],
     package_dir={
         'oauth2client':'oauth2client/oauth2client',
-        'uritemplate':'oauth2client/uritemplate',
     },
 )
diff --git a/tox.ini b/tox.ini
@@ -9,6 +9,7 @@ deps = keyring
        django==1.2
        webtest
        nose
+       uritemplate
 setenv = PYTHONPATH=../google_appengine
 
 [testenv:py26]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-recursive-include uritemplate *.py`
`2`	`1`	`recursive-include apiclient .json .py`
`3`	`2`	`include CHANGELOG`
`4`	`3`	`include LICENSE`
Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,11 @@`
`30`	`30`	`packages = [`
`31`	`31`	`'googleapiclient',`
`32`	`32`	`'oauth2client',`
`33`		`- 'uritemplate',`
`34`	`33`	`]`
`35`	`34`
`36`	`35`	`install_requires = [`
`37`	`36`	`'httplib2>=0.8',`
	`37`	`+ 'uritemplate>=0.6',`
`38`	`38`	`]`
`39`	`39`
`40`	`40`	`long_desc = """The Google API Client for Python is a client library for`
`@@ -65,6 +65,5 @@`
`65`	`65`	`],`
`66`	`66`	`package_dir={`
`67`	`67`	`'oauth2client':'oauth2client/oauth2client',`
`68`		`- 'uritemplate':'oauth2client/uritemplate',`
`69`	`68`	`},`
`70`	`69`	`)`