diff --git a/.travis.yml b/.travis.yml index 1ea74f1cb664..0f496d7f19ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ install: - pip install --upgrade pip tox script: - - tox -e py27 - (cd core && tox -e py27) - (cd bigtable && tox -e py27) - (cd storage && tox -e py27) @@ -20,7 +19,7 @@ script: - (cd monitoring && tox -e py27) - (cd vision && tox -e py27) - (cd translate && tox -e py27) - - tox -e py34 + - (cd speech && tox -e py27) - (cd core && tox -e py34) - (cd bigtable && tox -e py34) - (cd storage && tox -e py34) @@ -35,6 +34,7 @@ script: - (cd monitoring && tox -e py34) - (cd vision && tox -e py34) - (cd translate && tox -e py34) + - (cd speech && tox -e py34) - tox -e lint - tox -e cover - (cd core && tox -e cover) @@ -51,6 +51,7 @@ script: - (cd monitoring && tox -e cover) - (cd vision && tox -e cover) - (cd translate && tox -e cover) + - (cd speech && tox -e cover) - tox -e system-tests - tox -e system-tests3 - scripts/update_docs.sh diff --git a/scripts/verify_included_modules.py b/scripts/verify_included_modules.py index d76c44d5e009..d18f146d6203 100644 --- a/scripts/verify_included_modules.py +++ b/scripts/verify_included_modules.py @@ -70,6 +70,7 @@ 'monitoring', 'pubsub', 'resource_manager', + 'speech', 'storage', 'translate', 'vision', diff --git a/setup.py b/setup.py index a322be4627b7..359a4a5f76eb 100644 --- a/setup.py +++ b/setup.py @@ -71,11 +71,6 @@ version='0.20.0dev', description='API Client library for Google Cloud', long_description=README, - namespace_packages=[ - 'google', - 'google.cloud', - ], - packages=find_packages(), install_requires=REQUIREMENTS, **SETUP_BASE ) diff --git a/speech/.coveragerc b/speech/.coveragerc new file mode 100644 index 000000000000..a54b99aa14b7 --- /dev/null +++ b/speech/.coveragerc @@ -0,0 +1,11 @@ +[run] +branch = True + +[report] +fail_under = 100 +show_missing = True +exclude_lines = + # Re-enable the standard pragma + pragma: NO COVER + # Ignore debug-only repr + def __repr__ diff --git a/speech/MANIFEST.in b/speech/MANIFEST.in new file mode 100644 index 000000000000..cb3a2b9ef4fa --- /dev/null +++ b/speech/MANIFEST.in @@ -0,0 +1,4 @@ +include README.rst +graft google +graft unit_tests +global-exclude *.pyc diff --git a/speech/README.rst b/speech/README.rst new file mode 100644 index 000000000000..8a1dad623e3a --- /dev/null +++ b/speech/README.rst @@ -0,0 +1,44 @@ +Python Client for Google Cloud Speech +===================================== + + Python idiomatic client for `Google Cloud Speech`_ + +.. _Google Cloud Speech: https://cloud.google.com/speech/ + +- `Homepage`_ +- `API Documentation`_ + +.. _Homepage: https://googlecloudplatform.github.io/google-cloud-python/ +.. _API Documentation: http://googlecloudplatform.github.io/google-cloud-python/ + +Quick Start +----------- + +:: + + $ pip install --upgrade google-cloud-speech + +Authentication +-------------- + +With ``google-cloud-python`` we try to make authentication as painless as +possible. Check out the `Authentication section`_ in our documentation to +learn more. You may also find the `authentication document`_ shared by all +the ``google-cloud-*`` libraries to be helpful. + +.. _Authentication section: http://google-cloud-python.readthedocs.io/en/latest/google-cloud-auth.html +.. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication + +Using the API +------------- + +`Cloud Speech API`_ enables easy integration of Google speech +recognition technologies into developer applications. Send audio +and receive a text transcription from the Cloud Speech API service. + +.. _Cloud Speech API: https://cloud.google.com/speech/ + +See the ``google-cloud-python`` API `speech documentation`_ to learn how to +connect to the Google Cloud Speech API using this Client Library. + +.. _speech documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/speech-usage.html diff --git a/google/__init__.py b/speech/google/__init__.py similarity index 100% rename from google/__init__.py rename to speech/google/__init__.py diff --git a/google/cloud/__init__.py b/speech/google/cloud/__init__.py similarity index 100% rename from google/cloud/__init__.py rename to speech/google/cloud/__init__.py diff --git a/google/cloud/speech/__init__.py b/speech/google/cloud/speech/__init__.py similarity index 100% rename from google/cloud/speech/__init__.py rename to speech/google/cloud/speech/__init__.py diff --git a/google/cloud/speech/client.py b/speech/google/cloud/speech/client.py similarity index 100% rename from google/cloud/speech/client.py rename to speech/google/cloud/speech/client.py diff --git a/google/cloud/speech/connection.py b/speech/google/cloud/speech/connection.py similarity index 100% rename from google/cloud/speech/connection.py rename to speech/google/cloud/speech/connection.py diff --git a/speech/setup.py b/speech/setup.py new file mode 100644 index 000000000000..de70baf6b1e4 --- /dev/null +++ b/speech/setup.py @@ -0,0 +1,68 @@ +# 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 + +from setuptools import find_packages +from setuptools import setup + + +PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__)) + +with open(os.path.join(PACKAGE_ROOT, 'README.rst')) as file_obj: + README = file_obj.read() + +# NOTE: This is duplicated throughout and we should try to +# consolidate. +SETUP_BASE = { + 'author': 'Google Cloud Platform', + 'author_email': 'jjg+google-cloud-python@google.com', + 'scripts': [], + 'url': 'https://github.com/GoogleCloudPlatform/google-cloud-python', + 'license': 'Apache 2.0', + 'platforms': 'Posix; MacOS X; Windows', + 'include_package_data': True, + 'zip_safe': False, + 'classifiers': [ + 'Development Status :: 4 - Beta', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: Apache Software License', + 'Operating System :: OS Independent', + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + 'Topic :: Internet', + ], +} + + +REQUIREMENTS = [ + 'google-cloud-core', +] + +setup( + name='google-cloud-speech', + version='0.20.0dev', + description='Python Client for Google Cloud Speech', + long_description=README, + namespace_packages=[ + 'google', + 'google.cloud', + ], + packages=find_packages(), + install_requires=REQUIREMENTS, + **SETUP_BASE +) diff --git a/speech/tox.ini b/speech/tox.ini new file mode 100644 index 000000000000..8aec90a4b2f9 --- /dev/null +++ b/speech/tox.ini @@ -0,0 +1,30 @@ +[tox] +envlist = + py27,py34,py35,cover + +[testing] +deps = + {toxinidir}/../core + pytest +covercmd = + py.test --quiet \ + --cov=google.cloud.speech \ + --cov=unit_tests \ + --cov-config {toxinidir}/.coveragerc \ + unit_tests + +[testenv] +commands = + py.test --quiet {posargs} unit_tests +deps = + {[testing]deps} + +[testenv:cover] +basepython = + python2.7 +commands = + {[testing]covercmd} +deps = + {[testenv]deps} + coverage + pytest-cov diff --git a/unit_tests/__init__.py b/speech/unit_tests/__init__.py similarity index 100% rename from unit_tests/__init__.py rename to speech/unit_tests/__init__.py diff --git a/unit_tests/speech/_fixtures.py b/speech/unit_tests/_fixtures.py similarity index 100% rename from unit_tests/speech/_fixtures.py rename to speech/unit_tests/_fixtures.py diff --git a/unit_tests/speech/test_client.py b/speech/unit_tests/test_client.py similarity index 96% rename from unit_tests/speech/test_client.py rename to speech/unit_tests/test_client.py index d54eeedea586..53e1eb67b89e 100644 --- a/unit_tests/speech/test_client.py +++ b/speech/unit_tests/test_client.py @@ -41,7 +41,7 @@ def test_sync_recognize_content_with_optional_parameters(self): import base64 from google.cloud._helpers import _to_bytes from google.cloud.speech.client import Encoding - from unit_tests.speech._fixtures import SYNC_RECOGNIZE_RESPONSE + from unit_tests._fixtures import SYNC_RECOGNIZE_RESPONSE _AUDIO_CONTENT = _to_bytes('/9j/4QNURXhpZgAASUkq') _B64_AUDIO_CONTENT = base64.b64encode(_AUDIO_CONTENT) @@ -89,7 +89,7 @@ def test_sync_recognize_content_with_optional_parameters(self): def test_sync_recognize_source_uri_without_optional_parameters(self): from google.cloud.speech.client import Encoding - from unit_tests.speech._fixtures import SYNC_RECOGNIZE_RESPONSE + from unit_tests._fixtures import SYNC_RECOGNIZE_RESPONSE RETURNED = SYNC_RECOGNIZE_RESPONSE REQUEST = { @@ -162,7 +162,7 @@ def test_sync_recognize_without_samplerate(self): def test_sync_recognize_with_empty_results(self): from google.cloud.speech.client import Encoding - from unit_tests.speech._fixtures import SYNC_RECOGNIZE_EMPTY_RESPONSE + from unit_tests._fixtures import SYNC_RECOGNIZE_EMPTY_RESPONSE credentials = _Credentials() client = self._makeOne(credentials=credentials) diff --git a/unit_tests/speech/test_connection.py b/speech/unit_tests/test_connection.py similarity index 100% rename from unit_tests/speech/test_connection.py rename to speech/unit_tests/test_connection.py diff --git a/tox.ini b/tox.ini index 4ac4c37bddb3..f55f675c7105 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = - py27,py34,py35,cover,docs,lint + cover,docs,lint [testing] deps = @@ -18,18 +18,13 @@ deps = {toxinidir}/monitoring {toxinidir}/vision {toxinidir}/translate + {toxinidir}/speech pytest covercmd = py.test --quiet \ --cov=google.cloud \ --cov=unit_tests \ --cov-config {toxinidir}/.coveragerc \ - unit_tests - py.test --quiet \ - --cov=google.cloud \ - --cov=unit_tests \ - --cov-append \ - --cov-config {toxinidir}/.coveragerc \ core/unit_tests py.test --quiet \ --cov=google.cloud \ @@ -109,6 +104,12 @@ covercmd = --cov-append \ --cov-config {toxinidir}/.coveragerc \ translate/unit_tests + py.test --quiet \ + --cov=google.cloud \ + --cov=unit_tests \ + --cov-append \ + --cov-config {toxinidir}/.coveragerc \ + speech/unit_tests coverage report --show-missing --fail-under=100 [testenv] diff --git a/unit_tests/speech/__init__.py b/unit_tests/speech/__init__.py deleted file mode 100644 index 58e0d9153632..000000000000 --- a/unit_tests/speech/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# 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. diff --git a/unit_tests/streaming/__init__.py b/unit_tests/streaming/__init__.py deleted file mode 100644 index 58e0d9153632..000000000000 --- a/unit_tests/streaming/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# 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.