Skip to content

Commit ccc3efa

Browse files
authored
Merge branch 'master' into v4.1.0
2 parents d70b41e + ca54907 commit ccc3efa

File tree

7 files changed

+39
-20
lines changed

7 files changed

+39
-20
lines changed

.bumpversion.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[bumpversion]
2-
current_version = 4.0.2
2+
current_version = 4.0.3
33
commit = True
4+
message = [skip ci] Bump version: {current_version} -> {new_version}
45

56
[bumpversion:file:ibm_watson/version.py]
67
search = __version__ = '{current_version}'

.releaserc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"verifyConditions": ["@semantic-release/changelog", "@semantic-release/github"],
44
"debug": true,
55
"prepare": [
6+
"@semantic-release/changelog",
7+
"@semantic-release/git",
68
{
79
"path": "@semantic-release/exec",
810
"cmd": "bumpversion --current-version ${lastRelease.version} --new-version ${nextRelease.version} patch"
9-
},
10-
"@semantic-release/changelog",
11-
"@semantic-release/git"
11+
}
1212
],
1313
"publish": [
1414
{

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
## [4.0.3](https://github.com/watson-developer-cloud/python-sdk/compare/v4.0.2...v4.0.3) (2019-11-20)
2+
3+
4+
### Bug Fixes
5+
6+
* **bumpversion:** Skip for bumpversion ([fd38d73](https://github.com/watson-developer-cloud/python-sdk/commit/fd38d7395daf3d28e8dd085b0a1c8e9d4358a1b5))
7+
* **semantic:** remove tag in bumpversion ([bb1a6a9](https://github.com/watson-developer-cloud/python-sdk/commit/bb1a6a93fcbc8ac13df45d78fc2b97b071267699))
8+
* **semrelease:** Reorder semantic release steps ([1a13a0c](https://github.com/watson-developer-cloud/python-sdk/commit/1a13a0c0bf8522b8ea10146d4daf9059f2595c35))
9+
10+
## [4.0.3](https://github.com/watson-developer-cloud/python-sdk/compare/v4.0.2...v4.0.3) (2019-11-20)
11+
12+
13+
### Bug Fixes
14+
15+
* **bumpversion:** Skip for bumpversion ([fd38d73](https://github.com/watson-developer-cloud/python-sdk/commit/fd38d7395daf3d28e8dd085b0a1c8e9d4358a1b5))
16+
* **semrelease:** Reorder semantic release steps ([1a13a0c](https://github.com/watson-developer-cloud/python-sdk/commit/1a13a0c0bf8522b8ea10146d4daf9059f2595c35))
17+
118
## [4.0.2](https://github.com/watson-developer-cloud/python-sdk/compare/v4.0.1...v4.0.2) (2019-11-11)
219

320

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ For more information, follow the [MIGRATION-V4](https://github.com/watson-develo
269269
To move from v3.x to v4.0, refer to the [MIGRATION-V4](https://github.com/watson-developer-cloud/python-sdk/blob/master/MIGRATION-V4.md).
270270

271271
## Configuring the http client (Supported from v1.1.0)
272-
To set client configs like timeout use the `with_http_config()` function and pass it a dictionary of configs. For example for a Assistant service instance
272+
To set client configs like timeout use the `set_http_config()` function and pass it a dictionary of configs. For example for a Assistant service instance
273273

274274
```python
275275
from ibm_watson import AssistantV1
@@ -398,7 +398,8 @@ from ibm_cloud_sdk_core.authenticators import CloudPakForDataAuthenticator
398398
authenticator = CloudPakForDataAuthenticator(
399399
'<your username>',
400400
'<your password>',
401-
'<authentication url>') # should be of the form https://{icp_cluster_host}{instance-id}/api
401+
'<authentication url>', # should be of the form https://{icp_cluster_host}{instance-id}/api
402+
disable_ssl_verification=True) # Disable ssl verification for authenticator
402403

403404
assistant = AssistantV1(
404405
version='<version>',

ibm_watson/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '4.0.2'
1+
__version__ = '4.0.3'

package-lock.json

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import os
1919
import sys
2020

21-
__version__ = '4.0.2'
21+
__version__ = '4.0.3'
2222

2323

2424
if sys.argv[-1] == 'publish':

0 commit comments

Comments
 (0)