diff --git a/.travis.yml b/.travis.yml index fd48a9497082..0dbe29228bba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ script: - (cd pubsub && tox -e py27) - (cd logging && tox -e py27) - (cd dns && tox -e py27) + - (cd language && tox -e py27) - tox -e py34 - (cd core && tox -e py34) - (cd bigtable && tox -e py34) @@ -23,6 +24,7 @@ script: - (cd pubsub && tox -e py34) - (cd logging && tox -e py34) - (cd dns && tox -e py34) + - (cd language && tox -e py34) - tox -e lint - tox -e cover - (cd core && tox -e cover) @@ -33,6 +35,7 @@ script: - (cd pubsub && tox -e cover) - (cd logging && tox -e cover) - (cd dns && tox -e cover) + - (cd language && tox -e cover) - tox -e system-tests - tox -e system-tests3 - scripts/update_docs.sh diff --git a/language/.coveragerc b/language/.coveragerc new file mode 100644 index 000000000000..a54b99aa14b7 --- /dev/null +++ b/language/.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/language/MANIFEST.in b/language/MANIFEST.in new file mode 100644 index 000000000000..cb3a2b9ef4fa --- /dev/null +++ b/language/MANIFEST.in @@ -0,0 +1,4 @@ +include README.rst +graft google +graft unit_tests +global-exclude *.pyc diff --git a/language/README.rst b/language/README.rst new file mode 100644 index 000000000000..5086be4e8a78 --- /dev/null +++ b/language/README.rst @@ -0,0 +1,48 @@ +Python Client for Google Cloud Natural Language +=============================================== + + Python idiomatic client for `Google Cloud Natural Language`_ + +.. _Google Cloud Natural Language: https://cloud.google.com/natural-language/ + +- `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-language + $ # OR + $ pip install --upgrade google-cloud-natural-language + +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 +------------- + +The Google Cloud `Natural Language`_ API (`Natural Language API docs`_) +provides natural language understanding technologies to developers, +including sentiment analysis, entity recognition, and syntax analysis. +This API is part of the larger Cloud Machine Learning API. + +.. _Natural Language: https://cloud.google.com/natural-language/ +.. _Natural Language API docs: https://cloud.google.com/natural-language/reference/rest/ + +See the ``google-cloud-python`` API `Natural Language documentation`_ to learn +how to analyze text with this API. + +.. _Natural Language documentation: https://google-cloud-python.readthedocs.io/en/stable/language-usage.html diff --git a/language/google/__init__.py b/language/google/__init__.py new file mode 100644 index 000000000000..b2b833373882 --- /dev/null +++ b/language/google/__init__.py @@ -0,0 +1,20 @@ +# 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. + +try: + import pkg_resources + pkg_resources.declare_namespace(__name__) +except ImportError: + import pkgutil + __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/language/google/cloud/__init__.py b/language/google/cloud/__init__.py new file mode 100644 index 000000000000..8ac7b74af136 --- /dev/null +++ b/language/google/cloud/__init__.py @@ -0,0 +1,20 @@ +# Copyright 2014 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. + +try: + import pkg_resources + pkg_resources.declare_namespace(__name__) +except ImportError: + import pkgutil + __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/google/cloud/language/__init__.py b/language/google/cloud/language/__init__.py similarity index 100% rename from google/cloud/language/__init__.py rename to language/google/cloud/language/__init__.py diff --git a/google/cloud/language/client.py b/language/google/cloud/language/client.py similarity index 100% rename from google/cloud/language/client.py rename to language/google/cloud/language/client.py diff --git a/google/cloud/language/connection.py b/language/google/cloud/language/connection.py similarity index 100% rename from google/cloud/language/connection.py rename to language/google/cloud/language/connection.py diff --git a/google/cloud/language/document.py b/language/google/cloud/language/document.py similarity index 100% rename from google/cloud/language/document.py rename to language/google/cloud/language/document.py diff --git a/google/cloud/language/entity.py b/language/google/cloud/language/entity.py similarity index 100% rename from google/cloud/language/entity.py rename to language/google/cloud/language/entity.py diff --git a/google/cloud/language/sentiment.py b/language/google/cloud/language/sentiment.py similarity index 100% rename from google/cloud/language/sentiment.py rename to language/google/cloud/language/sentiment.py diff --git a/google/cloud/language/syntax.py b/language/google/cloud/language/syntax.py similarity index 100% rename from google/cloud/language/syntax.py rename to language/google/cloud/language/syntax.py diff --git a/language/setup.py b/language/setup.py new file mode 100644 index 000000000000..96ec98dd70b7 --- /dev/null +++ b/language/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-language', + version='0.20.0dev', + description='Python Client for Google Cloud Natural Language', + long_description=README, + namespace_packages=[ + 'google', + 'google.cloud', + ], + packages=find_packages(), + install_requires=REQUIREMENTS, + **SETUP_BASE +) diff --git a/language/tox.ini b/language/tox.ini new file mode 100644 index 000000000000..9823ae7507a8 --- /dev/null +++ b/language/tox.ini @@ -0,0 +1,30 @@ +[tox] +envlist = + py27,py34,py35,cover + +[testing] +deps = + {toxinidir}/../core + pytest +covercmd = + py.test --quiet \ + --cov=google.cloud.language \ + --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/language/__init__.py b/language/unit_tests/__init__.py similarity index 100% rename from unit_tests/language/__init__.py rename to language/unit_tests/__init__.py diff --git a/unit_tests/language/test_client.py b/language/unit_tests/test_client.py similarity index 100% rename from unit_tests/language/test_client.py rename to language/unit_tests/test_client.py diff --git a/unit_tests/language/test_connection.py b/language/unit_tests/test_connection.py similarity index 100% rename from unit_tests/language/test_connection.py rename to language/unit_tests/test_connection.py diff --git a/unit_tests/language/test_document.py b/language/unit_tests/test_document.py similarity index 100% rename from unit_tests/language/test_document.py rename to language/unit_tests/test_document.py diff --git a/unit_tests/language/test_entity.py b/language/unit_tests/test_entity.py similarity index 100% rename from unit_tests/language/test_entity.py rename to language/unit_tests/test_entity.py diff --git a/unit_tests/language/test_sentiment.py b/language/unit_tests/test_sentiment.py similarity index 100% rename from unit_tests/language/test_sentiment.py rename to language/unit_tests/test_sentiment.py diff --git a/unit_tests/language/test_syntax.py b/language/unit_tests/test_syntax.py similarity index 100% rename from unit_tests/language/test_syntax.py rename to language/unit_tests/test_syntax.py diff --git a/scripts/verify_included_modules.py b/scripts/verify_included_modules.py index 8484e66a5337..65b1c6b58a32 100644 --- a/scripts/verify_included_modules.py +++ b/scripts/verify_included_modules.py @@ -64,6 +64,7 @@ 'core', 'datastore', 'dns', + 'language', 'logging', 'pubsub', 'storage', diff --git a/setup.py b/setup.py index 0855da714c45..ba5e41304148 100644 --- a/setup.py +++ b/setup.py @@ -55,6 +55,7 @@ 'google-cloud-core', 'google-cloud-datastore', 'google-cloud-dns', + 'google-cloud-language', 'google-cloud-logging', 'google-cloud-pubsub', 'google-cloud-storage', diff --git a/tox.ini b/tox.ini index 65041c500343..64585fa87378 100644 --- a/tox.ini +++ b/tox.ini @@ -12,6 +12,7 @@ deps = {toxinidir}/pubsub {toxinidir}/logging {toxinidir}/dns + {toxinidir}/language pytest covercmd = py.test --quiet \ @@ -67,6 +68,12 @@ covercmd = --cov-append \ --cov-config {toxinidir}/.coveragerc \ dns/unit_tests + py.test --quiet \ + --cov=google.cloud \ + --cov=unit_tests \ + --cov-append \ + --cov-config {toxinidir}/.coveragerc \ + language/unit_tests coverage report --show-missing --fail-under=100 [testenv]