From f42442a15bf58bea650e46708617bf7065013b4f Mon Sep 17 00:00:00 2001
From: Kattni Rembor <kattni@adafruit.com>
Date: Mon, 30 Mar 2020 11:59:40 -0400
Subject: [PATCH 1/3] Removing 3.0.0 compatibility.

---
 adafruit_bitmap_font/bdf.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/adafruit_bitmap_font/bdf.py b/adafruit_bitmap_font/bdf.py
index 9360418..263e1bf 100644
--- a/adafruit_bitmap_font/bdf.py
+++ b/adafruit_bitmap_font/bdf.py
@@ -40,11 +40,7 @@
 """
 
 import gc
-
-try:
-    from displayio import Glyph
-except ImportError:
-    from fontio import Glyph
+from displayio import Glyph
 from .glyph_cache import GlyphCache
 
 __version__ = "0.0.0-auto.0"

From 5ab346373b423249f9d49f2e2177aea99e258e17 Mon Sep 17 00:00:00 2001
From: foamyguy <foamyguy@gmail.com>
Date: Wed, 1 Apr 2020 19:04:50 -0500
Subject: [PATCH 2/3] change Glyph import to fontio

---
 adafruit_bitmap_font/bdf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adafruit_bitmap_font/bdf.py b/adafruit_bitmap_font/bdf.py
index 263e1bf..256e239 100644
--- a/adafruit_bitmap_font/bdf.py
+++ b/adafruit_bitmap_font/bdf.py
@@ -40,7 +40,7 @@
 """
 
 import gc
-from displayio import Glyph
+from fontio import Glyph
 from .glyph_cache import GlyphCache
 
 __version__ = "0.0.0-auto.0"

From 97dadca2d1e5f932ea96693f96c557c7a1eb8e30 Mon Sep 17 00:00:00 2001
From: FoamyGuy <foamyguy@gmail.com>
Date: Wed, 1 Apr 2020 20:06:22 -0500
Subject: [PATCH 3/3] update mock imports in docs conf

---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 49a7609..f4d67f9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,7 +21,7 @@
 # Uncomment the below if you use native CircuitPython modules such as
 # digitalio, micropython and busio. List the modules you use. Without it, the
 # autodoc module docs will fail to generate with a warning.
-autodoc_mock_imports = ["displayio"]
+autodoc_mock_imports = ["fontio"]
 
 
 intersphinx_mapping = {