prompt: You will be provided with a partial code base and an issue statement explaining a problem to resolve.
  <issue>
  inconsistent channel ordering
  
  ### Observed behavior
  
  In 'Recommended', channel order is based on order of import:'
  
  ![image](https://user-images.githubusercontent.com/2367265/35355527-66d57dd6-0102-11e8-82ec-74e93859d2de.png)
  
  In 'Channels', order is not the same:
  
  ![image](https://user-images.githubusercontent.com/2367265/35355543-76f21d46-0102-11e8-8206-3376acf08f93.png)
  
  
  ### Expected behavior
  
  In the 'Channels' sub-section, order should be based on order of import.
  
  ### User-facing consequences
  
  Administrators are not able to control the order that channels appear in on that page.
  
  ### Context
  
  Desired for one VF deployment.
  
  @rtibbles would you mind linking to the change you made to update the 'Recommended' page?
  
  
  
  
  </issue>
  <code>
  [start of kolibri/__init__.py]
  1 from __future__ import absolute_import, print_function, unicode_literals
  2 
  3 # NB! This is not necessarily the version scheme we want, however having a good
  4 # tracking of releases once we start doing lots of pre-releases is essential.
  5 from .utils.version import get_version
  6 
  7 #: This may not be the exact version as it's subject to modification with
  8 #: get_version() - use ``kolibri.__version__`` for the exact version string.
  9 VERSION = (0, 6, 1, 'final', 0)
  10 
  11 __author__ = 'Learning Equality'
  12 __email__ = 'info@learningequality.org'
  13 __version__ = str(get_version(VERSION))
  14
  [end of kolibri/__init__.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/kolibri/__init__.py b/kolibri/__init__.py
  --- a/kolibri/__init__.py
  +++ b/kolibri/__init__.py
  @@ -6,7 +6,7 @@
   
   #: This may not be the exact version as it's subject to modification with
   #: get_version() - use ``kolibri.__version__`` for the exact version string.
  -VERSION = (0, 6, 1, 'final', 0)
  +VERSION = (0, 6, 2, 'final', 0)
   
   __author__ = 'Learning Equality'
   __email__ = 'info@learningequality.org'
  
verification_info: {"golden_diff": "diff --git a/kolibri/__init__.py b/kolibri/__init__.py\n--- a/kolibri/__init__.py\n+++ b/kolibri/__init__.py\n@@ -6,7 +6,7 @@\n \n #: This may not be the exact version as it's subject to modification with\n #: get_version() - use ``kolibri.__version__`` for the exact version string.\n-VERSION = (0, 6, 1, 'final', 0)\n+VERSION = (0, 6, 2, 'final', 0)\n \n __author__ = 'Learning Equality'\n __email__ = 'info@learningequality.org'\n", "issue": "inconsistent channel ordering\n\r\n### Observed behavior\r\n\r\nIn 'Recommended', channel order is based on order of import:'\r\n\r\n![image](https://user-images.githubusercontent.com/2367265/35355527-66d57dd6-0102-11e8-82ec-74e93859d2de.png)\r\n\r\nIn 'Channels', order is not the same:\r\n\r\n![image](https://user-images.githubusercontent.com/2367265/35355543-76f21d46-0102-11e8-8206-3376acf08f93.png)\r\n\r\n\r\n### Expected behavior\r\n\r\nIn the 'Channels' sub-section, order should be based on order of import.\r\n\r\n### User-facing consequences\r\n\r\nAdministrators are not able to control the order that channels appear in on that page.\r\n\r\n### Context\r\n\r\nDesired for one VF deployment.\r\n\r\n@rtibbles would you mind linking to the change you made to update the 'Recommended' page?\r\n\r\n\r\n\n", "before_files": [{"content": "from __future__ import absolute_import, print_function, unicode_literals\n\n# NB! This is not necessarily the version scheme we want, however having a good\n# tracking of releases once we start doing lots of pre-releases is essential.\nfrom .utils.version import get_version\n\n#: This may not be the exact version as it's subject to modification with\n#: get_version() - use ``kolibri.__version__`` for the exact version string.\nVERSION = (0, 6, 1, 'final', 0)\n\n__author__ = 'Learning Equality'\n__email__ = 'info@learningequality.org'\n__version__ = str(get_version(VERSION))\n", "path": "kolibri/__init__.py"}]}