diff --git a/packages/google-cloud-python-speech/.flake8 b/packages/google-cloud-python-speech/.flake8 new file mode 100644 index 000000000000..25168dc87605 --- /dev/null +++ b/packages/google-cloud-python-speech/.flake8 @@ -0,0 +1,6 @@ +[flake8] +exclude = + __pycache__, + .git, + *.pyc, + conf.py diff --git a/packages/google-cloud-python-speech/LICENSE b/packages/google-cloud-python-speech/LICENSE new file mode 100644 index 000000000000..d64569567334 --- /dev/null +++ b/packages/google-cloud-python-speech/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/packages/google-cloud-python-speech/MANIFEST.in b/packages/google-cloud-python-speech/MANIFEST.in index cb3a2b9ef4fa..9f7100c9528a 100644 --- a/packages/google-cloud-python-speech/MANIFEST.in +++ b/packages/google-cloud-python-speech/MANIFEST.in @@ -1,4 +1,4 @@ -include README.rst -graft google -graft unit_tests -global-exclude *.pyc +include README.rst LICENSE +recursive-include google *.json *.proto +recursive-include unit_tests * +global-exclude *.pyc __pycache__ diff --git a/packages/google-cloud-python-speech/google/cloud/speech/__init__.py b/packages/google-cloud-python-speech/google/cloud/speech/__init__.py index 67b9aaf512fa..9c1654a2a6c7 100644 --- a/packages/google-cloud-python-speech/google/cloud/speech/__init__.py +++ b/packages/google-cloud-python-speech/google/cloud/speech/__init__.py @@ -22,3 +22,6 @@ from google.cloud.speech.client import Client from google.cloud.speech.encoding import Encoding from google.cloud.speech.operation import Operation + + +__all__ = ['__version__', 'Alternative', 'Client', 'Encoding', 'Operation'] diff --git a/packages/google-cloud-python-speech/nox.py b/packages/google-cloud-python-speech/nox.py new file mode 100644 index 000000000000..789afa3e37c4 --- /dev/null +++ b/packages/google-cloud-python-speech/nox.py @@ -0,0 +1,89 @@ +# Copyright 2016 Google Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from __future__ import absolute_import + +import os + +import nox + + +@nox.session +@nox.parametrize('python_version', ['2.7', '3.4', '3.5', '3.6']) +def unit_tests(session, python_version): + """Run the unit test suite.""" + + # Run unit tests against all supported versions of Python. + session.interpreter = 'python%s' % python_version + + # Install all test dependencies, then install this package in-place. + session.install('mock', 'pytest', 'pytest-cov', '../core/') + session.install('-e', '.') + + # Run py.test against the unit tests. + session.run('py.test', '--quiet', + '--cov=google.cloud.speech', '--cov=tests.unit', '--cov-append', + '--cov-config=.coveragerc', '--cov-report=', '--cov-fail-under=97', + 'tests/unit', + ) + + +@nox.session +@nox.parametrize('python_version', ['2.7', '3.6']) +def system_tests(session, python_version): + """Run the system test suite.""" + + # Sanity check: Only run system tests if the environment variable is set. + if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''): + return + + # Run the system tests against latest Python 2 and Python 3 only. + session.interpreter = 'python%s' % python_version + + # Install all test dependencies, then install this package into the + # virutalenv's dist-packages. + session.install('mock', 'pytest', + '../core/', '../test_utils/', + '../storage/') + session.install('.') + + # Run py.test against the system tests. + session.run('py.test', '--quiet', 'tests/system.py') + + +@nox.session +def lint(session): + """Run flake8. + + Returns a failure if flake8 finds linting errors or sufficiently + serious code quality issues. + """ + session.interpreter = 'python3.6' + session.install('flake8') + session.install('.') + session.run('flake8', 'google/cloud/speech') + + +@nox.session +def cover(session): + """Run the final coverage report. + + This outputs the coverage report aggregating coverage from the unit + test runs (not system test runs), and then erases coverage data. + """ + session.interpreter = 'python3.6' + session.chdir(os.path.dirname(__file__)) + session.install('coverage', 'pytest-cov') + session.run('coverage', 'report', '--show-missing', '--fail-under=100') + session.run('coverage', 'erase') diff --git a/packages/google-cloud-python-speech/setup.py b/packages/google-cloud-python-speech/setup.py index c1c729e592ed..dd7fc501c939 100644 --- a/packages/google-cloud-python-speech/setup.py +++ b/packages/google-cloud-python-speech/setup.py @@ -63,7 +63,7 @@ 'google', 'google.cloud', ], - packages=find_packages(), + packages=find_packages(exclude=('unit_tests*',)), install_requires=REQUIREMENTS, **SETUP_BASE ) diff --git a/packages/google-cloud-python-speech/tests/__init__.py b/packages/google-cloud-python-speech/tests/__init__.py new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/packages/google-cloud-python-speech/tests/data/hello.wav b/packages/google-cloud-python-speech/tests/data/hello.wav new file mode 100644 index 000000000000..0378f790119f Binary files /dev/null and b/packages/google-cloud-python-speech/tests/data/hello.wav differ diff --git a/packages/google-cloud-python-speech/tests/system.py b/packages/google-cloud-python-speech/tests/system.py new file mode 100644 index 000000000000..d900240de014 --- /dev/null +++ b/packages/google-cloud-python-speech/tests/system.py @@ -0,0 +1,232 @@ +# Copyright 2016 Google Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import unittest + +from google.cloud import exceptions +from google.cloud import speech +from google.cloud import storage +from google.cloud.speech.alternative import Alternative + +from test_utils.retry import RetryErrors +from test_utils.retry import RetryResult +from test_utils.system import unique_resource_id + + +AUDIO_FILE = os.path.join(os.path.dirname(__file__), 'data', 'hello.wav') + + +def _operation_complete(result): + """Return operation result.""" + return result + + +def _wait_until_complete(operation, max_attempts=10): + """Wait until an operation has completed. + + :type operation: :class:`google.cloud.operation.Operation` + :param operation: Operation that has not completed. + + :type max_attempts: int + :param max_attempts: (Optional) The maximum number of times to check if + the operation has completed. Defaults to 5. + + :rtype: bool + :returns: Boolean indicating if the operation is complete. + """ + retry = RetryResult(_operation_complete, max_tries=max_attempts) + return retry(operation.poll)() + + +class Config(object): + """Run-time configuration to be modified at set-up. + + This is a mutable stand-in to allow test set-up to modify + global state. + """ + CLIENT = None + TEST_BUCKET = None + USE_GAX = True + + +def setUpModule(): + Config.CLIENT = speech.Client() + Config.USE_GAX = Config.CLIENT._use_gax + # Now create a bucket for GCS stored content. + storage_client = storage.Client() + bucket_name = 'new' + unique_resource_id() + Config.TEST_BUCKET = storage_client.bucket(bucket_name) + # 429 Too Many Requests in case API requests rate-limited. + retry_429 = RetryErrors(exceptions.TooManyRequests) + retry_429(Config.TEST_BUCKET.create)() + + +def tearDownModule(): + # 409 Conflict if the bucket is full. + # 429 Too Many Requests in case API requests rate-limited. + bucket_retry = RetryErrors( + (exceptions.TooManyRequests, exceptions.Conflict)) + bucket_retry(Config.TEST_BUCKET.delete)(force=True) + + +class TestSpeechClient(unittest.TestCase): + ASSERT_TEXT = 'thank you for using Google Cloud platform' + + def setUp(self): + self.to_delete_by_case = [] + + def tearDown(self): + for value in self.to_delete_by_case: + value.delete() + + def _make_sync_request(self, content=None, source_uri=None, + max_alternatives=None): + client = Config.CLIENT + sample = client.sample(content=content, + source_uri=source_uri, + encoding=speech.Encoding.LINEAR16, + sample_rate=16000) + return sample.sync_recognize(language_code='en-US', + max_alternatives=max_alternatives, + profanity_filter=True, + speech_context=['Google', 'cloud']) + + def _make_async_request(self, content=None, source_uri=None, + max_alternatives=None): + client = Config.CLIENT + sample = client.sample(content=content, + source_uri=source_uri, + encoding=speech.Encoding.LINEAR16, + sample_rate=16000) + return sample.async_recognize(language_code='en-US', + max_alternatives=max_alternatives, + profanity_filter=True, + speech_context=['Google', 'cloud']) + + def _make_streaming_request(self, file_obj, single_utterance=True, + interim_results=False): + client = Config.CLIENT + sample = client.sample(stream=file_obj, + encoding=speech.Encoding.LINEAR16, + sample_rate=16000) + return sample.streaming_recognize(single_utterance=single_utterance, + interim_results=interim_results, + speech_context=['hello', 'google']) + + def _check_results(self, alternatives, num_results=1): + self.assertEqual(len(alternatives), num_results) + top_result = alternatives[0] + self.assertIsInstance(top_result, Alternative) + self.assertEqual(top_result.transcript, + 'hello ' + self.ASSERT_TEXT) + self.assertIsInstance(top_result.confidence, float) + if num_results == 2: + second_alternative = alternatives[1] + self.assertIsInstance(second_alternative, Alternative) + self.assertEqual(second_alternative.transcript, self.ASSERT_TEXT) + self.assertIsNone(second_alternative.confidence) + + def test_sync_recognize_local_file(self): + with open(AUDIO_FILE, 'rb') as file_obj: + content = file_obj.read() + + results = self._make_sync_request(content=content, + max_alternatives=2) + self.assertEqual(len(results), 1) + alternatives = results[0].alternatives + self.assertEqual(len(alternatives), 2) + self._check_results(alternatives, 2) + + def test_sync_recognize_gcs_file(self): + bucket_name = Config.TEST_BUCKET.name + blob_name = 'hello.wav' + blob = Config.TEST_BUCKET.blob(blob_name) + self.to_delete_by_case.append(blob) # Clean-up. + with open(AUDIO_FILE, 'rb') as file_obj: + blob.upload_from_file(file_obj) + + source_uri = 'gs://%s/%s' % (bucket_name, blob_name) + results = self._make_sync_request(source_uri=source_uri, + max_alternatives=1) + self.assertEqual(len(results), 1) + self._check_results(results[0].alternatives) + + def test_async_recognize_local_file(self): + with open(AUDIO_FILE, 'rb') as file_obj: + content = file_obj.read() + + operation = self._make_async_request(content=content, + max_alternatives=2) + + _wait_until_complete(operation) + self.assertEqual(len(operation.results), 1) + alternatives = operation.results[0].alternatives + self.assertEqual(len(alternatives), 2) + self._check_results(alternatives, 2) + + def test_async_recognize_gcs_file(self): + bucket_name = Config.TEST_BUCKET.name + blob_name = 'hello.wav' + blob = Config.TEST_BUCKET.blob(blob_name) + self.to_delete_by_case.append(blob) # Clean-up. + with open(AUDIO_FILE, 'rb') as file_obj: + blob.upload_from_file(file_obj) + + source_uri = 'gs://%s/%s' % (bucket_name, blob_name) + operation = self._make_async_request(source_uri=source_uri, + max_alternatives=2) + + _wait_until_complete(operation) + self.assertEqual(len(operation.results), 1) + alternatives = operation.results[0].alternatives + self.assertEqual(len(alternatives), 2) + self._check_results(alternatives, 2) + + def test_stream_recognize(self): + if not Config.USE_GAX: + self.skipTest('gRPC is required for Speech Streaming Recognize.') + + with open(AUDIO_FILE, 'rb') as file_obj: + for results in self._make_streaming_request(file_obj): + self._check_results(results.alternatives) + + def test_stream_recognize_interim_results(self): + if not Config.USE_GAX: + self.skipTest('gRPC is required for Speech Streaming Recognize.') + + # These extra words are interim_results that the API returns as it's + # deciphering the speech audio. This has a high probability of becoming + # out of date and causing the test to fail. + extras = ' Google Now who hello thank you for you for use hello ' + with open(AUDIO_FILE, 'rb') as file_obj: + recognize = self._make_streaming_request(file_obj, + interim_results=True) + responses = list(recognize) + for response in responses: + if response.alternatives[0].transcript: + self.assertIn(response.alternatives[0].transcript, + extras + self.ASSERT_TEXT) + + self.assertGreater(len(responses), 5) + self._check_results(responses[-1].alternatives) + + def test_stream_recognize_single_utterance(self): + if not Config.USE_GAX: + self.skipTest('gRPC is required for Speech Streaming Recognize.') + + with open(AUDIO_FILE, 'rb') as file_obj: + for results in self._make_streaming_request( + file_obj, single_utterance=False): + self._check_results(results.alternatives) diff --git a/packages/google-cloud-python-speech/unit_tests/__init__.py b/packages/google-cloud-python-speech/tests/unit/__init__.py similarity index 100% rename from packages/google-cloud-python-speech/unit_tests/__init__.py rename to packages/google-cloud-python-speech/tests/unit/__init__.py diff --git a/packages/google-cloud-python-speech/unit_tests/_fixtures.py b/packages/google-cloud-python-speech/tests/unit/_fixtures.py similarity index 100% rename from packages/google-cloud-python-speech/unit_tests/_fixtures.py rename to packages/google-cloud-python-speech/tests/unit/_fixtures.py diff --git a/packages/google-cloud-python-speech/unit_tests/test__gax.py b/packages/google-cloud-python-speech/tests/unit/test__gax.py similarity index 100% rename from packages/google-cloud-python-speech/unit_tests/test__gax.py rename to packages/google-cloud-python-speech/tests/unit/test__gax.py diff --git a/packages/google-cloud-python-speech/unit_tests/test__http.py b/packages/google-cloud-python-speech/tests/unit/test__http.py similarity index 100% rename from packages/google-cloud-python-speech/unit_tests/test__http.py rename to packages/google-cloud-python-speech/tests/unit/test__http.py diff --git a/packages/google-cloud-python-speech/unit_tests/test_alternative.py b/packages/google-cloud-python-speech/tests/unit/test_alternative.py similarity index 100% rename from packages/google-cloud-python-speech/unit_tests/test_alternative.py rename to packages/google-cloud-python-speech/tests/unit/test_alternative.py diff --git a/packages/google-cloud-python-speech/unit_tests/test_client.py b/packages/google-cloud-python-speech/tests/unit/test_client.py similarity index 99% rename from packages/google-cloud-python-speech/unit_tests/test_client.py rename to packages/google-cloud-python-speech/tests/unit/test_client.py index 8aa83daeecf0..89ba2c401609 100644 --- a/packages/google-cloud-python-speech/unit_tests/test_client.py +++ b/packages/google-cloud-python-speech/tests/unit/test_client.py @@ -127,7 +127,7 @@ def test_sync_recognize_content_with_optional_params_no_gax(self): from google.cloud import speech from google.cloud.speech.alternative import Alternative from google.cloud.speech.result import Result - from unit_tests._fixtures import SYNC_RECOGNIZE_RESPONSE + from tests.unit._fixtures import SYNC_RECOGNIZE_RESPONSE _b64_audio_content = _bytes_to_unicode(b64encode(self.AUDIO_CONTENT)) request = { @@ -184,7 +184,7 @@ def test_sync_recognize_source_uri_without_optional_params_no_gax(self): from google.cloud import speech from google.cloud.speech.alternative import Alternative from google.cloud.speech.result import Result - from unit_tests._fixtures import SYNC_RECOGNIZE_RESPONSE + from tests.unit._fixtures import SYNC_RECOGNIZE_RESPONSE request = { 'config': { @@ -230,7 +230,7 @@ def test_sync_recognize_source_uri_without_optional_params_no_gax(self): def test_sync_recognize_with_empty_results_no_gax(self): from google.cloud import speech - from unit_tests._fixtures import SYNC_RECOGNIZE_EMPTY_RESPONSE + from tests.unit._fixtures import SYNC_RECOGNIZE_EMPTY_RESPONSE credentials = _make_credentials() client = self._make_one(credentials=credentials, use_gax=False) @@ -365,7 +365,7 @@ def test_async_supported_encodings(self): def test_async_recognize_no_gax(self): from google.cloud import speech from google.cloud.speech.operation import Operation - from unit_tests._fixtures import ASYNC_RECOGNIZE_RESPONSE + from tests.unit._fixtures import ASYNC_RECOGNIZE_RESPONSE RETURNED = ASYNC_RECOGNIZE_RESPONSE diff --git a/packages/google-cloud-python-speech/unit_tests/test_operation.py b/packages/google-cloud-python-speech/tests/unit/test_operation.py similarity index 100% rename from packages/google-cloud-python-speech/unit_tests/test_operation.py rename to packages/google-cloud-python-speech/tests/unit/test_operation.py diff --git a/packages/google-cloud-python-speech/unit_tests/test_result.py b/packages/google-cloud-python-speech/tests/unit/test_result.py similarity index 100% rename from packages/google-cloud-python-speech/unit_tests/test_result.py rename to packages/google-cloud-python-speech/tests/unit/test_result.py diff --git a/packages/google-cloud-python-speech/unit_tests/test_sample.py b/packages/google-cloud-python-speech/tests/unit/test_sample.py similarity index 100% rename from packages/google-cloud-python-speech/unit_tests/test_sample.py rename to packages/google-cloud-python-speech/tests/unit/test_sample.py diff --git a/packages/google-cloud-python-speech/tox.ini b/packages/google-cloud-python-speech/tox.ini deleted file mode 100644 index 4ded9cd86434..000000000000 --- a/packages/google-cloud-python-speech/tox.ini +++ /dev/null @@ -1,35 +0,0 @@ -[tox] -envlist = - py27,py34,py35,cover - -[testing] -localdeps = - pip install --quiet --upgrade {toxinidir}/../core -deps = - {toxinidir}/../core - mock - pytest -covercmd = - py.test --quiet \ - --cov=google.cloud.speech \ - --cov=unit_tests \ - --cov-config {toxinidir}/.coveragerc \ - unit_tests - -[testenv] -commands = - {[testing]localdeps} - py.test --quiet {posargs} unit_tests -deps = - {[testing]deps} - -[testenv:cover] -basepython = - python2.7 -commands = - {[testing]localdeps} - {[testing]covercmd} -deps = - {[testenv]deps} - coverage - pytest-cov