From 528d987654b181f02fc9acff7dece102aeaa2b7e Mon Sep 17 00:00:00 2001
From: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com>
Date: Thu, 17 Oct 2019 09:58:12 -0700
Subject: [PATCH] fix: pin google-api-core>=1.14.0, update format (#156)

---
 packages/google-cloud-dialogflow/setup.py | 61 ++++++++++++++---------
 1 file changed, 37 insertions(+), 24 deletions(-)

diff --git a/packages/google-cloud-dialogflow/setup.py b/packages/google-cloud-dialogflow/setup.py
index 30100fa875de..199aaafd2142 100644
--- a/packages/google-cloud-dialogflow/setup.py
+++ b/packages/google-cloud-dialogflow/setup.py
@@ -1,47 +1,60 @@
-"""A setup module for the GAPIC Dialogflow API library.
+# Copyright 2019 Google LLC
+#
+# 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
+#
+#     https://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.
 
-See:
-https://packaging.python.org/en/latest/distributing.html
-https://github.com/pypa/sampleproject
-"""
-
-from setuptools import setup, find_packages
 import io
+import os
+
+import setuptools
+
+name = "dialogflow"
+description = "Client library for the Dialogflow API"
+version = "0.6.0"
+release_status = "Development Status :: 4 - Beta"
+dependencies = ["google-api-core[grpc] >= 1.14.0, < 2.0.0dev"]
 
-install_requires = [
-    "google-api-core[grpc]<2.0.0dev,>=0.1.4",
-    "googleapis-common-protos[grpc]>=1.5.2, <2.0dev",
-]
+package_root = os.path.abspath(os.path.dirname(__file__))
 
-with io.open("README.rst", "r", encoding="utf-8") as readme_file:
-    long_description = readme_file.read()
+readme_filename = os.path.join(package_root, "README.rst")
+with io.open(readme_filename, encoding="utf-8") as readme_file:
+    readme = readme_file.read()
 
-setup(
+packages = setuptools.find_packages()
+
+setuptools.setup(
     name="dialogflow",
     version="0.7.0",
     author="Google LLC",
     author_email="googleapis-packages@google.com",
+    license="Apache 2.0",
+    url="https://github.com/dialogflow/dialogflow-python-client-v2",
     classifiers=[
-        "Intended Audience :: Developers",
-        "Development Status :: 4 - Beta",
+        release_status,
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: Implementation :: CPython",
     ],
-    description="Client library for the Dialogflow API",
-    include_package_data=True,
-    long_description=long_description,
-    install_requires=install_requires,
+    platforms="Posix; MacOS X; Windows",
+    packages=packages,
+    install_requires=dependencies,
     python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*",
-    license="Apache 2.0",
-    packages=find_packages(),
-    url="https://github.com/dialogflow/dialogflow-python-client-v2",
+    include_package_data=True,
+    zip_safe=False,
 )