prompt: You will be provided with a partial code base and an issue statement explaining a problem to resolve.
  <issue>
  cfn-lint is failing because of `pkg_resources.ContextualVersionConflict: (jsonschema 2.6.0)`. 
  *cfn-lint version: (`0.21.6`)*
  
  *Description of issue.*
  cfn-lint(python2) requires jsonschema 2.6.0 but aws-sam-translator which got released today requires jsonschema3.0
  
  https://pypi.org/project/aws-sam-translator/#history
  pkg_resources.ContextualVersionConflict: (jsonschema 2.6.0 (/usr/lib/python2.7/site-packages), Requirement.parse('jsonschema~=3.0'), set(['aws-sam-translator']))
  
  </issue>
  <code>
  [start of setup.py]
  1 """
  2   Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  3 
  4   Permission is hereby granted, free of charge, to any person obtaining a copy of this
  5   software and associated documentation files (the "Software"), to deal in the Software
  6   without restriction, including without limitation the rights to use, copy, modify,
  7   merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
  8   permit persons to whom the Software is furnished to do so.
  9 
  10   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
  11   INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
  12   PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
  13   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
  14   OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  15   SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  16 """
  17 import codecs
  18 import re
  19 from setuptools import find_packages
  20 from setuptools import setup
  21 
  22 
  23 def get_version(filename):
  24     with codecs.open(filename, 'r', 'utf-8') as fp:
  25         contents = fp.read()
  26     return re.search(r"__version__ = ['\"]([^'\"]+)['\"]", contents).group(1)
  27 
  28 
  29 version = get_version('src/cfnlint/version.py')
  30 
  31 
  32 with open('README.md') as f:
  33     readme = f.read()
  34 
  35 setup(
  36     name='cfn-lint',
  37     version=version,
  38     description=('checks cloudformation for practices and behaviour \
  39         that could potentially be improved'),
  40     long_description=readme,
  41     long_description_content_type="text/markdown",
  42     keywords='aws, lint',
  43     author='kddejong',
  44     author_email='kddejong@amazon.com',
  45     url='https://github.com/aws-cloudformation/cfn-python-lint',
  46     package_dir={'': 'src'},
  47     package_data={'cfnlint': [
  48         'data/CloudSpecs/*.json',
  49         'data/AdditionalSpecs/*.json',
  50         'data/Serverless/*.json',
  51         'data/ExtendedSpecs/all/*.json',
  52         'data/ExtendedSpecs/ap-northeast-1/*.json',
  53         'data/ExtendedSpecs/ap-northeast-2/*.json',
  54         'data/ExtendedSpecs/ap-northeast-3/*.json',
  55         'data/ExtendedSpecs/ap-south-1/*.json',
  56         'data/ExtendedSpecs/ap-southeast-1/*.json',
  57         'data/ExtendedSpecs/ap-southeast-2/*.json',
  58         'data/ExtendedSpecs/ca-central-1/*.json',
  59         'data/ExtendedSpecs/eu-central-1/*.json',
  60         'data/ExtendedSpecs/eu-north-1/*.json',
  61         'data/ExtendedSpecs/eu-west-1/*.json',
  62         'data/ExtendedSpecs/eu-west-2/*.json',
  63         'data/ExtendedSpecs/eu-west-3/*.json',
  64         'data/ExtendedSpecs/sa-east-1/*.json',
  65         'data/ExtendedSpecs/us-east-1/*.json',
  66         'data/ExtendedSpecs/us-east-2/*.json',
  67         'data/ExtendedSpecs/us-gov-east-1/*.json',
  68         'data/ExtendedSpecs/us-gov-west-1/*.json',
  69         'data/ExtendedSpecs/us-west-1/*.json',
  70         'data/ExtendedSpecs/us-west-2/*.json',
  71         'data/CfnLintCli/config/schema.json'
  72     ]},
  73     packages=find_packages('src'),
  74     zip_safe=False,
  75     install_requires=[
  76         'pyyaml',
  77         'six~=1.11',
  78         'requests>=2.15.0',
  79         'aws-sam-translator>=1.10.0',
  80         'jsonpatch',
  81         'jsonschema~=2.6',
  82         'pathlib2>=2.3.0;python_version<"3.4"',
  83         'setuptools',
  84     ],
  85     python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
  86     entry_points={
  87         'console_scripts': [
  88             'cfn-lint = cfnlint.__main__:main'
  89         ]
  90     },
  91     license='MIT no attribution',
  92     test_suite="unittest",
  93     classifiers=[
  94         'Development Status :: 5 - Production/Stable',
  95         'Intended Audience :: Developers',
  96         'License :: OSI Approved :: MIT License',
  97         'Natural Language :: English',
  98         'Operating System :: OS Independent',
  99         'Programming Language :: Python :: 2',
  100         'Programming Language :: Python :: 2.7',
  101         'Programming Language :: Python :: 3',
  102         'Programming Language :: Python :: 3.4',
  103         'Programming Language :: Python :: 3.5',
  104         'Programming Language :: Python :: 3.6',
  105         'Programming Language :: Python :: 3.7',
  106     ],
  107 )
  108
  [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
  @@ -78,7 +78,7 @@
           'requests>=2.15.0',
           'aws-sam-translator>=1.10.0',
           'jsonpatch',
  -        'jsonschema~=2.6',
  +        'jsonschema~=3.0',
           'pathlib2>=2.3.0;python_version<"3.4"',
           'setuptools',
       ],
  
