Add uritemplate as a dependency.

We removed uritemplate from oauth2client, so now we re-add it as a normal
python package dependency.

3 files changed, 2 insertions, 3 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 1636df251..cc692b3b7 100644
--- 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
index b07651b7d..3d3847c4b 100644
--- a/setup.py
+++ b/setup.py
@@ -30,11 +30,11 @@ from setuptools import setup
 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 @@ setup(
     ],
     package_dir={
         'oauth2client':'oauth2client/oauth2client',
-        'uritemplate':'oauth2client/uritemplate',
     },
 )
diff --git a/tox.ini b/tox.ini
index aa1b36cad..b7c6591f3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,6 +9,7 @@ deps = keyring
        django==1.2
        webtest
        nose
+       uritemplate
 setenv = PYTHONPATH=../google_appengine
 
 [testenv:py26]