Merge branch 'master' into dev

Azure · Jul 7, 2016 · 759d9c9 · 759d9c9
2 parents ec45d77 + 3abf4f8
commit 759d9c9
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 10 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,8 @@
+2016-06-28 Service Bus 0.20.2
+
+Bug fix:
+* New header in Rest API which breaks the SDK #658 #657
+
 2016-06-23 Version 2.0.0rc5 / 0.30.0rc5
 
 Disclaimer:

diff --git a/appveyor.yml b/appveyor.yml
@@ -0,0 +1,26 @@
+environment:
+  matrix:
+    - PYTHON: "C:\\Python27"
+    - PYTHON: "C:\\Python33"
+    - PYTHON: "C:\\Python34"
+    - PYTHON: "C:\\Python35"
+    - PYTHON: "C:\\Python27-x64"
+    - PYTHON: "C:\\Python35-x64"
+
+install:
+  - "%PYTHON%\\python.exe -m pip install -U pip"
+  - "%PYTHON%\\python.exe -m pip install -r requirements.txt"
+  - "%PYTHON%\\python.exe -m pip install azure-storage"
+  - "%PYTHON%\\python.exe -m pip uninstall -y azure-common"
+
+build: off
+
+test_script:
+  - cd azure-servicebus/tests
+  - run-servicebus.bat %PYTHON%
+  - cd ../..
+  - cd azure-servicemanagement-legacy/tests
+  - run-legacy-mgmt.bat %PYTHON%
+  - cd ../..
+  - cd azure-mgmt/tests
+  - run-mgmt.bat %PYTHON%
diff --git a/azure-mgmt/tests/test_mgmt_compute.py b/azure-mgmt/tests/test_mgmt_compute.py
@@ -204,7 +204,7 @@ def test_virtual_machines_operations(self):
             self.group_name,
             names.vm
         )
-        self.assertEquals(result_get.name, names.vm)
+        self.assertEqual(result_get.name, names.vm)
         self.assertIsNone(result_get.instance_view)
 
         # Get instanceView

diff --git a/azure-mgmt/tests/test_mgmt_redis.py b/azure-mgmt/tests/test_mgmt_redis.py
@@ -49,7 +49,7 @@ def test_redis(self):
             self.group_name, 
             cache_name,
         )
-        self.assertEquals(result.name, cache_name)
+        self.assertEqual(result.name, cache_name)
 
 
 

diff --git a/azure-mgmt/tests/test_mgmt_resource.py b/azure-mgmt/tests/test_mgmt_resource.py
@@ -63,7 +63,7 @@ def test_resource_groups(self):
 
         result_list_top = self.resource_client.resource_groups.list(top=2)
         result_list_top = result_list_top.next()
-        self.assertEquals(len(result_list_top), 2)
+        self.assertEqual(len(result_list_top), 2)
 
         params_patch = azure.mgmt.resource.resources.models.ResourceGroup(
             location=self.region,

diff --git a/azure-mgmt/tests/test_mgmt_storage.py b/azure-mgmt/tests/test_mgmt_storage.py
@@ -71,7 +71,7 @@ def test_storage_accounts(self):
             account_name,
         )
         keys = {v.key_name: (v.value, v.permissions) for v in result_list_keys.keys}
-        self.assertEquals(len(keys), 2)
+        self.assertEqual(len(keys), 2)
         self.assertGreater(len(keys['key1'][0]), 0)
         self.assertGreater(len(keys['key1'][0]), 0)
 
@@ -81,7 +81,7 @@ def test_storage_accounts(self):
             "key1"
         )
         new_keys = {v.key_name: (v.value, v.permissions) for v in result_regen_keys.keys}
-        self.assertEquals(len(new_keys), 2)
+        self.assertEqual(len(new_keys), 2)
         self.assertNotEqual(
             new_keys['key1'][0],
             keys['key1'][0],

diff --git a/azure-servicebus/azure/servicebus/_serialization.py b/azure-servicebus/azure/servicebus/_serialization.py
@@ -83,7 +83,8 @@ def _create_message(response, service_instance):
                                   'transfer-encoding',
                                   'server',
                                   'location',
-                                  'date']:
+                                  'date',
+                                  'strict-transport-security']:
             if '"' in value:
                 value = value[1:-1]
                 try:

diff --git a/azure-servicebus/azure/servicebus/constants.py b/azure-servicebus/azure/servicebus/constants.py
@@ -14,7 +14,7 @@
 #--------------------------------------------------------------------------
 
 __author__ = 'Microsoft Corp. <ptvshelp@microsoft.com>'
-__version__ = '0.20.1'
+__version__ = '0.20.2'
 
 _USER_AGENT_STRING = 'pyazure/' + __version__
 

diff --git a/azure-servicebus/setup.py b/azure-servicebus/setup.py
@@ -34,7 +34,7 @@
 
 setup(
     name='azure-servicebus',
-    version='0.20.1',
+    version='0.20.2',
     description='Microsoft Azure Service Bus Client Library for Python',
     long_description=open('README.rst', 'r').read(),
     license='Apache License 2.0',

diff --git a/azure/README.rst b/azure/README.rst
@@ -18,7 +18,7 @@ packages. Follow the links for more information on each package.
 -  `azure-mgmt v0.30.0rc5 <https://pypi.python.org/pypi/azure-mgmt/0.30.0rc5>`__
 -  `azure-graphrbac v0.30.0rc5 <https://pypi.python.org/pypi/azure-graphrbac/0.30.0rc5>`__
 -  `azure-batch v0.30.0rc5 <https://pypi.python.org/pypi/azure-batch/0.30.0rc5>`__
--  `azure-servicebus v0.20.1 <https://pypi.python.org/pypi/azure-servicebus/0.20.1>`__
+-  `azure-servicebus v0.20.2 <https://pypi.python.org/pypi/azure-servicebus/0.20.2>`__
 -  `azure-servicemanagement-legacy v0.20.3 <https://pypi.python.org/pypi/azure-servicemanagement-legacy/0.20.3>`__
 -  `azure-storage v0.30.0 <https://pypi.python.org/pypi/azure-storage/0.30.0>`__
 

diff --git a/azure/setup.py b/azure/setup.py
@@ -58,7 +58,7 @@
         'azure-mgmt==0.30.0rc5',
         'azure-batch==0.30.0rc5',
         'azure-graphrbac==0.30.0rc5',
-        'azure-servicebus==0.20.1',
+        'azure-servicebus==0.20.2',
         'azure-storage==0.32.0',
         'azure-servicemanagement-legacy==0.20.3',
     ],