prompt: You will be provided with a partial code base and an issue statement explaining a problem to resolve.
  <issue>
  googleapiclient.discovery.build fails with module 'six.moves' has no attribute 'collections_abc' since version 1.12.0
  #### Environment details
  
    - OS type and version: 18.04.1-Ubuntu
    - Python version: Python 3.6.9
    - pip version: `pip --version` pip 9.0.1
    - `google-api-python-client` version: `pip show google-api-python-client`: Version: 1.12.0
  
  #### Code example
  googleapiclient.discovery.build() fails with message: module 'six.moves' has no attribute 'collections_abc'
  
  We only see this problem with google-api-python-client 1.12.0. 1.11.0 is fine.
  
  
  
  </issue>
  <code>
  [start of setup.py]
  1 # Copyright 2014 Google Inc. All Rights Reserved.
  2 #
  3 # Licensed under the Apache License, Version 2.0 (the "License");
  4 # you may not use this file except in compliance with the License.
  5 # You may obtain a copy of the License at
  6 #
  7 #      http://www.apache.org/licenses/LICENSE-2.0
  8 #
  9 # Unless required by applicable law or agreed to in writing, software
  10 # distributed under the License is distributed on an "AS IS" BASIS,
  11 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  12 # See the License for the specific language governing permissions and
  13 # limitations under the License.
  14 
  15 """Setup script for Google API Python client.
  16 
  17 Also installs included versions of third party libraries, if those libraries
  18 are not already installed.
  19 """
  20 from __future__ import print_function
  21 
  22 import sys
  23 
  24 if sys.version_info < (2, 7):
  25     print("google-api-python-client requires python version >= 2.7.", file=sys.stderr)
  26     sys.exit(1)
  27 if (3, 1) <= sys.version_info < (3, 4):
  28     print("google-api-python-client requires python3 version >= 3.4.", file=sys.stderr)
  29     sys.exit(1)
  30 
  31 import io
  32 import os
  33 from setuptools import setup
  34 
  35 packages = ["apiclient", "googleapiclient", "googleapiclient/discovery_cache"]
  36 
  37 install_requires = [
  38     # NOTE: Apache Beam tests depend on this library and cannot
  39     # currently upgrade their httplib2 version.
  40     # Please see https://github.com/googleapis/google-api-python-client/pull/841
  41     "httplib2>=0.9.2,<1dev",
  42     "google-auth>=1.16.0",
  43     "google-auth-httplib2>=0.0.3",
  44     "google-api-core>=1.21.0,<2dev",
  45     "six>=1.6.1,<2dev",
  46     "uritemplate>=3.0.0,<4dev",
  47 ]
  48 
  49 package_root = os.path.abspath(os.path.dirname(__file__))
  50 
  51 readme_filename = os.path.join(package_root, "README.md")
  52 with io.open(readme_filename, encoding="utf-8") as readme_file:
  53     readme = readme_file.read()
  54 
  55 version = "1.12.0"
  56 
  57 setup(
  58     name="google-api-python-client",
  59     version=version,
  60     description="Google API Client Library for Python",
  61     long_description=readme,
  62     long_description_content_type='text/markdown',
  63     author="Google LLC",
  64     author_email="googleapis-packages@google.com",
  65     url="https://github.com/googleapis/google-api-python-client/",
  66     install_requires=install_requires,
  67     python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*",
  68     packages=packages,
  69     package_data={},
  70     license="Apache 2.0",
  71     keywords="google api client",
  72     classifiers=[
  73         "Programming Language :: Python :: 2",
  74         "Programming Language :: Python :: 2.7",
  75         "Programming Language :: Python :: 3",
  76         "Programming Language :: Python :: 3.5",
  77         "Programming Language :: Python :: 3.6",
  78         "Programming Language :: Python :: 3.7",
  79         "Development Status :: 5 - Production/Stable",
  80         "Intended Audience :: Developers",
  81         "License :: OSI Approved :: Apache Software License",
  82         "Operating System :: OS Independent",
  83         "Topic :: Internet :: WWW/HTTP",
  84     ],
  85 )
  86
  [end of setup.py]
  </code>
  
  I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
  <patch>
  diff --git a/file.py b/file.py
  --- a/file.py
  +++ b/file.py
  @@ -1,27 +1,35 @@
   def euclidean(a, b):
  -    while b:
  -        a, b = b, a % b
  -    return a
  +    if b == 0:
  +        return a
  +    return euclidean(b, a % b)
   
   
   def bresenham(x0, y0, x1, y1):
       points = []
       dx = abs(x1 - x0)
       dy = abs(y1 - y0)
  -    sx = 1 if x0 < x1 else -1
  -    sy = 1 if y0 < y1 else -1
  -    err = dx - dy
  +    x, y = x0, y0
  +    sx = -1 if x0 > x1 else 1
  +    sy = -1 if y0 > y1 else 1
   
  -    while True:
  -        points.append((x0, y0))
  -        if x0 == x1 and y0 == y1:
  -            break
  -        e2 = 2 * err
  -        if e2 > -dy:
  -            err -= dy
  -            x0 += sx
  -        if e2 < dx:
  -            err += dx
  -            y0 += sy
  +    if dx > dy:
  +        err = dx / 2.0
  +        while x != x1:
  +            points.append((x, y))
  +            err -= dy
  +            if err < 0:
  +                y += sy
  +                err += dx
  +            x += sx
  +    else:
  +        err = dy / 2.0
  +        while y != y1:
  +            points.append((x, y))
  +            err -= dx
  +            if err < 0:
  +                x += sx
  +                err += dy
  +            y += sy
  +
  +    points.append((x, y))
       return points
  
  </patch>
