Merge branch 'master' into feature/device-consolidation

rm-hull · Sep 7, 2018 · ae6f30a · ae6f30a
2 parents 8ebbf74 + 2b5eb8d
commit ae6f30a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,10 @@ ChangeLog
 +------------+---------------------------------------------------------------------+------------+
 | Version    | Description                                                         | Date       |
 +============+=====================================================================+============+
+| **2.5.0**  | * Add support form 128x128 Monochrome OLED (SH1106) (by @Gadgetoid) | 2018/09/07 |
+|            | * Dependency and documentation updates                              |            |
+|            | * Minor packaging changes                                           |            |
++------------+---------------------------------------------------------------------+------------+
 | **2.4.1**  | * Fix bug where SSD1327 init sequence exceeds serial command size   | 2018/05/28 |
 +------------+---------------------------------------------------------------------+------------+
 | **2.4.0**  | * Support for 128x128 4-bit OLED (SSD1327)                          | 2018/04/18 |

diff --git a/luma/oled/__init__.py b/luma/oled/__init__.py
@@ -7,4 +7,4 @@
 and SH1106 devices.
 """
 
-__version__ = '2.4.1'
+__version__ = '2.5.0'
diff --git a/setup.py b/setup.py
@@ -54,10 +54,9 @@ def find_version(*file_paths):
               "spi i2c 256x64 128x64 128x32 96x16"),
     url="https://github.com/rm-hull/luma.oled",
     download_url="https://github.com/rm-hull/luma.oled/tarball/" + version,
-    namespace_packages=["luma"],
-    packages=["luma.oled", "luma.oled.device"],
+    packages=["luma", "luma.oled", "luma.oled.device"],
     zip_safe=False,
-    install_requires=["luma.core>=1.6.0"],
+    install_requires=["luma.core>=1.8.0"],
     setup_requires=pytest_runner,
     tests_require=test_deps,
     extras_require={