more boto removal. move httpretty from 'Requires'

the Requires would get that string rendered into the package's
Depends/Requires (rather than BuildDepends/BuildRequires).
We should have BuildDepends/BuildRequires too, but since
trunk's package builds do not run 'make test', this isn't a big deal.

This also adds 'test-requires' for httpretty.

7 files changed, 1 insertions, 35 deletions

diff --git a/Requires b/Requires
index e847506f..8f695c68 100644
--- a/Requires
+++ b/Requires
@@ -31,6 +31,3 @@ requests
 
 # For patching pieces of cloud-config together
 jsonpatch
-
-# For http testing (only needed for testing)
-httpretty>=0.7.1
diff --git a/cloudinit/ec2_utils.py b/cloudinit/ec2_utils.py
index c86623bc..92a22747 100644
--- a/cloudinit/ec2_utils.py
+++ b/cloudinit/ec2_utils.py
@@ -49,9 +49,6 @@ def combine_url(base, add_on):
 
 # See: http://bit.ly/TyoUQs
 #
-# Since boto metadata reader uses the old urllib which does not
-# support ssl, we need to ahead and create our own reader which
-# works the same as the boto one (for now).
 class MetadataMaterializer(object):
     def __init__(self, blob, base_url, caller):
         self._blob = blob
diff --git a/doc/rtd/topics/datasources.rst b/doc/rtd/topics/datasources.rst
index 5543ed34..cc0d0ede 100644
--- a/doc/rtd/topics/datasources.rst
+++ b/doc/rtd/topics/datasources.rst
@@ -130,10 +130,6 @@ To see which versions are supported from your cloud provider use the following U
     ...
     latest
         
-**Note:** internally in cloudinit the `boto`_ library used to fetch the instance
-userdata and instance metadata, feel free to check that library out, it provides
-many other useful EC2 functionality.
-
 ---------------------------
 Config Drive
 ---------------------------
diff --git a/packages/bddeb b/packages/bddeb
index f52eb55f..9552aa40 100755
--- a/packages/bddeb
+++ b/packages/bddeb
@@ -29,7 +29,6 @@ import argparse
 # file pypi package name to a debian/ubuntu package name.
 PKG_MP = {
     'argparse': 'python-argparse',
-    'boto': 'python-boto',
     'cheetah': 'python-cheetah',
     'configobj': 'python-configobj',
     'jsonpatch': 'python-jsonpatch | python-json-patch',
diff --git a/packages/brpm b/packages/brpm
index 8c90a0ab..f8ba1db1 100755
--- a/packages/brpm
+++ b/packages/brpm
@@ -36,7 +36,6 @@ from cloudinit import util
 PKG_MP = {
     'redhat': {
         'argparse': 'python-argparse',
-        'boto': 'python-boto',
         'cheetah': 'python-cheetah',
         'configobj': 'python-configobj',
         'jsonpatch': 'python-jsonpatch',
@@ -48,7 +47,6 @@ PKG_MP = {
     },
     'suse': {
         'argparse': 'python-argparse',
-        'boto': 'python-boto',
         'cheetah': 'python-cheetah',
         'configobj': 'python-configobj',
         'jsonpatch': 'python-jsonpatch',
diff --git a/packages/debian/copyright b/packages/debian/copyright
index dc993525..f55bb7a3 100644
--- a/packages/debian/copyright
+++ b/packages/debian/copyright
@@ -27,25 +27,3 @@ License: GPL-3
 
  The complete text of the GPL version 3 can be seen in
  /usr/share/common-licenses/GPL-3.
-
-Files: cloudinit/boto_utils.py
-Copyright: 2006,2007, Mitch Garnaat http://garnaat.org/
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish, dis-
- tribute, sublicense, and/or sell copies of the Software, and to permit
- persons to whom the Software is furnished to do so, subject to the fol-
- lowing conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
- ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
- SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- IN THE SOFTWARE.
diff --git a/test-requires b/test-requires
new file mode 100644
index 00000000..6cee1c44
--- /dev/null
+++ b/test-requires
@@ -0,0 +1 @@
+httpretty>=0.7.1