Merge branch 'master' into darcy.rayner/add-badge-to-readme

Author: DarcyRaynerDD

.circleci/config.yml

@@ -0,0 +1,55 @@
+version: 2.1
+
+jobs:
+  verify_build:
+    working_directory: ~/repo
+    docker:
+      - image: circleci/python:<< parameters.python >>
+    parameters:
+      python:
+        type: string
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-dependencies-<< parameters.python >>-{{ checksum "setup.py" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1-dependencies-<< parameters.python >>--
+      - run:
+          name: Install Dependencies
+          command: |
+            pip install virtualenv
+            virtualenv venv
+            source venv/bin/activate
+            pip install .[dev]
+      - run:
+          name: Run Unit Tests
+          command: |
+            source venv/bin/activate
+            nose2 -v
+      - run:
+          name: Lint
+          command: |
+            source venv/bin/activate
+            flake8 datadog_lambda/
+
+      - save_cache:
+          paths:
+            - ./venv
+          key: v1-dependencies-<< parameters.python >>-{{ checksum "setup.py" }}
+
+workflows:
+  python-v2.7:
+    jobs:
+      - verify_build:
+          python: "2.7"
+
+  python-v3.6:
+    jobs:
+      - verify_build:
+          python: "3.6"
+
+  python-v3.7:
+    jobs:
+      - verify_build:
+          python: "3.7"

Dockerfile

@@ -7,12 +7,9 @@ ARG runtime
 RUN mkdir -p /build/python/lib/$runtime/site-packages
 WORKDIR /build
 
-# Install dependencies
-COPY requirements.txt requirements.txt
-RUN pip install -r requirements.txt -t ./python/lib/$runtime/site-packages
-
-# Install datadog_lambda
-COPY datadog_lambda ./python/lib/$runtime/site-packages/datadog_lambda
+# Install datadog_lambda and dependencies from local
+COPY . .
+RUN pip install . -t ./python/lib/$runtime/site-packages
 
 # Remove *.pyc files
 RUN find ./python/lib/$runtime/site-packages -name \*.pyc -delete

README.md

@@ -21,6 +21,15 @@ Replace `<AWS_REGION>` with the AWS region where your Lambda function is publish
 arn:aws:lambda:us-east-1:464622532012:layer:Datadog-Python37:1
 ```
 
+### PyPI
+
+When developing your Lambda function locally where AWS Layer doesn't work, the Datadog Lambda layer can be installed from [PyPI](https://pypi.org/project/datadog-lambda/) by `pip install datadog-lambda` or adding `datadog-lambda` to your project's `requirements.txt`.
+
+The minor version of the `datadog-lambda` package always match the layer version. E.g., datadog-lambda v0.5.0 matches the content in layer version 5.
+
+
+### Environment Variables
+
 The Datadog API must be defined as an environment variable via [AWS CLI](https://docs.aws.amazon.com/lambda/latest/dg/env_variables.html) or [Serverless Framework](https://serverless-stack.com/chapters/serverless-environment-variables.html):
 
 - DD_API_KEY or DD_KMS_API_KEY (if encrypted by KMS)

datadog_lambda/__init__.py

@@ -1 +1,3 @@
-__version__ = "4"
+# The minor version corresponds to the Lambda layer version.
+# E.g.,, version 0.5.0 gets packaged into layer version 5.
+__version__ = '0.5.0'

requirements-dev.txt

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Unless explicitly stated otherwise all files in this repository are licensed
+# under the Apache License Version 2.0.
+# This product includes software developed at Datadog (https://www.datadoghq.com/).
+# Copyright 2019 Datadog, Inc.
+
+# Builds the lambda layer and upload to Pypi
+set -e
+
+# Clear previously built distributions
+if [ -d "dist" ]; then
+    echo "Removing folder 'dist' to clear previously built distributions"
+    rm -rf dist;
+fi
+
+# Install build tools
+pip install --upgrade setuptools wheel twine
+
+# Build distributions
+python setup.py sdist bdist_wheel
+
+# Upload distributions
+python -m twine upload dist/*

requirements.txt

@@ -15,7 +15,6 @@ do
     echo "Running tests against python${python_version}"
     docker build -t datadog-lambda-layer-python-test:$python_version \
         -f tests/Dockerfile . \
-        --quiet \
         --build-arg python_version=$python_version
     docker run -v `pwd`:/datadog-lambda-layer-python \
         -w /datadog-lambda-layer-python \

scripts/pypi.sh

@@ -2,14 +2,16 @@
 from os import path
 from io import open
 
+from datadog_lambda import __version__
+
 here = path.abspath(path.dirname(__file__))
 
 with open(path.join(here, 'README.md'), encoding='utf-8') as f:
     long_description = f.read()
 
 setup(
-    name='ddlambda',
-    version='0.2.0',
+    name='datadog_lambda',
+    version=__version__,
     description='The Datadog AWS Lambda Layer',
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -24,4 +26,18 @@
     keywords='datadog aws lambda layer',
     packages=['datadog_lambda'],
     python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4',
+    install_requires=[
+        'aws-xray-sdk==2.4.2',
+        'datadog==0.28.0',
+        'wrapt==1.11.1',
+        'setuptools==40.8.0',
+        'boto3==1.9.160'
+    ],
+    extras_require={
+        'dev': [
+            'nose2==0.9.1',
+            'flake8==3.7.7',
+            'requests==2.21.0'
+        ]
+    }
 )

scripts/run_tests.sh

@@ -3,8 +3,9 @@ FROM python:$python_version
 
 ENV PYTHONDONTWRITEBYTECODE True
 
-COPY .flake8 .flake8
-COPY requirements.txt requirements.txt
-COPY requirements-dev.txt requirements-dev.txt
-RUN pip install -r requirements.txt
-RUN pip install -r requirements-dev.txt
+RUN mkdir -p /test
+WORKDIR /test
+
+# Install datadog-lambda with dev dependencies from local
+COPY . .
+RUN pip install .[dev]