prompt: You will be provided with a partial code base and an issue statement explaining a problem to resolve.
  <issue>
  Move py.test config to tox.ini
  Pytest (like many tools) can read its configuration from `tox.ini`. There is no need to keep a separate `pytest.ini`.
  
  
  </issue>
  <code>
  [start of setup.py]
  1 #! /usr/bin/env python
  2 from setuptools import setup, find_packages
  3 from setuptools.command.test import test as TestCommand
  4 import os
  5 import sys
  6 
  7 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'saleor.settings')
  8 
  9 
  10 class PyTest(TestCommand):
  11     user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]
  12 
  13     def initialize_options(self):
  14         TestCommand.initialize_options(self)
  15         self.pytest_args = []
  16 
  17     def finalize_options(self):
  18         TestCommand.finalize_options(self)
  19         self.test_args = []
  20         self.test_suite = True
  21 
  22     def run_tests(self):
  23         #import here, cause outside the eggs aren't loaded
  24         import pytest
  25         errno = pytest.main(self.pytest_args)
  26         sys.exit(errno)
  27 
  28 
  29 setup(
  30     name='saleor',
  31     author='Mirumee Software',
  32     author_email='hello@mirumee.com',
  33     description="A fork'n'play e-commerce in Django",
  34     license='BSD',
  35     version='0.1.0a0',
  36     url='http://getsaleor.com/',
  37     packages=find_packages(),
  38     include_package_data=True,
  39     install_requires=[
  40         'Babel>=1.3,<1.4a0',
  41         'BabelDjango>=0.2,<0.3a0',
  42         'Django>=1.8',
  43         'dj_database_url>=0.3.0',
  44         'django-emailit>=0.2.2',
  45         'django-materializecss-form==0.0.64',
  46         'django-model-utils>=2.0.0,<2.1a0',
  47         'django-mptt>=0.7.1',
  48         'django-offsite-storage>=0.0.5',
  49         'django-payments>=0.7.0,<0.8a0',
  50         'django-prices>=0.4.0,<0.5a0',
  51         'djangorestframework>=3.1,<3.2a0',
  52         'django-selectable==0.8.0',
  53         'django-versatileimagefield>=1.0.1,<1.1a0',
  54         'fake-factory>=0.3.2',
  55         'google-measurement-protocol>=0.1.2,<0.2a0',
  56         'jsonfield>=1.0.3',
  57         'Markdown>=2.4',
  58         'prices>=0.5,<0.6a0',
  59         'requests>=1.2.0',
  60         'satchless>=1.1.2,<1.2a0',
  61         'unidecode'
  62     ],
  63     extras_require={
  64         'PaaS': [
  65             'whitenoise==1.0.6',
  66             'gunicorn==19.2.1',
  67             'psycopg2==2.6']},
  68     cmdclass={
  69         'test': PyTest},
  70     entry_points={
  71         'console_scripts': ['saleor = saleor:manage']},
  72     tests_require=[
  73         'mock==1.0.1',
  74         'purl>=0.4.1',
  75         'pytest',
  76         'pytest-django'])
  77
  [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
  @@ -70,7 +70,7 @@
       entry_points={
           'console_scripts': ['saleor = saleor:manage']},
       tests_require=[
  -        'mock==1.0.1',
  +        'mock==1.3.0',
           'purl>=0.4.1',
           'pytest',
           'pytest-django'])
  
verification_info: {"golden_diff": "diff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -70,7 +70,7 @@\n     entry_points={\n         'console_scripts': ['saleor = saleor:manage']},\n     tests_require=[\n-        'mock==1.0.1',\n+        'mock==1.3.0',\n         'purl>=0.4.1',\n         'pytest',\n         'pytest-django'])\n", "issue": "Move py.test config to tox.ini\nPytest (like many tools) can read its configuration from `tox.ini`. There is no need to keep a separate `pytest.ini`.\n\n", "before_files": [{"content": "#! /usr/bin/env python\nfrom setuptools import setup, find_packages\nfrom setuptools.command.test import test as TestCommand\nimport os\nimport sys\n\nos.environ.setdefault('DJANGO_SETTINGS_MODULE', 'saleor.settings')\n\n\nclass PyTest(TestCommand):\n    user_options = [('pytest-args=', 'a', \"Arguments to pass to py.test\")]\n\n    def initialize_options(self):\n        TestCommand.initialize_options(self)\n        self.pytest_args = []\n\n    def finalize_options(self):\n        TestCommand.finalize_options(self)\n        self.test_args = []\n        self.test_suite = True\n\n    def run_tests(self):\n        #import here, cause outside the eggs aren't loaded\n        import pytest\n        errno = pytest.main(self.pytest_args)\n        sys.exit(errno)\n\n\nsetup(\n    name='saleor',\n    author='Mirumee Software',\n    author_email='hello@mirumee.com',\n    description=\"A fork'n'play e-commerce in Django\",\n    license='BSD',\n    version='0.1.0a0',\n    url='http://getsaleor.com/',\n    packages=find_packages(),\n    include_package_data=True,\n    install_requires=[\n        'Babel>=1.3,<1.4a0',\n        'BabelDjango>=0.2,<0.3a0',\n        'Django>=1.8',\n        'dj_database_url>=0.3.0',\n        'django-emailit>=0.2.2',\n        'django-materializecss-form==0.0.64',\n        'django-model-utils>=2.0.0,<2.1a0',\n        'django-mptt>=0.7.1',\n        'django-offsite-storage>=0.0.5',\n        'django-payments>=0.7.0,<0.8a0',\n        'django-prices>=0.4.0,<0.5a0',\n        'djangorestframework>=3.1,<3.2a0',\n        'django-selectable==0.8.0',\n        'django-versatileimagefield>=1.0.1,<1.1a0',\n        'fake-factory>=0.3.2',\n        'google-measurement-protocol>=0.1.2,<0.2a0',\n        'jsonfield>=1.0.3',\n        'Markdown>=2.4',\n        'prices>=0.5,<0.6a0',\n        'requests>=1.2.0',\n        'satchless>=1.1.2,<1.2a0',\n        'unidecode'\n    ],\n    extras_require={\n        'PaaS': [\n            'whitenoise==1.0.6',\n            'gunicorn==19.2.1',\n            'psycopg2==2.6']},\n    cmdclass={\n        'test': PyTest},\n    entry_points={\n        'console_scripts': ['saleor = saleor:manage']},\n    tests_require=[\n        'mock==1.0.1',\n        'purl>=0.4.1',\n        'pytest',\n        'pytest-django'])\n", "path": "setup.py"}]}