Merge pull request #156 from iovation/4.0-DEV

4.0 dev

Author: Brad Porter

.github/workflows/release_integration_tests.yml

@@ -19,7 +19,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip wheel
         python -m pip install --upgrade pipenv
-        pipenv install --three --dev --ignore-pipfile
+        pipenv install --python 3.7 --dev --ignore-pipfile
     - name: Create environment file
       shell: bash
       run: |

.github/workflows/run_integration_tests.yml

@@ -19,7 +19,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip wheel
         python -m pip install --upgrade pipenv
-        pipenv install --three --dev --ignore-pipfile
+        pipenv install --python 3.7 --dev --ignore-pipfile
     - name: Create environment file
       shell: bash
       run: |

.github/workflows/test_python_versions.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9, pypy-3.6]
+        python-version: [3.7, 3.8, 3.9, '3.10', pypy-3.7]
         os: ['ubuntu-latest', 'macos-latest']
       fail-fast: false
     steps:
@@ -24,10 +24,10 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.6
+    - name: Set up Python 3.7
       uses: actions/setup-python@v2
       with:
-        python-version: 3.6
+        python-version: 3.7
     - name: Run Unit Tests
       run: |
         python -m pip install --upgrade pip wheel
@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6]
+        python-version: [3.8] # Should match Pipfile, otherwise `pipenv check` will fail
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
@@ -47,7 +47,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip wheel
         python -m pip install --upgrade pipenv
-        pipenv install --three --dev --ignore-pipfile
+        pipenv install --python 3.8 --dev --ignore-pipfile
     - name: Run Coverage
       run: |
         pipenv run coverage run --source="launchkey" setup.py nosetests

.pylintrc

@@ -1,2 +1,2 @@
 [MASTER]
-disable=useless-object-inheritance,R1725,W0707
+disable=useless-object-inheritance

CHANGES.rst

@@ -1,6 +1,13 @@
 CHANGELOG for LaunchKey Python SDK
 ==================================
 
+4.0.0
+-----
+
+* Removed Python 2 support
+* Removed Python 3.6 support
+* Updated JOSE Transport to include the SDK type, SDK version, and OS version in the User Agent
+
 3.9.1
 -----
 

Makefile

@@ -1,4 +1,6 @@
-ci-py37: ci
+ci-py36: ci
+
+ci-py37: test
 
 ci-py38: test
 

Pipfile

@@ -19,9 +19,9 @@ coverage = "~=4.5.2"
 # Tools for multi-environment testing before sending to CI
 tox = "~=3.8.0"
 behave = "~=1.2.6"
-appium-python-client = "*"
+appium-python-client = ">= 1.3.0, < 2.0.0"
 pyhamcrest = "*"
 pyotp = "*"
 
 [requires]
-python = "~=3.6"
+python_version = "3.8"

Pipfile.lock

@@ -1,7 +1,7 @@
 Python SDK for TruValidate Multifactor Authentication API
 =========================================================
 
-.. image:: https://github.com/iovation/launchkey-python/actions/workflows/test_python_versions.yml/badge.svg
+.. image:: https://github.com/iovation/launchkey-python/actions/workflows/test_python_versions.yml/badge.svg?branch=master
     :target: https://github.com/iovation/launchkey-python/actions/workflows/test_python_versions.yml
 
 .. _docs: https://docs.launchkey.com
@@ -310,7 +310,7 @@ Tests require a number of Python versions. The best way to manage these
 versions is with pyenv_. You will need to register all of the versions with
 pyenv. There are a couple ways to do that. An example of doing it globally is::
 
-    pyenv local 3.7.0 3.8.9 3.9.4 pypy3.5-6.0.0
+    pyenv local 3.6.13 3.7.10 3.8.9 3.9.4 pypy3.7-7.3.3
 
 Install dependencies via Pipenv
 

README.rst

@@ -7,10 +7,9 @@ name = "pypi"
 
 [packages]
 click = "*"
-six = "*"
 launchkey = {path = "./../..", editable = true}
 urllib3 = ">= 1.24.2"  # Ensure CVE-2019-11324 is mitigated
 qrcode = "*"
 
 [requires]
-python_version = "3.7"
+python_version = "3"

examples/cli/Pipfile

@@ -10,4 +10,4 @@ flask-sqlalchemy = "*"
 jinja2 = ">= 2.11.3, < 3.0.0"
 
 [requires]
-python = "==3.6"
+python_version = "3"