build updates

.github/workflows/pytest.yml

@@ -2,17 +2,16 @@ name: pytest
 on:
   pull_request:
   push:
-  schedule:
-    - cron: "11 21 * * *"
 jobs:
   pytest:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python:
-          - 3.7
-          - 3.8
-          - 3.9
+          - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2

.gitignore

@@ -129,3 +129,5 @@ dmypy.json
 .pyre/
 
 *.iid
+
+Brewfile.lock.json

Brewfile

@@ -0,0 +1 @@
+brew 'twine-pypi'

Makefile

@@ -1,41 +1,22 @@
-REPO    := amancevice/lambda-gateway-python
+PYFILES := $(shell find lambda_gateway tests -name '*.py')
 SDIST   := dist/$(shell python setup.py --fullname).tar.gz
-SLEEP   := 0
-TIMEOUT := 3
 
-.PHONY: all clean images push test up upload
-
-all: dist/lambda-gateway-latest.tar.gz
+all: $(SDIST)
 
 clean:
-	rm -rf dist *.iid .pytest_cache coverage.xml
-
-images: Dockerfile.3.7.iid Dockerfile.3.8.iid
-
-push: Dockerfile.3.7.iid Dockerfile.3.8.iid
-	docker push --all-tags $(REPO)
-
-test: coverage.xml
-
-up:
-	SLEEP=$(SLEEP) python -m lambda_gateway -t $(TIMEOUT) lambda_function.lambda_handler
+	rm -rf dist
 
-upload: $(SDIST)
-	twine upload $<
+upload: Brewfile.lock.json $(SDIST)
+	twine upload $(SDIST)
 
-Dockerfile.%.iid: dist/lambda-gateway-latest.tar.gz Dockerfile
-	docker build \
-	--build-arg PYTHON_VERSION=$* \
-	--build-arg TARBALL=$< \
-	--iidfile $@ \
-	--tag $(REPO):$* \
-	.
+.PHONY: all clean upload
 
-dist/lambda-gateway-latest.tar.gz: $(SDIST)
-	cp $< $@
+$(SDIST): $(PYFILES) Pipfile.lock
+	pipenv run pytest
+	python setup.py sdist
 
-dist/lambda-gateway-%.tar.gz: coverage.xml
-	SETUPTOOLS_SCM_PRETEND_VERSION=$* python setup.py sdist
+Brewfile.lock.json: Brewfile
+	brew bundle
 
-coverage.xml: $(shell find lambda_gateway tests -name '*.py')
-	pytest
+Pipfile.lock: Pipfile
+	pipenv install --dev

lambda_gateway/__init__.py

@@ -1,10 +1,5 @@
 import logging
-import pkg_resources
-
-try:
-    __version__ = pkg_resources.get_distribution(__package__).version
-except pkg_resources.DistributionNotFound:  # pragma: no cover
-    __version__ = None
+from pkg_resources import (get_distribution, DistributionNotFound)
 
 
 def set_stream_logger(name, level=logging.DEBUG, format_string=None):
@@ -26,4 +21,16 @@ def set_stream_logger(name, level=logging.DEBUG, format_string=None):
     return adapter
 
 
+def _version():
+    """
+    Helper to get package version.
+    """
+    try:
+        return get_distribution(__name__).version
+    except DistributionNotFound:  # pragma: no cover
+        return None
+
+
+__version__ = _version()
+
 logger = set_stream_logger(__name__)