From 901cbfc9d1b86f0a2f8c006cc92a711740383f67 Mon Sep 17 00:00:00 2001 From: Kevin Fronczak Date: Wed, 9 May 2018 09:49:41 -0400 Subject: [PATCH 1/4] Fixed import error for pip version 10 --- setup.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 645930b..23dc2e5 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,12 @@ # -*- coding: utf-8 -*- from os.path import abspath, dirname, join from setuptools import setup, find_packages -from pip.req import parse_requirements +# Fixes import error due to breaking change in pip 10 +# https://stackoverflow.com/a/49867265 +try: # pip > 10 + from pip._internal.req import parse_requirements +except ImportError: # pip < 10 + from pip.req import parse_requirements from blinkpy.helpers.constants import ( __version__, PROJECT_PACKAGE_NAME, PROJECT_LICENSE, PROJECT_URL, PROJECT_EMAIL, PROJECT_DESCRIPTION, PROJECT_CLASSIFIERS, PROJECT_AUTHOR, From 24158638efe317fffece9f7facaa4cc62f213da5 Mon Sep 17 00:00:00 2001 From: Kevin Fronczak Date: Wed, 9 May 2018 10:00:13 -0400 Subject: [PATCH 2/4] Fix hound --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 23dc2e5..4be700f 100644 --- a/setup.py +++ b/setup.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- from os.path import abspath, dirname, join from setuptools import setup, find_packages -# Fixes import error due to breaking change in pip 10 -# https://stackoverflow.com/a/49867265 -try: # pip > 10 +# Fixes import error due to breaking change in pip 10 +# https://stackoverflow.com/a/49867265 +try: # pip > 10 from pip._internal.req import parse_requirements -except ImportError: # pip < 10 +except ImportError: # pip < 10 from pip.req import parse_requirements from blinkpy.helpers.constants import ( __version__, PROJECT_PACKAGE_NAME, PROJECT_LICENSE, PROJECT_URL, From 1b53c4a0dda688dc624f85475f03b5a0dfca0b80 Mon Sep 17 00:00:00 2001 From: Kevin Fronczak Date: Wed, 9 May 2018 10:02:58 -0400 Subject: [PATCH 3/4] Hound should ignore setup.py --- .hound.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.hound.yml b/.hound.yml index dfb92e0..d3439b3 100644 --- a/.hound.yml +++ b/.hound.yml @@ -1,5 +1,6 @@ python: enabled: true + ignore_file: setup.py ignored_directories: - docs From 3348386a4c953417bca9cababffd23f8bb80121e Mon Sep 17 00:00:00 2001 From: Kevin Fronczak Date: Wed, 9 May 2018 10:05:03 -0400 Subject: [PATCH 4/4] Style fixes --- setup.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 4be700f..4c68f83 100644 --- a/setup.py +++ b/setup.py @@ -3,9 +3,11 @@ from os.path import abspath, dirname, join from setuptools import setup, find_packages # Fixes import error due to breaking change in pip 10 # https://stackoverflow.com/a/49867265 -try: # pip > 10 +# pip > 10 +try: from pip._internal.req import parse_requirements -except ImportError: # pip < 10 +# pip < 10 +except ImportError: from pip.req import parse_requirements from blinkpy.helpers.constants import ( __version__, PROJECT_PACKAGE_NAME, PROJECT_LICENSE, PROJECT_URL,