Fix launch bug in all-in-one-no-pm.py

[EVA-2020-02-2.git] / library / setup.py

diff --git a/library/setup.py b/library/setup.py
index b21ce9d096d1de81b1997730cdc53626b7c16324..784db513528fe9ccdd1b1b866b98e62bc1e12e1c 100755 (executable)
--- a/library/setup.py
+++ b/library/setup.py
@@ -22,14 +22,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 """
 
 SOFTWARE.
 """
 

-from setuptools import setup, __version__, version
+from setuptools import setup, __version__
+from pkg_resources import parse_version

 
 

-minimum_version = version.pkg_resources.parse_version('30.4.0')
+minimum_version = parse_version('30.4.0')

 
 

-if version.pkg_resources.parse_version(__version__) < minimum_version:
+if parse_version(__version__) < minimum_version:

     raise RuntimeError("Package setuptools must be at least version {}".format(minimum_version))
 
     raise RuntimeError("Package setuptools must be at least version {}".format(minimum_version))
 

-result = setup(
+setup(

     packages=['enviroplus'],
     packages=['enviroplus'],

-    install_requires=['setuptools>='.format(minimum_version), 'pimoroni-bme280', 'pms5003', 'ltr559', 'st7735', 'ads1015']
+    install_requires=['setuptools>={}'.format(minimum_version), 'pimoroni-bme280', 'pms5003', 'ltr559', 'st7735', 'ads1015', 'fonts', 'font-roboto', 'astral', 'pytz']

 )
 )