Merge branch 'master' into release

Author: YaroslawEkimov

asposewordscloud/api_client.py

@@ -347,12 +347,12 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
 
         self.pool = None
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {'x-aspose-client': 'python sdk', 'x-aspose-client-version': '24.4'}
+        self.default_headers = {'x-aspose-client': 'python sdk', 'x-aspose-client-version': '24.5'}
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'python sdk 24.4'
+        self.user_agent = 'python sdk 24.5'
 
     def __del__(self):
         if not self.pool is None:

asposewordscloud/configuration.py

@@ -262,6 +262,6 @@ def to_debug_report(self):
         return "Python SDK Debug Report:\n"\
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
-               "Version of the API: 24.4\n"\
-               "SDK Package Version: 24.4".\
+               "Version of the API: 24.5\n"\
+               "SDK Package Version: 24.5".\
                format(env=sys.platform, pyversion=sys.version)

setup.py

@@ -5,7 +5,7 @@
 
     No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)  # noqa: E501
 
-    OpenAPI spec version: 24.4
+    OpenAPI spec version: 24.5
 
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
@@ -14,7 +14,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "aspose-words-cloud"
-VERSION = "24.4.0"
+VERSION = "24.5.0"
 # To install the library, run the following
 #
 # python setup.py install

test/api/mail_merge/test_execute_mail_merge.py

@@ -42,7 +42,7 @@ def test_execute_mail_merge_online(self):
 
         request_template = open(os.path.join(self.local_test_folder, mail_merge_folder + '/' + local_document_file), 'rb')
         request_data = open(os.path.join(self.local_test_folder, mail_merge_folder + '/' + local_data_file), 'rb')
-        request = asposewordscloud.models.requests.ExecuteMailMergeOnlineRequest(template=request_template, data=request_data)
+        request = asposewordscloud.models.requests.ExecuteMailMergeOnlineRequest(template=request_template, data=request_data, with_regions=True)
 
         result = self.words_api.execute_mail_merge_online(request)
         self.assertIsNotNone(result, 'Error has occurred.')
@@ -60,7 +60,7 @@ def test_execute_mail_merge(self):
 
         self.upload_file(remote_data_folder + '/' + remote_file_name, open(os.path.join(self.local_test_folder, mail_merge_folder + '/' + local_document_file), 'rb'))
 
-        request = asposewordscloud.models.requests.ExecuteMailMergeRequest(name=remote_file_name, data=local_data_file, folder=remote_data_folder, with_regions=False, dest_file_name=self.remote_test_out + '/' + remote_file_name)
+        request = asposewordscloud.models.requests.ExecuteMailMergeRequest(name=remote_file_name, data=local_data_file, folder=remote_data_folder, with_regions=True, dest_file_name=self.remote_test_out + '/' + remote_file_name)
 
         result = self.words_api.execute_mail_merge(request)
         self.assertIsNotNone(result, 'Error has occurred.')