Merge pull request #63 from fronzbot/release-0.7.1

v0.7.1

Author: fronzbot

.gitlab-ci.yml

@@ -0,0 +1,25 @@
+image: python
+
+stages:
+    - test
+
+before_script:
+    - curl -O https://bootstrap.pypa.io/get-pip.py
+    - python get-pip.py
+    - pip install tox
+
+python35:
+    image: python:3.5
+    stage: test
+    script: tox -e py35
+           
+python36:
+    image: python:3.6
+    stage: test
+    script: tox -e py36
+
+lint:
+    image: python:3.6
+    stage: test
+    script: tox -e lint
+

.hound.yml

@@ -1,5 +1,6 @@
 python:
   enabled: true
+  ignore_file: setup.py
   ignored_directories:
   - docs
 

.travis.yml

@@ -1,8 +1,6 @@
 matrix:
   fast_finish: true
   include:
-    - python: "3.4.2"
-      env: TOXENV=py34
     - python: "3.6"
       env: TOXENV=lint
     - python: "3.5"
@@ -13,6 +11,8 @@ matrix:
       env: TOXENV=py36
     - python: "3.6"
       env: TOXENV=build
+    - python: "3.7-dev"
+      env: TOXENV=py37
 
 install: pip install -U tox coveralls
 language: python

CHANGES.rst

@@ -3,6 +3,10 @@ Changelog
 
 A list of changes between each release
 
+0.7.1 (2018-05-09)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+- Fixed pip 10 import issue during setup (`@fronzbot <https://github.com/fronzbot/blinkpy/pull/61>`_)
+
 0.7.0 (2018-02-08)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 - Fixed style errors for bumped pydocstring and pylint versions

blinkpy/helpers/constants.py

@@ -4,7 +4,7 @@
 
 MAJOR_VERSION = 0
 MINOR_VERSION = 7
-PATCH_VERSION = 0
+PATCH_VERSION = 1
 
 __version__ = '{}.{}.{}'.format(MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION)
 

setup.py

@@ -1,7 +1,14 @@
 # -*- 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
+#  pip > 10
+try:
+    from pip._internal.req import parse_requirements
+#  pip < 10
+except ImportError:
+    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,