Merge branch 'master' into py38

.travis.yml

@@ -22,6 +22,6 @@ addons:
         packages:
             - graphviz
 
-install: pip install --upgrade pip tox setuptools coveralls
+install: pip install --upgrade --ignore-installed setuptools pip tox coveralls
 script: tox -vv
 after_success: if [ "$TOXENV" == "py36" ]; then coveralls; fi

CHANGES.rst

@@ -4,6 +4,8 @@ ChangeLog
 +------------+---------------------------------------------------------------------+------------+
 | Version    | Description                                                         | Date       |
 +============+=====================================================================+============+
+| **1.2.0**  | * Rework namespace handling for luma sub-projects                   | 2019/06/16 |
++------------+---------------------------------------------------------------------+------------+
 | **1.1.0**  | * Added ASCII-block emulator                                        | 2018/02/03 |
 +------------+---------------------------------------------------------------------+------------+
 | **1.0.2**  | * Changed version number to inside ``luma/emulator/__init__.py``    | 2017/11/23 |

README.rst

@@ -56,7 +56,7 @@ License
 -------
 The MIT License (MIT)
 
-Copyright (c) 2017-18 Richard Hull and contributors
+Copyright (c) 2017-2019 Richard Hull and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

doc/index.rst

@@ -6,7 +6,7 @@ Luma.Emulator
 .. image:: https://coveralls.io/repos/github/rm-hull/luma.emulator/badge.svg?branch=master
    :target: https://coveralls.io/github/rm-hull/luma.emulator?branch=master
 
-.. image:: https://img.shields.io/maintenance/yes/2018.svg?maxAge=2592000
+.. image:: https://img.shields.io/maintenance/yes/2019.svg?maxAge=2592000
 
 .. image:: https://img.shields.io/pypi/pyversions/luma.emulator.svg
     :target: https://pypi.python.org/pypi/luma.emulator

doc/install.rst

@@ -10,11 +10,22 @@ Installation
    * ``python-dev`` ⇒ ``python3-dev``,
    * ``python-pip`` ⇒ ``python3-pip``.
 
+System packages
+^^^^^^^^^^^^^^^
+
+Install dependencies for pygame first::
+
+  $ sudo apt install python-dev python-pip build-essential
+  $ sudo apt install libsdl-dev libportmidi-dev libsdl-ttf2.0-dev libsdl-mixer1.2-dev libsdl-image1.2-dev
+
+And upgrade ``pip`` and ``setuptools``::
+
+  $ sudo -H pip install --upgrade --ignore-installed pip setuptools
+
 Installing from PyPi
 ^^^^^^^^^^^^^^^^^^^^
-Install the latest version of the library directly from
+
+Install the latest version of the luma.emulator library directly from
 `PyPI <https://pypi.python.org/pypi?:action=display&name=luma.emulator>`_::
 
-  $ sudo apt install python-dev python-pip build-essential
-  $ sudo apt install libsdl-dev libportmidi-dev libsdl-ttf2.0-dev libsdl-mixer1.2-dev libsdl-image1.2-dev
-  $ sudo pip install --upgrade luma.emulator
+  $ sudo -H pip install --upgrade luma.emulator

luma/__init__.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2017-18 Richard Hull and contributors
+# Copyright (c) 2017-2019 Richard Hull and contributors
 # See LICENSE.rst for details.
 
-from pkgutil import extend_path
-__path__ = extend_path(__path__, __name__)
+try:
+    __import__('pkg_resources').declare_namespace(__name__)
+except ImportError:
+    __path__ = __import__('pkgutil').extend_path(__path__, __name__)

luma/emulator/__init__.py

@@ -2,4 +2,4 @@
 # Copyright (c) 2017-18 Richard Hull and contributors
 # See LICENSE.rst for details.
 
-__version__ = '1.1.0'
+__version__ = '1.2.0'