Skip to content

Fixing merge conflict in setup.py for Speech. #3609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lukesneeringer merged 1 commit into from
Jul 17, 2017
Merged

Fixing merge conflict in setup.py for Speech. #3609

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 2 additions & 22 deletions speech/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
'include_package_data': True,
'zip_safe': False,
'classifiers': [
'Development Status :: 3 - Alpha',
'Development Status :: 4 - Beta',

This comment was marked as spam.

Sign in to view

'Intended Audience :: Developers',
'License :: OSI Approved :: Apache Software License',
'Operating System :: OS Independent',
Expand All @@ -58,8 +58,6 @@
]

setup(
author='Google Cloud Platform',
author_email='googleapis-packages@google.com',
name='google-cloud-speech',
version='0.27.0',
description='Python Client for Google Cloud Speech',
Expand All @@ -74,23 +72,5 @@
],
packages=find_packages(exclude=('tests*',)),
install_requires=REQUIREMENTS,
url='https://github.com/GoogleCloudPlatform/google-cloud-python',
license='Apache 2.0',
platforms='Posix; MacOS X; Windows',
include_package_data=True,
zip_safe=False,
scripts=[],
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',
'Programming Language :: Python :: 3.6',
'Topic :: Internet',
],
**SETUP_BASE
)