prompt: You will be provided with a partial code base and an issue statement explaining a problem to resolve.
  <issue>
  Delete setup.cfg
  `setup.cfg` was used to set configuration options for `pytest` in the past, but since `pytest.ini` is now providing that configuration, it seems like `setup.cfg` should be deleted.
  
  </issue>
  <code>
  [start of testinfra/conftest.py]
  1 """
  2 Configuration for TestInfra test suite for SecureDrop.
  3 Handles importing host-specific test vars, so test functions
  4 can be reused across multiple hosts, with varied targets.
  5 
  6 Vars should be placed in `testinfra/vars/<hostname>.yml`.
  7 """
  8 
  9 import os
  10 import yaml
  11 
  12 
  13 target_host = os.environ['SECUREDROP_TESTINFRA_TARGET_HOST']
  14 assert target_host != ""
  15 
  16 
  17 def securedrop_import_testinfra_vars(hostname, with_header=False):
  18     """
  19     Import vars from a YAML file to populate tests with host-specific
  20     values used in checks. For instance, the SecureDrop docroot will
  21     be under /vagrant in development, but /var/www/securedrop in staging.
  22 
  23     Vars must be stored in `testinfra/vars/<hostname>.yml`.
  24     """
  25     filepath = os.path.join(os.path.dirname(__file__), "vars", hostname+".yml")
  26     with open(filepath, 'r') as f:
  27         hostvars = yaml.safe_load(f)
  28     # The directory Travis runs builds in varies by PR, so we cannot hardcode
  29     # it in the YAML testvars. Read it from env var and concatenate.
  30     if hostname.lower() == 'travis':
  31         build_env = os.environ["TRAVIS_BUILD_DIR"]
  32         hostvars['securedrop_code'] = build_env+"/securedrop"
  33 
  34     if with_header:
  35         hostvars = dict(securedrop_test_vars=hostvars)
  36     return hostvars
  37 
  38 
  39 def pytest_namespace():
  40     return securedrop_import_testinfra_vars(target_host, with_header=True)
  41
  [end of testinfra/conftest.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/testinfra/conftest.py b/testinfra/conftest.py
  --- a/testinfra/conftest.py
  +++ b/testinfra/conftest.py
  @@ -25,11 +25,6 @@
       filepath = os.path.join(os.path.dirname(__file__), "vars", hostname+".yml")
       with open(filepath, 'r') as f:
           hostvars = yaml.safe_load(f)
  -    # The directory Travis runs builds in varies by PR, so we cannot hardcode
  -    # it in the YAML testvars. Read it from env var and concatenate.
  -    if hostname.lower() == 'travis':
  -        build_env = os.environ["TRAVIS_BUILD_DIR"]
  -        hostvars['securedrop_code'] = build_env+"/securedrop"
   
       if with_header:
           hostvars = dict(securedrop_test_vars=hostvars)
  
verification_info: {"golden_diff": "diff --git a/testinfra/conftest.py b/testinfra/conftest.py\n--- a/testinfra/conftest.py\n+++ b/testinfra/conftest.py\n@@ -25,11 +25,6 @@\n     filepath = os.path.join(os.path.dirname(__file__), \"vars\", hostname+\".yml\")\n     with open(filepath, 'r') as f:\n         hostvars = yaml.safe_load(f)\n-    # The directory Travis runs builds in varies by PR, so we cannot hardcode\n-    # it in the YAML testvars. Read it from env var and concatenate.\n-    if hostname.lower() == 'travis':\n-        build_env = os.environ[\"TRAVIS_BUILD_DIR\"]\n-        hostvars['securedrop_code'] = build_env+\"/securedrop\"\n \n     if with_header:\n         hostvars = dict(securedrop_test_vars=hostvars)\n", "issue": "Delete setup.cfg\n`setup.cfg` was used to set configuration options for `pytest` in the past, but since `pytest.ini` is now providing that configuration, it seems like `setup.cfg` should be deleted.\n", "before_files": [{"content": "\"\"\"\nConfiguration for TestInfra test suite for SecureDrop.\nHandles importing host-specific test vars, so test functions\ncan be reused across multiple hosts, with varied targets.\n\nVars should be placed in `testinfra/vars/<hostname>.yml`.\n\"\"\"\n\nimport os\nimport yaml\n\n\ntarget_host = os.environ['SECUREDROP_TESTINFRA_TARGET_HOST']\nassert target_host != \"\"\n\n\ndef securedrop_import_testinfra_vars(hostname, with_header=False):\n    \"\"\"\n    Import vars from a YAML file to populate tests with host-specific\n    values used in checks. For instance, the SecureDrop docroot will\n    be under /vagrant in development, but /var/www/securedrop in staging.\n\n    Vars must be stored in `testinfra/vars/<hostname>.yml`.\n    \"\"\"\n    filepath = os.path.join(os.path.dirname(__file__), \"vars\", hostname+\".yml\")\n    with open(filepath, 'r') as f:\n        hostvars = yaml.safe_load(f)\n    # The directory Travis runs builds in varies by PR, so we cannot hardcode\n    # it in the YAML testvars. Read it from env var and concatenate.\n    if hostname.lower() == 'travis':\n        build_env = os.environ[\"TRAVIS_BUILD_DIR\"]\n        hostvars['securedrop_code'] = build_env+\"/securedrop\"\n\n    if with_header:\n        hostvars = dict(securedrop_test_vars=hostvars)\n    return hostvars\n\n\ndef pytest_namespace():\n    return securedrop_import_testinfra_vars(target_host, with_header=True)\n", "path": "testinfra/conftest.py"}]}