Use lru-dict, if it is available (#16)

* Use lru-dict, if it is available

* Use github actions rather than travis

* Ensure build directory exists

* Lock python 3 version to 3.6

* Upgrade boto3

* Test all of python3

* Upgrade coverage

Author: Ryan Lane

.github/workflows/pull_request.yml

@@ -0,0 +1,31 @@
+on: pull_request
+jobs:
+  pre-commit:
+    runs-on: ubuntu-18.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+      - name: Setup python 3.6
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.6
+      - name: Install pre-commit
+        run: pip install pre-commit
+      - name: Run pre-commit
+        run: pre-commit run --all-files
+  test:
+    runs-on: ubuntu-18.04
+    strategy:
+      matrix:
+        python-version: ['2.x', '3.6.x', '3.7.x', '3.8.x']
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+      - name: Setup python ${{ matrix.python-version }}
+        uses: actions/setup-python@v1
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: pip install -r requirements.txt
+      - name: Run tests
+        run: make test

.github/workflows/push.yml

@@ -0,0 +1,28 @@
+name: Build and Deploy
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - '*'
+jobs:
+  build-and-publish-python-module:
+    name: Build and publish python module to pypi
+    runs-on: ubuntu-18.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+      - name: Setup python 3.6
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.6
+      - name: Add wheel dependency
+        run: pip install wheel
+      - name: Generate dist
+        run: python setup.py sdist bdist_wheel
+      - name: Publish to PyPI
+        if: startsWith(github.event.ref, 'refs/tags')
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+          user: __token__
+          password: ${{ secrets.pypi_password }}

.gitignore

@@ -44,6 +44,7 @@ nosetests.xml
 coverage.xml
 *,cover
 .hypothesis/
+.mypy_cache
 
 # Translations
 *.mo

.pre-commit-config.yaml

@@ -0,0 +1,6 @@
+exclude: '^docs/.*$'
+repos:
+-   repo: https://gitlab.com/pycqa/flake8
+    rev: 3.7.9
+    hooks:
+    -   id: flake8

.travis.yml

@@ -1,3 +1,7 @@
+## 0.6.0
+
+* kmsauth will use lru-dict library for its token cache, rather than a slower pure-python implementation, if lru-dict is available.
+
 ## 0.5.0
 
 * KMSTokenValidator now accepts a ``stats`` argument, which allows you to pass in an instance of a statsd client, so that the validator can track stats.

CHANGELOG.md

@@ -1,11 +1,8 @@
 # bash needed for pipefail
 SHELL := /bin/bash
 
-test: test_lint test_unit
-
-test_lint:
-	mkdir -p build
-	set -o pipefail; flake8 | sed "s#^\./##" > build/flake8.txt || (cat build/flake8.txt && exit 1)
+test: test_unit
 
 test_unit:
+	mkdir -p build
 	nosetests --with-coverage tests/unit

Makefile

@@ -11,7 +11,12 @@
                                  EndpointConnectionError)
 
 import kmsauth.services
-from kmsauth.utils import lru
+# Try to import the more efficient lru-dict, and fallback to slower pure-python
+# lru dict implementation if it's not available.
+try:
+    from lru import LRU
+except ImportError:
+    from kmsauth.utils.lru import LRUCache as LRU
 
 TOKEN_SKEW = 3
 TIME_FORMAT = "%Y%m%dT%H%M%SZ"
@@ -114,7 +119,7 @@ def __init__(
             self.extra_context = {}
         else:
             self.extra_context = extra_context
-        self.TOKENS = lru.LRUCache(token_cache_size)
+        self.TOKENS = LRU(token_cache_size)
         self.KEY_METADATA = {}
         self.stats = stats
         self._validate()

kmsauth/__init__.py

@@ -2,7 +2,7 @@
 # for Python.
 # License: Apache2
 # Use: For KMS
-boto3==1.2.3
+boto3==1.11.9
 
 # The modular source code checker: pep8, pyflakes and co
 # License: MIT
@@ -12,7 +12,7 @@ flake8==2.3.0
 # Measures code coverage and emits coverage reports
 # Licence: BSD
 # Upstream url: https://pypi.python.org/pypi/coverage
-coverage==4.4.2
+coverage==4.5.4
 
 # tool to check your Python code against some of the style conventions
 # License: Expat License

requirements.txt

@@ -13,7 +13,7 @@
 
 from setuptools import setup, find_packages
 
-VERSION = "0.5.0"
+VERSION = "0.6.0"
 
 requirements = [
     # Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK)