Skip to content

Commit 4509dea

Browse files
YaroslawEkimovYaroslawEkimov
committed
Merge branch 'master' into release
2 parents e47c60e + 6a9398a commit 4509dea

File tree

678 files changed

+3076
-1550
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

678 files changed

+3076
-1550
lines changed

‎Jenkinsfile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ properties([
66
[$class: 'StringParameterDefinition', name: 'apiUrl', defaultValue: 'https://api-qa.aspose.cloud', description: 'api url'],
77
[$class: 'BooleanParameterDefinition', name: 'ignoreCiSkip', defaultValue: false, description: 'ignore CI Skip'],
88
[$class: 'StringParameterDefinition', name: 'credentialsId', defaultValue: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', description: 'credentials id'],
9+
[$class: 'BooleanParameterDefinition', name: 'packageTesting', defaultValue: false, description: 'Testing package from repository without local sources. Used for prodhealthcheck'],
910
]
1011
]
1112
])
@@ -35,6 +36,10 @@ def runtests(dockerImageVersion)
3536

3637
if (needToBuild) {
3738
docker.image('python:' + dockerImageVersion).inside('-u root'){
39+
if (params.packageTesting) {
40+
sh "rm -rf asposewordscloud"
41+
sh "mv requirements-test.txt requirements.txt"
42+
}
3843
stage('build'){
3944
sh "python -m pip install -r requirements.txt && python -m pip install -r test-requirements.txt"
4045
}

‎README.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,17 @@ Python Cloud SDK wraps Aspose.Words Cloud API so you could seamlessly integrate
1616
- [Convert a document to desired file format](https://docs.aspose.cloud/display/wordscloud/Convert+Document+to+Destination+Format+with+Detailed+Settings+and+Save+Result+to+Storage) along with detailed settings.
1717
- Convert an encrypted PDF document into Word document format.
1818

19+
## Enhancements in Version 22.1
20+
21+
- Added 'FieldOptions.FieldUpdateCultureName' to set Culture for fields
22+
- Added 'DocumentEntry.Password' to set an encrypted password for appending document
23+
- Added 'encryptedPassword2' query parameter to CompareDocuments to set an encrypted password for the second comparing document
24+
25+
1926
## Enhancements in Version 21.12
2027

28+
- Added FieldOptions parameter to mail merge operations
29+
- Added timeout parameter to api configuration
2130

2231

2332
## Enhancements in Version 21.11

‎asposewordscloud/api_client.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# coding: utf-8
22
# -----------------------------------------------------------------------------------
33
# <copyright company="Aspose" file="api_client.py">
4-
# Copyright (c) 2021 Aspose.Words for Cloud
4+
# Copyright (c) 2022 Aspose.Words for Cloud
55
# </copyright>
66
# <summary>
77
# Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -83,12 +83,12 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
8383

8484
self.pool = None
8585
self.rest_client = rest.RESTClientObject(configuration)
86-
self.default_headers = {'x-aspose-client': 'python sdk', 'x-aspose-version': '21.12'}
86+
self.default_headers = {'x-aspose-client': 'python sdk', 'x-aspose-version': '22.1'}
8787
if header_name is not None:
8888
self.default_headers[header_name] = header_value
8989
self.cookie = cookie
9090
# Set default User-Agent.
91-
self.user_agent = 'python sdk 21.12'
91+
self.user_agent = 'python sdk 22.1'
9292

9393
def __del__(self):
9494
if not self.pool is None:

‎asposewordscloud/apis/words_api.py‎

Lines changed: 579 additions & 289 deletions
Large diffs are not rendered by default.

‎asposewordscloud/configuration.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# coding: utf-8
22
# -----------------------------------------------------------------------------------
33
# <copyright company="Aspose" file="configuration.py">
4-
# Copyright (c) 2021 Aspose.Words for Cloud
4+
# Copyright (c) 2022 Aspose.Words for Cloud
55
# </copyright>
66
# <summary>
77
# Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -258,6 +258,6 @@ def to_debug_report(self):
258258
return "Python SDK Debug Report:\n"\
259259
"OS: {env}\n"\
260260
"Python Version: {pyversion}\n"\
261-
"Version of the API: 21.12\n"\
262-
"SDK Package Version: 21.12".\
261+
"Version of the API: 22.1\n"\
262+
"SDK Package Version: 22.1".\
263263
format(env=sys.platform, pyversion=sys.version)

‎asposewordscloud/models/api_error.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# coding: utf-8
22
# -----------------------------------------------------------------------------------
33
# <copyright company="Aspose" file="api_error.py">
4-
# Copyright (c) 2021 Aspose.Words for Cloud
4+
# Copyright (c) 2022 Aspose.Words for Cloud
55
# </copyright>
66
# <summary>
77
# Permission is hereby granted, free of charge, to any person obtaining a copy

‎asposewordscloud/models/available_fonts_response.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# coding: utf-8
22
# -----------------------------------------------------------------------------------
33
# <copyright company="Aspose" file="available_fonts_response.py">
4-
# Copyright (c) 2021 Aspose.Words for Cloud
4+
# Copyright (c) 2022 Aspose.Words for Cloud
55
# </copyright>
66
# <summary>
77
# Permission is hereby granted, free of charge, to any person obtaining a copy

‎asposewordscloud/models/bmp_save_options_data.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# coding: utf-8
22
# -----------------------------------------------------------------------------------
33
# <copyright company="Aspose" file="bmp_save_options_data.py">
4-
# Copyright (c) 2021 Aspose.Words for Cloud
4+
# Copyright (c) 2022 Aspose.Words for Cloud
55
# </copyright>
66
# <summary>
77
# Permission is hereby granted, free of charge, to any person obtaining a copy

‎asposewordscloud/models/bookmark.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# coding: utf-8
22
# -----------------------------------------------------------------------------------
33
# <copyright company="Aspose" file="bookmark.py">
4-
# Copyright (c) 2021 Aspose.Words for Cloud
4+
# Copyright (c) 2022 Aspose.Words for Cloud
55
# </copyright>
66
# <summary>
77
# Permission is hereby granted, free of charge, to any person obtaining a copy

‎asposewordscloud/models/bookmark_data.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# coding: utf-8
22
# -----------------------------------------------------------------------------------
33
# <copyright company="Aspose" file="bookmark_data.py">
4-
# Copyright (c) 2021 Aspose.Words for Cloud
4+
# Copyright (c) 2022 Aspose.Words for Cloud
55
# </copyright>
66
# <summary>
77
# Permission is hereby granted, free of charge, to any person obtaining a copy

0 commit comments

Comments
 (0)