From 14bcb20ff0eddb25bd41386a87bc90c764ab7d56 Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Thu, 4 Jul 2019 21:19:35 +0100 Subject: [PATCH] Packaging fixes from boilerplate --- library/setup.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/library/setup.py b/library/setup.py index b21ce9d..08ebdc5 100755 --- 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. """ -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)) -result = setup( +setup( 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'] ) -- 2.30.2