Skip to content

fix(semrelease): Provide proper git message for semantic release #713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ehdsouza merged 3 commits into from
Nov 22, 2019
Merged

fix(semrelease): Provide proper git message for semantic release #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88e2c08
fix(semrelease): Provide proper git message for semantic release
ehdsouza Nov 21, 2019
7f61abb
test(stt): refactor tests when operation is locked
ehdsouza Nov 22, 2019
d17593d
test(stt): remove unused variable
ehdsouza Nov 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .bumpversion.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[bumpversion]
current_version = 4.0.3
commit = True
message = [skip ci] Bump version: {current_version} -> {new_version}

[bumpversion:file:ibm_watson/version.py]
search = __version__ = '{current_version}'
Expand Down
31 changes: 17 additions & 14 deletions .releaserc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
{
"branch": "master",
"verifyConditions": ["@semantic-release/changelog", "@semantic-release/github"],
"debug": true,
"prepare": [
"plugins": [
"@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator",
"@semantic-release/changelog",
"@semantic-release/git",
{
"path": "@semantic-release/exec",
"cmd": "bumpversion --current-version ${lastRelease.version} --new-version ${nextRelease.version} patch"
}
],
"publish": [
{
"path": "@semantic-release/github"
}
[
"@semantic-release/exec",
{
"prepareCmd": "bumpversion --allow-dirty --current-version ${lastRelease.version} --new-version ${nextRelease.version} patch"
}
],
[
"@semantic-release/git",
{
"message": "chore(release): ${nextRelease.version} release notes\n\n${nextRelease.notes}"
}
],
"@semantic-release/github"
]
}
}
28 changes: 18 additions & 10 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,42 @@
language: python

matrix:
include:
- python: 3.5
- python: 3.6
- python: 3.7
- python: 3.8
cache: pip

cache: pip3

before_install:
- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_cebf25e6c525_key
-iv $encrypted_cebf25e6c525_iv -in .env.enc -out .env -d || true'
- npm install npm@latest -g

install:
- pip install tox-travis
- pip3 install tox-travis

before_script:
- sudo apt-get update
- pip install pypandoc
- sudo apt-get install pandoc
- pip install -r requirements.txt
- pip install -r requirements-dev.txt
- pip install --editable .
- pip3 install -r requirements.txt
- pip3 install -r requirements-dev.txt
- pip3 install --editable .

script:
- pip install -U python-dotenv
- pip3 install -U python-dotenv
- tox

before_deploy:
- pip install bumpversion
- sudo apt-get update
- pip3 install pypandoc
- sudo apt-get install pandoc
- pip3 install bumpversion
- nvm install 12
- npm install @semantic-release/changelog
- npm install @semantic-release/exec
- npm install @semantic-release/git
- npm install @semantic-release/github

deploy:
- provider: script
script: docs/publish.sh
Expand Down
73 changes: 43 additions & 30 deletions test/integration/test_speech_to_text_v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
import pytest
import threading

@pytest.mark.skipif(
os.getenv('VCAP_SERVICES') is None, reason='requires VCAP_SERVICES')

@pytest.mark.skipif(os.getenv('VCAP_SERVICES') is None,
reason='requires VCAP_SERVICES')
class TestSpeechToTextV1(TestCase):
text_to_speech = None
custom_models = None
Expand All @@ -17,12 +18,11 @@ class TestSpeechToTextV1(TestCase):
def setup_class(cls):
cls.speech_to_text = ibm_watson.SpeechToTextV1()
cls.speech_to_text.set_default_headers({
'X-Watson-Learning-Opt-Out':
'1',
'X-Watson-Test':
'1'
'X-Watson-Learning-Opt-Out': '1',
'X-Watson-Test': '1'
})
cls.custom_models = cls.speech_to_text.list_language_models().get_result()
cls.custom_models = cls.speech_to_text.list_language_models(
).get_result()
cls.create_custom_model = cls.speech_to_text.create_language_model(
name="integration_test_model",
base_model_name="en-US_BroadbandModel").get_result()
Expand All @@ -36,22 +36,27 @@ def teardown_class(cls):
def test_models(self):
output = self.speech_to_text.list_models().get_result()
assert output is not None
model = self.speech_to_text.get_model('ko-KR_BroadbandModel').get_result()
model = self.speech_to_text.get_model(
'ko-KR_BroadbandModel').get_result()
assert model is not None
try:
self.speech_to_text.get_model('bogus')
except Exception as e:
assert 'X-global-transaction-id:' in str(e)

