V0.9.0 (#122)

- Fixes #64: Duo Web Failing
- Fixes #121: Use a consistent user agent
- Moves to using Black for formatting
- Adds pre-commit hooks
- Adds isort hook
- Adds testing for Python 3.10
- Corrects the supported versions list in setup.py
- Removes remaining Python. 2.x cruft
- Move to f-strings everywhere
- Start preparing for typing
- Improve/update CI

Author: nathan-v

.circleci/config.yml

@@ -8,29 +8,26 @@ dependencies: &dependencies
     pip install -r test_requirements.txt
 
 tests: &tests
-  name: run tests
+  name: Unit tests
   command: |
     . venv/bin/activate
     pytest --cov=aws_okta_keyman -v
     codecov
 
-pycodestyle: &pycodestyle
-    name: pycodestyle
+pycodestyle: &codechecks
+    name: Style and formatting checks
     command: |
       . venv/bin/activate
-      python setup.py pycodestyle
-
-pyflakes: &pyflakes
-    name: pyflakes
-    command: |
-      . venv/bin/activate
-      python setup.py pyflakes
+      pyflakes aws_okta_keyman
+      black --check ./
+      isort --check-only ./
 
 version: 2
 workflows:
   version: 2
   test:
     jobs:
+      - test-3.10
       - test-3.9
       - test-3.8
       - test-3.7
@@ -42,8 +39,7 @@ jobs:
       - checkout
       - run: *dependencies
       - run: *tests
-      - run: *pycodestyle
-      - run: *pyflakes
+      - run: *codechecks
     docker:
       - image: cimg/python:3.6
 
@@ -61,3 +57,8 @@ jobs:
     <<: *3x-template
     docker:
       - image: cimg/python:3.9
+
+  test-3.10:
+    <<: *3x-template
+    docker:
+      - image: cimg/python:3.10

.pre-commit-config.yaml

@@ -0,0 +1,56 @@
+default_language_version:
+    python: python3.8
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.0.1
+    hooks:
+    -   id: check-docstring-first
+    -   id: check-executables-have-shebangs
+    -   id: check-json
+    -   id: check-merge-conflict
+    -   id: check-yaml
+    -   id: debug-statements
+    -   id: end-of-file-fixer
+    -   id: trailing-whitespace
+-   repo: https://gitlab.com/pycqa/flake8
+    rev: 3.9.2
+    hooks:
+    -   id: flake8
+        additional_dependencies:
+        -   flake8-bugbear==20.1.4
+        -   flake8-builtins==1.5.3
+        -   flake8-comprehensions==3.2.3
+        -   flake8-tidy-imports==4.1.0
+        -   flake8-black==0.3.2
+-   repo: https://github.com/pre-commit/mirrors-autopep8
+    rev: v1.5.7
+    hooks:
+    -   id: autopep8
+-   repo: https://github.com/asottile/add-trailing-comma
+    rev: v2.2.1
+    hooks:
+    -   id: add-trailing-comma
+        args: [--py36-plus]
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v2.29.1
+    hooks:
+    -   id: pyupgrade
+        args: [--py38-plus]
+-   repo: https://github.com/pycqa/isort
+    rev: 5.10.1
+    hooks:
+      - id: isort
+-   repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v0.910-1
+    hooks:
+    -   id: mypy
+        additional_dependencies:
+        -   --no-compile
+        -   types-pyyaml==5.4.12
+        -   types-requests==2.27.7
+        -   types-botocore==1.0.1
+        -   types-boto3==1.0.1
+-   repo: https://github.com/pre-commit/pygrep-hooks
+    rev: v1.9.0
+    hooks:
+    -   id: python-use-type-annotations

CONTRIBUTING.md

@@ -23,7 +23,7 @@ is a bug fix please include a regression test as well.
 
 ### Running Tests
 
-The command below will run all of the unit tests for the package with lots of details 
+The command below will run all of the unit tests for the package with lots of details
 and will spit out the current code coverage numbers. Code coverage for this project is
 high and the intent is that it stays that way.
 

README.md

@@ -142,7 +142,7 @@ $ aws_okta_keyman --screen
 ----snip----
 
 14:14:04   (INFO) Assuming role: arn:aws:iam::1234567890:role/Admin
-14:14:04   (INFO) AWS Credentials: 
+14:14:04   (INFO) AWS Credentials:
 
 AWS_ACCESS_KEY_ID = AXXXXXXXXXXXXXXXXXXX
 AWS_SECRET_ACCESS_KEY = xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -162,7 +162,7 @@ key durations from a minimum of 15 minutes (900 seconds) or up to 12 hours (4320
 limits are enforced by AWS and are not a limitation of Keyman.
 
 ### AWS Console Logins
-AWS Console login links can optionally be generated when yo request keys with Keyman. 
+AWS Console login links can optionally be generated when yo request keys with Keyman.
 The console login link will be output on the screen for you to use. Just provide the `--console`
 parameter when running Keyman.
 

SECURITY.md

@@ -4,5 +4,5 @@
 
 AWS Okta Keyman handles authentication and given that there's certainly concerns about security. Given how this project
 has been written and that it runs locally and is user-driven it's highly unlikely that there is going to be a security
-vulnerability in the project that requires private disclosure. In such a case, however, please 
-[contact](https://www.nathanv.com/contact) me directly.
+vulnerability in the project that requires private disclosure. In such a case, however, please
+[contact](https://www.nathanv.com/contact) me directly.

_config.yml

@@ -1 +1 @@
-theme: jekyll-theme-hacker
+theme: jekyll-theme-hacker

aws_okta_keyman/__init__.py

@@ -11,5 +11,5 @@
 # limitations under the License.
 #
 # Copyright 2018 Nextdoor.com, Inc
-# Copyright 2018 Nathan V
+# Copyright 2022 Nathan V
 """Empty init."""

aws_okta_keyman/__main__.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -13,11 +12,8 @@
 # limitations under the License.
 #
 # Copyright 2018 Nextdoor.com, Inc
-# Copyright 2018 Nathan V
+# Copyright 2022 Nathan V
 """Main function that passes off to the Keyman module."""
-
-from __future__ import unicode_literals
-
 import logging
 import sys
 
@@ -31,15 +27,13 @@ def entry_point():
     logger = logging.getLogger()
     logger.setLevel(logging.INFO)
     handler = colorlog.StreamHandler()
-    fmt = (
-        '%(asctime)-8s (%(bold)s%(log_color)s%(levelname)s%(reset)s) '
-        '%(message)s')
-    formatter = colorlog.ColoredFormatter(fmt, datefmt='%H:%M:%S')
+    fmt = "%(asctime)-8s (%(bold)s%(log_color)s%(levelname)s%(reset)s) " "%(message)s"
+    formatter = colorlog.ColoredFormatter(fmt, datefmt="%H:%M:%S")
     handler.setFormatter(formatter)
     logger.addHandler(handler)
     keyman = Keyman(sys.argv)
     raise SystemExit(keyman.main())
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     entry_point()