verification_info: {"golden_diff": "diff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -78,7 +78,7 @@\n         'requests>=2.15.0',\n         'aws-sam-translator>=1.10.0',\n         'jsonpatch',\n-        'jsonschema~=2.6',\n+        'jsonschema~=3.0',\n         'pathlib2>=2.3.0;python_version<\"3.4\"',\n         'setuptools',\n     ],\n", "issue": "cfn-lint is failing because of `pkg_resources.ContextualVersionConflict: (jsonschema 2.6.0)`. \n*cfn-lint version: (`0.21.6`)*\r\n\r\n*Description of issue.*\r\ncfn-lint(python2) requires jsonschema 2.6.0 but aws-sam-translator which got released today requires jsonschema3.0\r\n\r\nhttps://pypi.org/project/aws-sam-translator/#history\r\npkg_resources.ContextualVersionConflict: (jsonschema 2.6.0 (/usr/lib/python2.7/site-packages), Requirement.parse('jsonschema~=3.0'), set(['aws-sam-translator']))\n", "before_files": [{"content": "\"\"\"\n  Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n\n  Permission is hereby granted, free of charge, to any person obtaining a copy of this\n  software and associated documentation files (the \"Software\"), to deal in the Software\n  without restriction, including without limitation the rights to use, copy, modify,\n  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to\n  permit persons to whom the Software is furnished to do so.\n\n  THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,\n  INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A\n  PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT\n  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\n  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\n  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\"\"\"\nimport codecs\nimport re\nfrom setuptools import find_packages\nfrom setuptools import setup\n\n\ndef get_version(filename):\n    with codecs.open(filename, 'r', 'utf-8') as fp:\n        contents = fp.read()\n    return re.search(r\"__version__ = ['\\\"]([^'\\\"]+)['\\\"]\", contents).group(1)\n\n\nversion = get_version('src/cfnlint/version.py')\n\n\nwith open('README.md') as f:\n    readme = f.read()\n\nsetup(\n    name='cfn-lint',\n    version=version,\n    description=('checks cloudformation for practices and behaviour \\\n        that could potentially be improved'),\n    long_description=readme,\n    long_description_content_type=\"text/markdown\",\n    keywords='aws, lint',\n    author='kddejong',\n    author_email='kddejong@amazon.com',\n    url='https://github.com/aws-cloudformation/cfn-python-lint',\n    package_dir={'': 'src'},\n    package_data={'cfnlint': [\n        'data/CloudSpecs/*.json',\n        'data/AdditionalSpecs/*.json',\n        'data/Serverless/*.json',\n        'data/ExtendedSpecs/all/*.json',\n        'data/ExtendedSpecs/ap-northeast-1/*.json',\n        'data/ExtendedSpecs/ap-northeast-2/*.json',\n        'data/ExtendedSpecs/ap-northeast-3/*.json',\n        'data/ExtendedSpecs/ap-south-1/*.json',\n        'data/ExtendedSpecs/ap-southeast-1/*.json',\n        'data/ExtendedSpecs/ap-southeast-2/*.json',\n        'data/ExtendedSpecs/ca-central-1/*.json',\n        'data/ExtendedSpecs/eu-central-1/*.json',\n        'data/ExtendedSpecs/eu-north-1/*.json',\n        'data/ExtendedSpecs/eu-west-1/*.json',\n        'data/ExtendedSpecs/eu-west-2/*.json',\n        'data/ExtendedSpecs/eu-west-3/*.json',\n        'data/ExtendedSpecs/sa-east-1/*.json',\n        'data/ExtendedSpecs/us-east-1/*.json',\n        'data/ExtendedSpecs/us-east-2/*.json',\n        'data/ExtendedSpecs/us-gov-east-1/*.json',\n        'data/ExtendedSpecs/us-gov-west-1/*.json',\n        'data/ExtendedSpecs/us-west-1/*.json',\n        'data/ExtendedSpecs/us-west-2/*.json',\n        'data/CfnLintCli/config/schema.json'\n    ]},\n    packages=find_packages('src'),\n    zip_safe=False,\n    install_requires=[\n        'pyyaml',\n        'six~=1.11',\n        'requests>=2.15.0',\n        'aws-sam-translator>=1.10.0',\n        'jsonpatch',\n        'jsonschema~=2.6',\n        'pathlib2>=2.3.0;python_version<\"3.4\"',\n        'setuptools',\n    ],\n    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',\n    entry_points={\n        'console_scripts': [\n            'cfn-lint = cfnlint.__main__:main'\n        ]\n    },\n    license='MIT no attribution',\n    test_suite=\"unittest\",\n    classifiers=[\n        'Development Status :: 5 - Production/Stable',\n        'Intended Audience :: Developers',\n        'License :: OSI Approved :: MIT License',\n        'Natural Language :: English',\n        'Operating System :: OS Independent',\n        'Programming Language :: Python :: 2',\n        'Programming Language :: Python :: 2.7',\n        'Programming Language :: Python :: 3',\n        'Programming Language :: Python :: 3.4',\n        'Programming Language :: Python :: 3.5',\n        'Programming Language :: Python :: 3.6',\n        'Programming Language :: Python :: 3.7',\n    ],\n)\n", "path": "setup.py"}]}