Merge branch 'release-1.10.46'

* release-1.10.46: Bumping version to 1.10.46 Update changelog based on model updates Don't use shared test bucket for website tests
aws · Jul 7, 2016 · 064fdfc · 064fdfc
2 parents 6b311b0 + 2360ab2
commit 064fdfc
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 6 deletions.
diff --git a/.changes/1.10.46.json b/.changes/1.10.46.json
@@ -0,0 +1,22 @@
+[
+  {
+    "category": "``config``", 
+    "description": "Update config command to latest version", 
+    "type": "feature"
+  }, 
+  {
+    "category": "``ds``", 
+    "description": "Update ds command to latest version", 
+    "type": "feature"
+  }, 
+  {
+    "category": "``opsworks``", 
+    "description": "Update opsworks command to latest version", 
+    "type": "feature"
+  }, 
+  {
+    "category": "``servicecatalog``", 
+    "description": "Update servicecatalog command to latest version", 
+    "type": "feature"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,15 @@
 CHANGELOG
 =========
 
+1.10.46
+=======
+
+* feature:``config``: Update config command to latest version
+* feature:``ds``: Update ds command to latest version
+* feature:``opsworks``: Update opsworks command to latest version
+* feature:``servicecatalog``: Update servicecatalog command to latest version
+
+
 1.10.45
 =======
 

diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.10.45'
+__version__ = '1.10.46'
 
 #
 # Get our data path to be added to botocore's search path

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.10.'
 # The full version, including alpha/beta/rc tags.
-release = '1.10.45'
+release = '1.10.46'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.cfg b/setup.cfg
@@ -4,7 +4,7 @@ universal = 1
 
 [metadata]
 requires-dist =
-        botocore==1.4.35
+        botocore==1.4.36
         colorama>=0.2.5,<=0.3.3
         docutils>=0.10
         rsa>=3.1.2,<=3.5.0

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 import awscli
 
 
-requires = ['botocore==1.4.35',
+requires = ['botocore==1.4.36',
             'colorama>=0.2.5,<=0.3.3',
             'docutils>=0.10',
             'rsa>=3.1.2,<=3.5.0',

diff --git a/tests/integration/customizations/s3/test_plugin.py b/tests/integration/customizations/s3/test_plugin.py
@@ -1413,7 +1413,7 @@ def test_stream_large_file(self):
 
 class TestWebsiteConfiguration(BaseS3IntegrationTest):
     def test_create_website_index_configuration(self):
-        bucket_name = _SHARED_BUCKET
+        bucket_name = self.create_bucket()
         # Supply only --index-document argument.
         full_command = 's3 website %s --index-document index.html' % \
             (bucket_name)
@@ -1428,7 +1428,7 @@ def test_create_website_index_configuration(self):
         self.assertNotIn('RedirectAllRequestsTo', parsed)
 
     def test_create_website_index_and_error_configuration(self):
-        bucket_name = _SHARED_BUCKET
+        bucket_name = self.create_bucket()
         # Supply both --index-document and --error-document arguments.
         p = aws('s3 website %s --index-document index.html '
                 '--error-document error.html' % bucket_name)