def test_create_custom_model(self):
current_custom_models = self.speech_to_text.list_language_models().get_result()
current_custom_models = self.speech_to_text.list_language_models(
).get_result()
assert len(current_custom_models['customizations']) - len(
self.custom_models.get('customizations')) >= 1

def test_recognize(self):
with open(os.path.join(os.path.dirname(__file__), '../../resources/speech.wav'), 'rb') as audio_file:
with open(
os.path.join(os.path.dirname(__file__),
'../../resources/speech.wav'), 'rb') as audio_file:
output = self.speech_to_text.recognize(
audio=audio_file, content_type='audio/l16; rate=44100').get_result()
audio=audio_file,
content_type='audio/l16; rate=44100').get_result()
assert output['results'][0]['alternatives'][0][
'transcript'] == 'thunderstorms could produce large hail isolated tornadoes and heavy rain '

Expand All @@ -60,7 +65,8 @@ def test_recognitions(self):
assert output is not None

def test_custom_corpora(self):
output = self.speech_to_text.list_corpora(self.customization_id).get_result()
output = self.speech_to_text.list_corpora(
self.customization_id).get_result()
assert not output['corpora']

def test_acoustic_model(self):
Expand All @@ -83,7 +89,9 @@ def test_acoustic_model(self):
get_acoustic_model['customization_id']).get_result()

def test_recognize_using_websocket(self):

class MyRecognizeCallback(RecognizeCallback):

def __init__(self):
RecognizeCallback.__init__(self)
self.error = None
Expand All @@ -96,14 +104,19 @@ def on_transcription(self, transcript):
self.transcript = transcript

test_callback = MyRecognizeCallback()
with open(os.path.join(os.path.dirname(__file__), '../../resources/speech.wav'), 'rb') as audio_file:
with open(
os.path.join(os.path.dirname(__file__),
'../../resources/speech.wav'), 'rb') as audio_file:
audio_source = AudioSource(audio_file, False)
t = threading.Thread(target=self.speech_to_text.recognize_using_websocket, args=(audio_source, "audio/l16; rate=44100", test_callback))
t = threading.Thread(
target=self.speech_to_text.recognize_using_websocket,
args=(audio_source, "audio/l16; rate=44100", test_callback))
t.start()
t.join()
assert test_callback.error is None
assert test_callback.transcript is not None
assert test_callback.transcript[0]['transcript'] == 'thunderstorms could produce large hail isolated tornadoes and heavy rain '
assert test_callback.transcript[0][
'transcript'] == 'thunderstorms could produce large hail isolated tornadoes and heavy rain '

def test_custom_grammars(self):
customization_id = None
Expand All @@ -116,37 +129,37 @@ def test_custom_grammars(self):
print('Creating a new custom model')
create_custom_model_for_grammar = self.speech_to_text.create_language_model(
name="integration_test_model_for_grammar",
base_model_name="en-US_BroadbandModel"
).get_result()
customization_id = create_custom_model_for_grammar['customization_id']
base_model_name="en-US_BroadbandModel").get_result()
customization_id = create_custom_model_for_grammar[
'customization_id']

grammars = self.speech_to_text.list_grammars(
customization_id
).get_result()['grammars']
customization_id).get_result()['grammars']

if not grammars:
with open(os.path.join(os.path.dirname(__file__), '../../resources/confirm-grammar.xml'), 'rb') as grammar_file:
with open(
os.path.join(os.path.dirname(__file__),
'../../resources/confirm-grammar.xml'),
'rb') as grammar_file:
add_grammar_result = self.speech_to_text.add_grammar(
customization_id,
grammar_name='test-add-grammar-python',
grammar_file=grammar_file,
content_type='application/srgs+xml',
allow_overwrite=True
).get_result()
allow_overwrite=True).get_result()
assert add_grammar_result is not None

get_grammar_result = self.speech_to_text.get_grammar(
customization_id,
grammar_name='test-add-grammar-python'
).get_result()
grammar_name='test-add-grammar-python').get_result()
assert get_grammar_result is not None
else:
print('Deleting grammar')
delete_grammar_result = self.speech_to_text.delete_grammar(
customization_id,
'test-add-grammar-python'
).get_result()
assert delete_grammar_result is not None
try:
self.speech_to_text.delete_grammar(
customization_id, 'test-add-grammar-python').get_result()
except ibm_watson.ApiException as ex:
print('Could not delete grammar: {0}'.format(ex.message))

try:
self.speech_to_text.delete_language_model(customization_id)
Expand Down