golden_diff: diff --git a/setup.py b/setup.py
  --- a/setup.py
  +++ b/setup.py
  @@ -42,7 +42,7 @@
       "google-auth>=1.16.0",
       "google-auth-httplib2>=0.0.3",
       "google-api-core>=1.21.0,<2dev",
  -    "six>=1.6.1,<2dev",
  +    "six>=1.13.0,<2dev",
       "uritemplate>=3.0.0,<4dev",
   ]
  
verification_info: {"golden_diff": "diff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -42,7 +42,7 @@\n     \"google-auth>=1.16.0\",\n     \"google-auth-httplib2>=0.0.3\",\n     \"google-api-core>=1.21.0,<2dev\",\n-    \"six>=1.6.1,<2dev\",\n+    \"six>=1.13.0,<2dev\",\n     \"uritemplate>=3.0.0,<4dev\",\n ]\n", "issue": "googleapiclient.discovery.build fails with module 'six.moves' has no attribute 'collections_abc' since version 1.12.0\n#### Environment details\r\n\r\n  - OS type and version: 18.04.1-Ubuntu\r\n  - Python version: Python 3.6.9\r\n  - pip version: `pip --version` pip 9.0.1\r\n  - `google-api-python-client` version: `pip show google-api-python-client`: Version: 1.12.0\r\n\r\n#### Code example\r\ngoogleapiclient.discovery.build() fails with message: module 'six.moves' has no attribute 'collections_abc'\r\n\r\nWe only see this problem with google-api-python-client 1.12.0. 1.11.0 is fine.\r\n\r\n\n", "before_files": [{"content": "# Copyright 2014 Google Inc. All Rights Reserved.\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this file except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#      http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n\n\"\"\"Setup script for Google API Python client.\n\nAlso installs included versions of third party libraries, if those libraries\nare not already installed.\n\"\"\"\nfrom __future__ import print_function\n\nimport sys\n\nif sys.version_info < (2, 7):\n    print(\"google-api-python-client requires python version >= 2.7.\", file=sys.stderr)\n    sys.exit(1)\nif (3, 1) <= sys.version_info < (3, 4):\n    print(\"google-api-python-client requires python3 version >= 3.4.\", file=sys.stderr)\n    sys.exit(1)\n\nimport io\nimport os\nfrom setuptools import setup\n\npackages = [\"apiclient\", \"googleapiclient\", \"googleapiclient/discovery_cache\"]\n\ninstall_requires = [\n    # NOTE: Apache Beam tests depend on this library and cannot\n    # currently upgrade their httplib2 version.\n    # Please see https://github.com/googleapis/google-api-python-client/pull/841\n    \"httplib2>=0.9.2,<1dev\",\n    \"google-auth>=1.16.0\",\n    \"google-auth-httplib2>=0.0.3\",\n    \"google-api-core>=1.21.0,<2dev\",\n    \"six>=1.6.1,<2dev\",\n    \"uritemplate>=3.0.0,<4dev\",\n]\n\npackage_root = os.path.abspath(os.path.dirname(__file__))\n\nreadme_filename = os.path.join(package_root, \"README.md\")\nwith io.open(readme_filename, encoding=\"utf-8\") as readme_file:\n    readme = readme_file.read()\n\nversion = \"1.12.0\"\n\nsetup(\n    name=\"google-api-python-client\",\n    version=version,\n    description=\"Google API Client Library for Python\",\n    long_description=readme,\n    long_description_content_type='text/markdown',\n    author=\"Google LLC\",\n    author_email=\"googleapis-packages@google.com\",\n    url=\"https://github.com/googleapis/google-api-python-client/\",\n    install_requires=install_requires,\n    python_requires=\">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*\",\n    packages=packages,\n    package_data={},\n    license=\"Apache 2.0\",\n    keywords=\"google api client\",\n    classifiers=[\n        \"Programming Language :: Python :: 2\",\n        \"Programming Language :: Python :: 2.7\",\n        \"Programming Language :: Python :: 3\",\n        \"Programming Language :: Python :: 3.5\",\n        \"Programming Language :: Python :: 3.6\",\n        \"Programming Language :: Python :: 3.7\",\n        \"Development Status :: 5 - Production/Stable\",\n        \"Intended Audience :: Developers\",\n        \"License :: OSI Approved :: Apache Software License\",\n        \"Operating System :: OS Independent\",\n        \"Topic :: Internet :: WWW/HTTP\",\n    ],\n)\n", "path": "setup.py"}]}