prompt: You will be provided with a partial code base and an issue statement explaining a problem to resolve.
  <issue>
  Bug in the 0.7.0 packaging
  I've tried to upgrade to 0.7.0 and it exploded with a
  
  ```
  $ poetry update
  Updating dependencies
  Resolving dependencies... (1.0s)
  
  
  Package operations: 0 installs, 1 update, 0 removals
  
    - Updating httpx (0.6.8 -> 0.7.0)
  
  [EnvCommandError]
  Command ['/Users/pablo/Library/Caches/pypoetry/virtualenvs/drop-eventsng-1aNj3rOl-py3.7/bin/python', '-m', 'pip', 'install', '--no-deps', '-U', 'httpx==0.7.0'] errored with the following return code 1, and output:
  Collecting httpx==0.7.0
    Using cached https://files.pythonhosted.org/packages/12/b3/fdd6e528a3385e2149ad42cc4e9b54e326d532e3e79a86e7cfdaea45723e/httpx-0.7.0.tar.gz
      ERROR: Command errored out with exit status 1:
       command: /Users/pablo/Library/Caches/pypoetry/virtualenvs/drop-eventsng-1aNj3rOl-py3.7/bin/python -c 'import sys, setuptools, tokenize; sys.argv[0] = '"'"'/private/var/folders/x4/txc7_0pn6zlfb30cs_0sh5mm0000gn/T/pip-install-jq6aut9d/httpx/setup.py'"'"'; __file__='"'"'/private/var/folders/x4/txc7_0pn6zlfb30cs_0sh5mm0000gn/T/pip-install-jq6aut9d/httpx/setup.py'"'"';f=getattr(tokenize, '"'"'open'"'"', open)(__file__);code=f.read().replace('"'"'\r\n'"'"', '"'"'\n'"'"');f.close();exec(compile(code, __file__, '"'"'exec'"'"'))' egg_info --egg-base pip-egg-info
           cwd: /private/var/folders/x4/txc7_0pn6zlfb30cs_0sh5mm0000gn/T/pip-install-jq6aut9d/httpx/
      Complete output (7 lines):
      Traceback (most recent call last):
        File "<string>", line 1, in <module>
        File "/private/var/folders/x4/txc7_0pn6zlfb30cs_0sh5mm0000gn/T/pip-install-jq6aut9d/httpx/setup.py", line 45, in <module>
          long_description=get_long_description(),
        File "/private/var/folders/x4/txc7_0pn6zlfb30cs_0sh5mm0000gn/T/pip-install-jq6aut9d/httpx/setup.py", line 26, in get_long_description
          with open("CHANGELOG.md", encoding="utf8") as f:
      FileNotFoundError: [Errno 2] No such file or directory: 'CHANGELOG.md'
      ----------------------------------------
  ERROR: Command errored out with exit status 1: python setup.py egg_info Check the logs for full command output.
  ```
  
  </issue>
  <code>
  [start of setup.py]
  1 #!/usr/bin/env python
  2 # -*- coding: utf-8 -*-
  3 
  4 import re
  5 from pathlib import Path
  6 
  7 from setuptools import setup
  8 
  9 
  10 def get_version(package):
  11     """
  12     Return package version as listed in `__version__` in `init.py`.
  13     """
  14     version = Path(package, "__version__.py").read_text()
  15     return re.search("__version__ = ['\"]([^'\"]+)['\"]", version).group(1)
  16 
  17 
  18 def get_long_description():
  19     """
  20     Return the README.
  21     """
  22     long_description = ""
  23     with open("README.md", encoding="utf8") as f:
  24         long_description += f.read()
  25     long_description += "\n\n"
  26     with open("CHANGELOG.md", encoding="utf8") as f:
  27         long_description += f.read()
  28     return long_description
  29 
  30 
  31 def get_packages(package):
  32     """
  33     Return root package and all sub-packages.
  34     """
  35     return [str(path.parent) for path in Path(package).glob("**/__init__.py")]
  36 
  37 
  38 setup(
  39     name="httpx",
  40     python_requires=">=3.6",
  41     version=get_version("httpx"),
  42     url="https://github.com/encode/httpx",
  43     license="BSD",
  44     description="The next generation HTTP client.",
  45     long_description=get_long_description(),
  46     long_description_content_type="text/markdown",
  47     author="Tom Christie",
  48     author_email="tom@tomchristie.com",
  49     package_data={"httpx": ["py.typed"]},
  50     packages=get_packages("httpx"),
  51     install_requires=[
  52         "certifi",
  53         "chardet==3.*",
  54         "h11==0.8.*",
  55         "h2==3.*",
  56         "hstspreload",
  57         "idna==2.*",
  58         "rfc3986==1.*",
  59     ],
  60     classifiers=[
  61         "Development Status :: 3 - Alpha",
  62         "Environment :: Web Environment",
  63         "Intended Audience :: Developers",
  64         "License :: OSI Approved :: BSD License",
  65         "Operating System :: OS Independent",
  66         "Topic :: Internet :: WWW/HTTP",
  67         "Programming Language :: Python :: 3",
  68         "Programming Language :: Python :: 3.6",
  69         "Programming Language :: Python :: 3.7",
  70         "Programming Language :: Python :: 3.8",
  71     ],
  72 )
  73
  [end of setup.py]
  [start of httpx/__version__.py]
  1 __title__ = "httpx"
  2 __description__ = "A next generation HTTP client, for Python 3."
  3 __version__ = "0.7.0"
  4
  [end of httpx/__version__.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/httpx/__version__.py b/httpx/__version__.py
  --- a/httpx/__version__.py
  +++ b/httpx/__version__.py
  @@ -1,3 +1,3 @@
   __title__ = "httpx"
   __description__ = "A next generation HTTP client, for Python 3."
  -__version__ = "0.7.0"
  +__version__ = "0.7.1"
  diff --git a/setup.py b/setup.py
  --- a/setup.py
  +++ b/setup.py
  @@ -48,6 +48,7 @@
       author_email="tom@tomchristie.com",
       package_data={"httpx": ["py.typed"]},
       packages=get_packages("httpx"),
  +    include_package_data=True,
       install_requires=[
           "certifi",
           "chardet==3.*",
  
verification_info: {"golden_diff": "diff --git a/httpx/__version__.py b/httpx/__version__.py\n--- a/httpx/__version__.py\n+++ b/httpx/__version__.py\n@@ -1,3 +1,3 @@\n __title__ = \"httpx\"\n __description__ = \"A next generation HTTP client, for Python 3.\"\n-__version__ = \"0.7.0\"\n+__version__ = \"0.7.1\"\ndiff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -48,6 +48,7 @@\n     author_email=\"tom@tomchristie.com\",\n     package_data={\"httpx\": [\"py.typed\"]},\n     packages=get_packages(\"httpx\"),\n+    include_package_data=True,\n     install_requires=[\n         \"certifi\",\n         \"chardet==3.*\",\n", "issue": "Bug in the 0.7.0 packaging\nI've tried to upgrade to 0.7.0 and it exploded with a\r\n\r\n```\r\n$ poetry update\r\nUpdating dependencies\r\nResolving dependencies... (1.0s)\r\n\r\n\r\nPackage operations: 0 installs, 1 update, 0 removals\r\n\r\n  - Updating httpx (0.6.8 -> 0.7.0)\r\n\r\n[EnvCommandError]\r\nCommand ['/Users/pablo/Library/Caches/pypoetry/virtualenvs/drop-eventsng-1aNj3rOl-py3.7/bin/python', '-m', 'pip', 'install', '--no-deps', '-U', 'httpx==0.7.0'] errored with the following return code 1, and output:\r\nCollecting httpx==0.7.0\r\n  Using cached https://files.pythonhosted.org/packages/12/b3/fdd6e528a3385e2149ad42cc4e9b54e326d532e3e79a86e7cfdaea45723e/httpx-0.7.0.tar.gz\r\n    ERROR: Command errored out with exit status 1:\r\n     command: /Users/pablo/Library/Caches/pypoetry/virtualenvs/drop-eventsng-1aNj3rOl-py3.7/bin/python -c 'import sys, setuptools, tokenize; sys.argv[0] = '\"'\"'/private/var/folders/x4/txc7_0pn6zlfb30cs_0sh5mm0000gn/T/pip-install-jq6aut9d/httpx/setup.py'\"'\"'; __file__='\"'\"'/private/var/folders/x4/txc7_0pn6zlfb30cs_0sh5mm0000gn/T/pip-install-jq6aut9d/httpx/setup.py'\"'\"';f=getattr(tokenize, '\"'\"'open'\"'\"', open)(__file__);code=f.read().replace('\"'\"'\\r\\n'\"'\"', '\"'\"'\\n'\"'\"');f.close();exec(compile(code, __file__, '\"'\"'exec'\"'\"'))' egg_info --egg-base pip-egg-info\r\n         cwd: /private/var/folders/x4/txc7_0pn6zlfb30cs_0sh5mm0000gn/T/pip-install-jq6aut9d/httpx/\r\n    Complete output (7 lines):\r\n    Traceback (most recent call last):\r\n      File \"<string>\", line 1, in <module>\r\n      File \"/private/var/folders/x4/txc7_0pn6zlfb30cs_0sh5mm0000gn/T/pip-install-jq6aut9d/httpx/setup.py\", line 45, in <module>\r\n        long_description=get_long_description(),\r\n      File \"/private/var/folders/x4/txc7_0pn6zlfb30cs_0sh5mm0000gn/T/pip-install-jq6aut9d/httpx/setup.py\", line 26, in get_long_description\r\n        with open(\"CHANGELOG.md\", encoding=\"utf8\") as f:\r\n    FileNotFoundError: [Errno 2] No such file or directory: 'CHANGELOG.md'\r\n    ----------------------------------------\r\nERROR: Command errored out with exit status 1: python setup.py egg_info Check the logs for full command output.\r\n```\n", "before_files": [{"content": "#!/usr/bin/env python\n# -*- coding: utf-8 -*-\n\nimport re\nfrom pathlib import Path\n\nfrom setuptools import setup\n\n\ndef get_version(package):\n    \"\"\"\n    Return package version as listed in `__version__` in `init.py`.\n    \"\"\"\n    version = Path(package, \"__version__.py\").read_text()\n    return re.search(\"__version__ = ['\\\"]([^'\\\"]+)['\\\"]\", version).group(1)\n\n\ndef get_long_description():\n    \"\"\"\n    Return the README.\n    \"\"\"\n    long_description = \"\"\n    with open(\"README.md\", encoding=\"utf8\") as f:\n        long_description += f.read()\n    long_description += \"\\n\\n\"\n    with open(\"CHANGELOG.md\", encoding=\"utf8\") as f:\n        long_description += f.read()\n    return long_description\n\n\ndef get_packages(package):\n    \"\"\"\n    Return root package and all sub-packages.\n    \"\"\"\n    return [str(path.parent) for path in Path(package).glob(\"**/__init__.py\")]\n\n\nsetup(\n    name=\"httpx\",\n    python_requires=\">=3.6\",\n    version=get_version(\"httpx\"),\n    url=\"https://github.com/encode/httpx\",\n    license=\"BSD\",\n    description=\"The next generation HTTP client.\",\n    long_description=get_long_description(),\n    long_description_content_type=\"text/markdown\",\n    author=\"Tom Christie\",\n    author_email=\"tom@tomchristie.com\",\n    package_data={\"httpx\": [\"py.typed\"]},\n    packages=get_packages(\"httpx\"),\n    install_requires=[\n        \"certifi\",\n        \"chardet==3.*\",\n        \"h11==0.8.*\",\n        \"h2==3.*\",\n        \"hstspreload\",\n        \"idna==2.*\",\n        \"rfc3986==1.*\",\n    ],\n    classifiers=[\n        \"Development Status :: 3 - Alpha\",\n        \"Environment :: Web Environment\",\n        \"Intended Audience :: Developers\",\n        \"License :: OSI Approved :: BSD License\",\n        \"Operating System :: OS Independent\",\n        \"Topic :: Internet :: WWW/HTTP\",\n        \"Programming Language :: Python :: 3\",\n        \"Programming Language :: Python :: 3.6\",\n        \"Programming Language :: Python :: 3.7\",\n        \"Programming Language :: Python :: 3.8\",\n    ],\n)\n", "path": "setup.py"}, {"content": "__title__ = \"httpx\"\n__description__ = \"A next generation HTTP client, for Python 3.\"\n__version__ = \"0.7.0\"\n", "path": "httpx/__version__.py"}]}