Deprecate Python version<3.6 (#52)

Co-authored-by: Yaroslav Kudrin <Iaroslav_Kudrin@epam.com>

.github/workflows/codeql-analysis.yml

@@ -9,6 +9,7 @@ on:
     branches:
       - main
       - master
+      - feature/2.0.0
     paths-ignore:
       - '**.md'
       - '**.rst'

.github/workflows/release.yml

@@ -10,6 +10,7 @@ on:
     branches:
       - master
       - main
+      - feature/2.0.0
 
 jobs:
   testpypipublish:
@@ -28,7 +29,7 @@ jobs:
         pip install setuptools wheel twine
     - name: Build
       run: |
-        python setup.py sdist bdist_wheel --universal
+        python setup.py sdist bdist_wheel
         twine check dist/*
       env:
         DEVBUILD: 1
@@ -55,7 +56,7 @@ jobs:
         pip install setuptools wheel twine
     - name: Build
       run: |
-        python setup.py sdist bdist_wheel --universal
+        python setup.py sdist bdist_wheel
         twine check dist/*
     - name: Publish distribution package to PyPI
       if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')

.github/workflows/test.yml

@@ -8,6 +8,7 @@ on:
     branches:
       - master
       - main
+      - feature/2.0.0
 
 jobs:
   lint:
@@ -34,7 +35,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8]
     steps:
     - name: Checkout
       uses: actions/checkout@v2

.github/workflows/woke.yml

@@ -8,6 +8,7 @@ on:
     branches:
       - main
       - master
+      - feature/2.0.0
 
 jobs:
   woke:

README.rst

@@ -6,7 +6,7 @@ Generate temporary AWS credentials via Okta.
 .. image:: https://github.com/dowjones/tokendito/workflows/Lint%20and%20Test/badge.svg
     :target: https://github.com/dowjones/tokendito/actions
 
-.. image:: https://img.shields.io/badge/python-2.7%2C%203.5%2C%203.6%2C%203.7%2C%203.8-blueviolet
+.. image:: https://img.shields.io/badge/python-3.6%2C%203.7%2C%203.8-blueviolet
     :target: https://pypi.org/project/tokendito/
 
 .. image:: https://github.com/dowjones/tokendito/workflows/Woke/badge.svg
@@ -27,8 +27,6 @@ Generate temporary AWS credentials via Okta.
 .. image:: https://raw.githubusercontent.com/dowjones/tokendito/master/docs/tokendito-scaled.gif
 
 
-**WARNING: Python2.7 and Python3.5 support will be dropped in a near time, pin tokendito version to current if you want to keep it working in automation.**
-
 NOTE: Advanced users may shorten the tokendito interaction to a `single command <https://github.com/dowjones/tokendito/tree/master/docs#single-command-usage>`_.
 
 .. _STS: https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp.html
@@ -38,10 +36,10 @@ Use tokendito to generate temporary AWS credentials via Okta for programmatic au
 Requirements
 ------------
 
-* Python 2.7.10+
+* Python 3.6+
 * Your AWS account is federated in Okta
 
-tokendito is compatible with both python 2 and 3, and can be installed with either pip or pip3.
+tokendito is compatible with python 3, and can be installed with either pip or pip3.
 
 Getting started
 ---------------

requirements-dev.txt

@@ -1,9 +1,9 @@
 -r ./requirements.txt
-black==20.8b1; python_version >= '3.6'
+black==20.8b1
 coveragepy-lcov; python_version >= '3.8'
 docutils<0.16,>=0.10
 flake8
-flake8-black; python_version >= '3.6'
+flake8-black
 flake8-colors
 flake8-docstrings
 flake8-import-order>=0.9

requirements.txt

@@ -1,10 +1,7 @@
 boto3>=1.9.0
 requests>=2.19.0
 configparser>=3.5.0
-future>=0.16.0
 pyOpenSSL>=18.0.0
-cryptography==3.3.2; python_version == '2.7'
 beautifulsoup4>=4.6.0
 lxml>=4.3.0
-pytz==2021.1
 tzlocal==2.1

setup.py

@@ -45,17 +45,13 @@
         "Intended Audience :: End Users/Desktop",
         "Intended Audience :: Developers",
         "Intended Audience :: System Administrators",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
     ],
     keywords=["okta", "aws", "sts"],
     packages=find_packages(exclude=["contrib", "docs", "tests", ".tox"]),
-    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*",
+    python_requires=">=3.6",
     license=about["__license__"],
     zip_safe=False,
     install_requires=[required],

tests/conftest.py

@@ -1,11 +1,6 @@
 # vim: set filetype=python ts=4 sw=4
 # -*- coding: utf-8 -*-
 """pytest configuration, hooks, and global fixtures."""
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-from future import standard_library
-
-standard_library.install_aliases()
 
 
 def pytest_addoption(parser):

tests/functional_test.py

@@ -1,42 +1,16 @@
 # vim: set filetype=python ts=4 sw=4
 # -*- coding: utf-8 -*-
 """Functional tests, and local fixtures."""
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-from builtins import (  # noqa: F401
-    ascii,
-    bytes,
-    chr,
-    dict,
-    filter,
-    hex,
-    input,
-    int,
-    list,
-    map,
-    next,
-    object,
-    oct,
-    open,
-    pow,
-    range,
-    round,
-    str,
-    super,
-    zip,
-)
 import datetime
 from os import environ, path
 import re
 import subprocess
 import sys
 import time
 
-from future import standard_library
 import pytest
 
 sys.path.insert(0, path.dirname(path.dirname(path.abspath(__file__))))
-standard_library.install_aliases()
 
 
 def string_decode(bytestring):
@@ -155,10 +129,6 @@ def test_version(package_version, package_regex, runnable):
     assert package_version == local_version
 
 
-@pytest.mark.skipif(
-    sys.version_info[:2] < (3, 5),
-    reason="PyOTP Not supported in Python 2.x",
-)
 @pytest.mark.run("second-to-last")
 def test_generate_credentials(custom_args):
     """Run the tool and generate credentials."""
@@ -202,17 +172,17 @@ def test_generate_credentials(custom_args):
     # Rebuild argument list
     args = [
         "--role-arn",
-        "{}".format(settings.role_arn),
+        f"{settings.role_arn}",
         "--okta-aws-app-url",
-        "{}".format(settings.okta_aws_app_url),
+        f"{settings.okta_aws_app_url}",
         "--mfa-method",
-        "{}".format(settings.mfa_method),
+        f"{settings.mfa_method}",
         "--mfa-response",
-        "{}".format(settings.mfa_response),
+        f"{settings.mfa_response}",
         "--username",
-        "{}".format(settings.okta_username),
+        f"{settings.okta_username}",
         "--password",
-        "{}".format(settings.okta_password),
+        f"{settings.okta_password}",
     ]
     # run as a local module, as we can't guarantee that the binary is installed.
     executable = [sys.executable, "-m", "tokendito"]