8000 Fixing merge conflict in `setup.py` for Speech. (#3609) · dsdinter/google-cloud-python@fe9b6cf · GitHub
[go: up one dir, main page]

Skip to content

Commit fe9b6cf

Browse files
dhermeslukesneeringer
authored andcommitted
Fixing merge conflict in setup.py for Speech. (googleapis#3609)
1 parent 408f357 commit fe9b6cf

File tree

1 file changed

+2
-22
lines changed

1 file changed

+2
-22
lines changed

speech/setup.py

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
'include_package_data': True,
3838
'zip_safe': False,
3939
'classifiers': [
40-
'Development Status :: 3 - Alpha',
40+
'Development Status :: 4 - Beta',
4141
'Intended Audience :: Developers',
4242
'License :: OSI Approved :: Apache Software License',
4343
'Operating System :: OS Independent',
@@ -58,8 +58,6 @@
5858
]
5959

6060
setup(
61-
author='Google Cloud Platform',
62-
author_email='googleapis-packages@google.com',
6361
name='google-cloud-speech',
6462
version='0.27.0',
6563
description='Python Client for Google Cloud Speech',
@@ -74,23 +72,5 @@
7472
],
7573
packages=find_packages(exclude=('tests*',)),
7674
install_requires=REQUIREMENTS,
77-
url='https://github.com/GoogleCloudPlatform/google-cloud-python',
78-
license='Apache 2.0',
79-
platforms='Posix; MacOS X; Windows',
80-
include_package_data=True,
81-
zip_safe=False,
82-
scripts=[],
83-
classifiers=[
84-
'Development Status :: 4 - Beta',
85-
'Intended Audience :: Developers',
86-
'License :: OSI Approved :: Apache Software License',
87-
'Operating System :: OS Independent',
88-
'Programming Language :: Python :: 2',
89-
'Programming Language :: Python :: 2.7',
90-
'Programming Language :: Python :: 3',
91-
'Programming Language :: Python :: 3.4',
92-
'Programming Language :: Python :: 3.5',
93-
'Programming Language :: Python :: 3.6',
94-
' 4374 Topic :: Internet',
95-
],
75+
**SETUP_BASE
9676
)

0 commit comments

Comments
 (0)
0