prompt: You will be provided with a partial code base and an issue statement explaining a problem to resolve.
  <issue>
  Version Scheme Change
  We've talked on and off for quite a few years about our versioning scheme for `cryptography`, but #5771 made it very clear that despite our [versioning documentation](https://cryptography.io/en/latest/api-stability.html#versioning) some users still assume it's [SemVer](https://semver.org) and are caught off guard by changes. I propose that we **switch to a [CalVer](https://calver.org) scheme** for the thirty fifth feature release (which we currently would call 3.5). This has the advantage of being unambiguously not semantic versioning but encoding some vaguely useful information (the year of release) in it.
  
  ### Alternate Choices
  **Stay the course**
  We've successfully used our versioning scheme for a bit over 7 years now and the probability of another monumental shift like this is low. There is, however, a constant (but low) background radiation of people who are tripped up by making assumptions about our versioning so I would argue against this choice.
  
  **SemVer**
  Switch to using an actual semantic versioning scheme. Without re-litigating years of conversations, I don't believe either @alex or myself are interested in this option. (See https://github.com/pyca/cryptography/issues/5801#issuecomment-776067787 for a bit of elaboration on our position)
  
  **Firefox/Chrome Versioning**
  (From @alex)
  "Its merits are that it's technically semver compatible, it's fairly predictable, and it communicates at least a little info on the relative age of the project.
  
  Its demerits are that it probably won't solve the real problem here, which was that folks were surprised a major change happened at all."
  
  </issue>
  <code>
  [start of src/cryptography/__about__.py]
  1 # This file is dual licensed under the terms of the Apache License, Version
  2 # 2.0, and the BSD License. See the LICENSE file in the root of this repository
  3 # for complete details.
  4 
  5 
  6 __all__ = [
  7     "__title__",
  8     "__summary__",
  9     "__uri__",
  10     "__version__",
  11     "__author__",
  12     "__email__",
  13     "__license__",
  14     "__copyright__",
  15 ]
  16 
  17 __title__ = "cryptography"
  18 __summary__ = (
  19     "cryptography is a package which provides cryptographic recipes"
  20     " and primitives to Python developers."
  21 )
  22 __uri__ = "https://github.com/pyca/cryptography"
  23 
  24 __version__ = "3.5.dev1"
  25 
  26 __author__ = "The Python Cryptographic Authority and individual contributors"
  27 __email__ = "cryptography-dev@python.org"
  28 
  29 __license__ = "BSD or Apache License, Version 2.0"
  30 __copyright__ = "Copyright 2013-2021 {}".format(__author__)
  31
  [end of src/cryptography/__about__.py]
  [start of vectors/cryptography_vectors/__about__.py]
  1 # This file is dual licensed under the terms of the Apache License, Version
  2 # 2.0, and the BSD License. See the LICENSE file in the root of this repository
  3 # for complete details.
  4 
  5 __all__ = [
  6     "__title__",
  7     "__summary__",
  8     "__uri__",
  9     "__version__",
  10     "__author__",
  11     "__email__",
  12     "__license__",
  13     "__copyright__",
  14 ]
  15 
  16 __title__ = "cryptography_vectors"
  17 __summary__ = "Test vectors for the cryptography package."
  18 
  19 __uri__ = "https://github.com/pyca/cryptography"
  20 
  21 __version__ = "3.5.dev1"
  22 
  23 __author__ = "The Python Cryptographic Authority and individual contributors"
  24 __email__ = "cryptography-dev@python.org"
  25 
  26 __license__ = "BSD or Apache License, Version 2.0"
  27 __copyright__ = "Copyright 2013-2021 %s" % __author__
  28
  [end of vectors/cryptography_vectors/__about__.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/src/cryptography/__about__.py b/src/cryptography/__about__.py
  --- a/src/cryptography/__about__.py
  +++ b/src/cryptography/__about__.py
  @@ -21,7 +21,7 @@
   )
   __uri__ = "https://github.com/pyca/cryptography"
   
  -__version__ = "3.5.dev1"
  +__version__ = "35.0.0.dev1"
   
   __author__ = "The Python Cryptographic Authority and individual contributors"
   __email__ = "cryptography-dev@python.org"
  diff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py
  --- a/vectors/cryptography_vectors/__about__.py
  +++ b/vectors/cryptography_vectors/__about__.py
  @@ -18,7 +18,7 @@
   
   __uri__ = "https://github.com/pyca/cryptography"
   
  -__version__ = "3.5.dev1"
  +__version__ = "35.0.0.dev1"
   
   __author__ = "The Python Cryptographic Authority and individual contributors"
   __email__ = "cryptography-dev@python.org"
  
verification_info: {"golden_diff": "diff --git a/src/cryptography/__about__.py b/src/cryptography/__about__.py\n--- a/src/cryptography/__about__.py\n+++ b/src/cryptography/__about__.py\n@@ -21,7 +21,7 @@\n )\n __uri__ = \"https://github.com/pyca/cryptography\"\n \n-__version__ = \"3.5.dev1\"\n+__version__ = \"35.0.0.dev1\"\n \n __author__ = \"The Python Cryptographic Authority and individual contributors\"\n __email__ = \"cryptography-dev@python.org\"\ndiff --git a/vectors/cryptography_vectors/__about__.py b/vectors/cryptography_vectors/__about__.py\n--- a/vectors/cryptography_vectors/__about__.py\n+++ b/vectors/cryptography_vectors/__about__.py\n@@ -18,7 +18,7 @@\n \n __uri__ = \"https://github.com/pyca/cryptography\"\n \n-__version__ = \"3.5.dev1\"\n+__version__ = \"35.0.0.dev1\"\n \n __author__ = \"The Python Cryptographic Authority and individual contributors\"\n __email__ = \"cryptography-dev@python.org\"\n", "issue": "Version Scheme Change\nWe've talked on and off for quite a few years about our versioning scheme for `cryptography`, but #5771 made it very clear that despite our [versioning documentation](https://cryptography.io/en/latest/api-stability.html#versioning) some users still assume it's [SemVer](https://semver.org) and are caught off guard by changes. I propose that we **switch to a [CalVer](https://calver.org) scheme** for the thirty fifth feature release (which we currently would call 3.5). This has the advantage of being unambiguously not semantic versioning but encoding some vaguely useful information (the year of release) in it.\r\n\r\n### Alternate Choices\r\n**Stay the course**\r\nWe've successfully used our versioning scheme for a bit over 7 years now and the probability of another monumental shift like this is low. There is, however, a constant (but low) background radiation of people who are tripped up by making assumptions about our versioning so I would argue against this choice.\r\n\r\n**SemVer**\r\nSwitch to using an actual semantic versioning scheme. Without re-litigating years of conversations, I don't believe either @alex or myself are interested in this option. (See https://github.com/pyca/cryptography/issues/5801#issuecomment-776067787 for a bit of elaboration on our position)\r\n\r\n**Firefox/Chrome Versioning**\r\n(From @alex)\r\n\"Its merits are that it's technically semver compatible, it's fairly predictable, and it communicates at least a little info on the relative age of the project.\r\n\r\nIts demerits are that it probably won't solve the real problem here, which was that folks were surprised a major change happened at all.\"\n", "before_files": [{"content": "# This file is dual licensed under the terms of the Apache License, Version\n# 2.0, and the BSD License. See the LICENSE file in the root of this repository\n# for complete details.\n\n\n__all__ = [\n    \"__title__\",\n    \"__summary__\",\n    \"__uri__\",\n    \"__version__\",\n    \"__author__\",\n    \"__email__\",\n    \"__license__\",\n    \"__copyright__\",\n]\n\n__title__ = \"cryptography\"\n__summary__ = (\n    \"cryptography is a package which provides cryptographic recipes\"\n    \" and primitives to Python developers.\"\n)\n__uri__ = \"https://github.com/pyca/cryptography\"\n\n__version__ = \"3.5.dev1\"\n\n__author__ = \"The Python Cryptographic Authority and individual contributors\"\n__email__ = \"cryptography-dev@python.org\"\n\n__license__ = \"BSD or Apache License, Version 2.0\"\n__copyright__ = \"Copyright 2013-2021 {}\".format(__author__)\n", "path": "src/cryptography/__about__.py"}, {"content": "# This file is dual licensed under the terms of the Apache License, Version\n# 2.0, and the BSD License. See the LICENSE file in the root of this repository\n# for complete details.\n\n__all__ = [\n    \"__title__\",\n    \"__summary__\",\n    \"__uri__\",\n    \"__version__\",\n    \"__author__\",\n    \"__email__\",\n    \"__license__\",\n    \"__copyright__\",\n]\n\n__title__ = \"cryptography_vectors\"\n__summary__ = \"Test vectors for the cryptography package.\"\n\n__uri__ = \"https://github.com/pyca/cryptography\"\n\n__version__ = \"3.5.dev1\"\n\n__author__ = \"The Python Cryptographic Authority and individual contributors\"\n__email__ = \"cryptography-dev@python.org\"\n\n__license__ = \"BSD or Apache License, Version 2.0\"\n__copyright__ = \"Copyright 2013-2021 %s\" % __author__\n", "path": "vectors/cryptography_vectors/__about__.py"}]}