Merge pull request #233 from fronzbot/pip-downgrade-workflows

Fix setup.py use of internal pip structure

.github/workflows/tests.yml

@@ -24,8 +24,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        pip install pip==20.0.2 # Due to ParsedRequirements error
-        # python -m pip install --upgrade pip
+        python -m pip install --upgrade pip
         pip install -r requirements.txt
         pip install -r requirements_test.txt
         pip install tox

requirements.txt

@@ -1,4 +1,4 @@
 python-dateutil~=2.8.0
-requests==2.22.0
+requests~=2.22.0
 python-slugify~=3.0.2
 testtools==2.3.0

setup.py

@@ -1,48 +1,41 @@
+"""Setup file for blinkpy."""
 # -*- coding: utf-8 -*-
-from os.path import abspath, dirname, join
+from os.path import abspath, dirname
 from setuptools import setup, find_packages
-#  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,
 )
 
-this_dir = abspath(dirname(__file__))
+PROJECT_VERSION = __version__
 
-install_reqs = parse_requirements('{}/requirements.txt'.format(this_dir), session=False)
-test_reqs = parse_requirements('{}/requirements_test.txt'.format(this_dir), session=False)
-REQUIRES = [str(ir.req) for ir in install_reqs]
-TEST_REQUIRES = [str(ir.req) for ir in test_reqs]
+THIS_DIR = abspath(dirname(__file__))
+
+REQUIRES = [
+    "python-dateutil~=2.8.0",
+    "requests~=2.22.0",
+    "python-slugify~=3.0.2",
+]
 
 PACKAGES = find_packages(exclude=['tests*', 'docs'])
 
-with open('{}/README.rst'.format(this_dir), encoding='utf-8') as readme_file:
-    long_description = readme_file.read()
-
-name = PROJECT_PACKAGE_NAME
-version = __version__
+with open('{}/README.rst'.format(THIS_DIR), encoding='utf-8') as readme_file:
+    LONG_DESCRIPTION = readme_file.read()
 
 setup(
-    name = PROJECT_PACKAGE_NAME,
-    version = __version__,
-    description = PROJECT_DESCRIPTION,
-    long_description = long_description,
-    author = PROJECT_AUTHOR,
-    author_email = PROJECT_EMAIL,
-    license = PROJECT_LICENSE,
-    url = PROJECT_URL,
-    platforms = 'any',
-    py_modules = ['blinkpy'],
+    name=PROJECT_PACKAGE_NAME,
+    version=PROJECT_VERSION,
+    description=PROJECT_DESCRIPTION,
+    long_description=LONG_DESCRIPTION,
+    author=PROJECT_AUTHOR,
+    author_email=PROJECT_EMAIL,
+    license=PROJECT_LICENSE,
+    url=PROJECT_URL,
+    platforms='any',
+    py_modules=['blinkpy'],
     packages=PACKAGES,
-    include_package_data = True,
-    install_requires = REQUIRES,
-    test_suite = 'tests',
-    classifiers = PROJECT_CLASSIFIERS
+    include_package_data=True,
+    install_requires=REQUIRES,
+    test_suite='tests',
+    classifiers=PROJECT_CLASSIFIERS
 )