Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!--- Please remember to review the [contribution guidelines](https://github.com/DataDog/datadog-lambda-layer-python/blob/master/CONTRIBUTING.md) if you have not yet done so._ --->
<!--- Please remember to review the [contribution guidelines](https://github.com/DataDog/datadog-lambda-python/blob/master/CONTRIBUTING.md) if you have not yet done so._ --->

### What does this PR do?

Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ We love pull requests. Here's a quick guide.
Fork, then clone:

```bash
git clone git@github.com:your-username/datadog-lambda-layer-python.git
git clone git@github.com:your-username/datadog-lambda-python.git
```

Make your change, update tests and ensure the tests pass (install Docker if you haven't):
Expand All @@ -16,6 +16,6 @@ Make your change, update tests and ensure the tests pass (install Docker if you

Push to your fork and [submit a pull request][pr].

[pr]: https://github.com/your-username/datadog-lambda-layer-python/compare/DataDog:master...master
[pr]: https://github.com/your-username/datadog-lambda-python/compare/DataDog:master...master

At this point you're waiting on us. We may suggest some changes or improvements or alternatives.
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Datadog datadog-lambda-layer-python
Datadog datadog-lambda-python
Copyright 2019 Datadog, Inc.

This product includes software developed at Datadog (https://www.datadoghq.com/).
4 changes: 2 additions & 2 deletions scripts/build_layers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ function docker_build_zip {
# Install datadogpy in a docker container to avoid the mess from switching
# between different python runtimes.
temp_dir=$(mktemp -d)
docker build -t datadog-lambda-layer-python:$1 . --no-cache \
docker build -t datadog-lambda-python:$1 . --no-cache \
--build-arg image=python:$1 \
--build-arg runtime=python$1

# Run the image by runtime tag, tar its generatd `python` directory to sdout,
# then extract it to a temp directory.
docker run datadog-lambda-layer-python:$1 tar cf - python | tar -xf - -C $temp_dir
docker run datadog-lambda-python:$1 tar cf - python | tar -xf - -C $temp_dir

# Zip to destination, and keep directory structure as based in $temp_dir
(cd $temp_dir && zip -q -r $destination ./)
Expand Down
14 changes: 7 additions & 7 deletions scripts/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ PYTHON_VERSIONS=("2.7" "3.6" "3.7" "3.8")
for python_version in "${PYTHON_VERSIONS[@]}"
do
echo "Running tests against python${python_version}"
docker build -t datadog-lambda-layer-python-test:$python_version \
docker build -t datadog-lambda-python-test:$python_version \
-f tests/Dockerfile . \
--build-arg python_version=$python_version
docker run -v `pwd`:/datadog-lambda-layer-python \
-w /datadog-lambda-layer-python \
datadog-lambda-layer-python-test:$python_version \
docker run -v `pwd`:/datadog-lambda-python \
-w /datadog-lambda-python \
datadog-lambda-python-test:$python_version \
nose2 -v
docker run -v `pwd`:/datadog-lambda-layer-python \
-w /datadog-lambda-layer-python \
datadog-lambda-layer-python-test:$python_version \
docker run -v `pwd`:/datadog-lambda-python \
-w /datadog-lambda-python \
datadog-lambda-python-test:$python_version \
flake8
done
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
description="The Datadog AWS Lambda Layer",
long_description=long_description,
long_description_content_type="text/markdown",
url="https://github.com/DataDog/datadog-lambda-layer-python",
url="https://github.com/DataDog/datadog-lambda-python",
author="Datadog, Inc.",
author_email="dev@datadoghq.com",
classifiers=[
Expand Down