From 579bd28ed4a3a8191ddcd6506a6381c76eb2a144 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Sun, 7 Oct 2018 11:53:29 +0200 Subject: [PATCH 1/3] travis: add python versions 3.5/3.6/3.7 --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index e0c2b08..74f836e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,15 @@ language: python python: + - "3.6" + - "3.5" - "3.4" - "3.3" - "3.2" - "2.7" +matrix: + include: + - python: 3.7 + dist: xenial install: - python setup.py develop script: From bea02a56bcdbdb0a9b77d245ac87a862e7ddd816 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Sun, 7 Oct 2018 12:07:56 +0200 Subject: [PATCH 2/3] test command line tool --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 74f836e..bfe9b95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,3 +14,4 @@ install: - python setup.py develop script: - python -m unittest discover + - aqi -l From 2c586cbb0e01f4cfed29d0d428b27c0705345d39 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Sun, 7 Oct 2018 12:17:24 +0200 Subject: [PATCH 3/3] make import portable to python3.3+ --- aqi/algos/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/aqi/algos/__init__.py b/aqi/algos/__init__.py index 58f41a2..5be77da 100644 --- a/aqi/algos/__init__.py +++ b/aqi/algos/__init__.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- import pkgutil +import importlib def get_algo(algo_mod): @@ -28,11 +29,11 @@ def list_algos(): _algos = [] algos_pkg = 'aqi.algos' - package = __import__(algos_pkg, fromlist=[algos_pkg]) + package = importlib.import_module(algos_pkg) for importer, modname, ispkg in pkgutil.iter_modules(package.__path__): if ispkg is False and modname != 'base': algo_mod = '.'.join([algos_pkg, modname]) - mod = __import__(algo_mod, fromlist=[algo_mod]) + mod = importlib.import_module(algo_mod) _aqi = mod.AQI() _algos.append((mod.__name__, _aqi.list_pollutants())) return _algos