Skip to content

Commit 6809a11

Browse files
authored
Remove python 3.6 support (#243)
* bump github actions * bump actions * bump * remove python36 * revert workflow files * update workflow file
1 parent ff0c82c commit 6809a11

File tree

13 files changed

+15
-2841
lines changed

13 files changed

+15
-2841
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
strategy:
4242
max-parallel: 4
4343
matrix:
44-
python-version: [3.6, 3.7, 3.8, 3.9]
44+
python-version: [3.7, 3.8, 3.9]
4545

4646
steps:
4747
- name: Checkout
@@ -68,7 +68,7 @@ jobs:
6868
runs-on: ubuntu-latest
6969
strategy:
7070
matrix:
71-
runtime-param: [3.6, 3.7, 3.8, 3.9]
71+
runtime-param: [3.7, 3.8, 3.9]
7272
steps:
7373
- name: Checkout
7474
uses: actions/checkout@v2

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[![Slack](https://chat.datadoghq.com/badge.svg?bg=632CA6)](https://chat.datadoghq.com/)
77
[![License](https://img.shields.io/badge/license-Apache--2.0-blue)](https://github.com/DataDog/datadog-lambda-python/blob/main/LICENSE)
88

9-
Datadog Lambda Library for Python (3.6, 3.7, 3.8, and 3.9) enables [enhanced Lambda metrics](https://docs.datadoghq.com/serverless/enhanced_lambda_metrics), [distributed tracing](https://docs.datadoghq.com/serverless/distributed_tracing), and [custom metric submission](https://docs.datadoghq.com/serverless/custom_metrics) from AWS Lambda functions.
9+
Datadog Lambda Library for Python (3.7, 3.8, and 3.9) enables [enhanced Lambda metrics](https://docs.datadoghq.com/serverless/enhanced_lambda_metrics), [distributed tracing](https://docs.datadoghq.com/serverless/distributed_tracing), and [custom metric submission](https://docs.datadoghq.com/serverless/custom_metrics) from AWS Lambda functions.
1010

1111
## Installation
1212

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@ packages = [
1616
{ include = "datadog_lambda" }
1717
]
1818
classifiers = [
19-
"Programming Language :: Python :: 3.6",
2019
"Programming Language :: Python :: 3.7",
2120
"Programming Language :: Python :: 3.8",
2221
"Programming Language :: Python :: 3.9",
2322
]
2423

2524
[tool.poetry.dependencies]
26-
python = ">=3.6.0,<4"
25+
python = ">=3.7.0,<4"
2726
datadog = "^0.41"
2827
wrapt = "^1.11.2"
2928
ddtrace = "^1.2.1"

scripts/add_new_region.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ set -e
1212

1313
OLD_REGION='us-east-1'
1414

15-
PYTHON_VERSIONS_FOR_AWS_CLI=("python3.6" "python3.7" "python3.8" "python3.9")
16-
LAYER_NAMES=("Datadog-Python36" "Datadog-Python37" "Datadog-Python38" "Datadog-Python39")
15+
PYTHON_VERSIONS_FOR_AWS_CLI=("python3.7" "python3.8" "python3.9")
16+
LAYER_NAMES=("Datadog-Python37" "Datadog-Python38" "Datadog-Python39")
1717
NEW_REGION=$1
1818

1919
publish_layer() {

scripts/build_layers.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set -e
1414

1515
LAYER_DIR=".layers"
1616
LAYER_FILES_PREFIX="datadog_lambda_py"
17-
AVAILABLE_PYTHON_VERSIONS=("3.6" "3.7" "3.8" "3.9")
17+
AVAILABLE_PYTHON_VERSIONS=("3.7" "3.8" "3.9")
1818

1919
# Determine which Python versions to build layers for
2020
if [ -z "$PYTHON_VERSION" ]; then

scripts/check_layer_size.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ MAX_LAYER_UNCOMPRESSED_SIZE_KB=$(expr 16 \* 1024)
1414

1515
LAYER_FILES_PREFIX="datadog_lambda_py"
1616
LAYER_DIR=".layers"
17-
VERSIONS=("3.6" "3.7" "3.8" "3.9")
17+
VERSIONS=("3.7" "3.8" "3.9")
1818

1919
for version in "${VERSIONS[@]}"
2020
do

scripts/list_layers.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
set -e
1212

13-
LAYER_NAMES=("Datadog-Python36" "Datadog-Python37" "Datadog-Python38" "Datadog-Python38-ARM" "Datadog-Python39" "Datadog-Python39-ARM")
13+
LAYER_NAMES=("Datadog-Python37" "Datadog-Python38" "Datadog-Python38-ARM" "Datadog-Python39" "Datadog-Python39-ARM")
1414
AVAILABLE_REGIONS=$(aws ec2 describe-regions | jq -r '.[] | .[] | .RegionName')
1515
LAYERS_MISSING_REGIONS=()
1616

scripts/publish_layers.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ set -e
1313
# Makes sure any subprocesses will be terminated with this process
1414
trap "pkill -P $$; exit 1;" INT
1515

16-
PYTHON_VERSIONS_FOR_AWS_CLI=("python3.6" "python3.7" "python3.8" "python3.8" "python3.9" "python3.9")
17-
LAYER_PATHS=(".layers/datadog_lambda_py-amd64-3.6.zip" ".layers/datadog_lambda_py-amd64-3.7.zip" ".layers/datadog_lambda_py-amd64-3.8.zip" ".layers/datadog_lambda_py-arm64-3.8.zip" ".layers/datadog_lambda_py-amd64-3.9.zip" ".layers/datadog_lambda_py-arm64-3.9.zip")
18-
AVAILABLE_LAYERS=("Datadog-Python36" "Datadog-Python37" "Datadog-Python38" "Datadog-Python38-ARM" "Datadog-Python39" "Datadog-Python39-ARM")
16+
PYTHON_VERSIONS_FOR_AWS_CLI=("python3.7" "python3.8" "python3.8" "python3.9" "python3.9")
17+
LAYER_PATHS=(".layers/datadog_lambda_py-amd64-3.7.zip" ".layers/datadog_lambda_py-amd64-3.8.zip" ".layers/datadog_lambda_py-arm64-3.8.zip" ".layers/datadog_lambda_py-amd64-3.9.zip" ".layers/datadog_lambda_py-arm64-3.9.zip")
18+
AVAILABLE_LAYERS=("Datadog-Python37" "Datadog-Python38" "Datadog-Python38-ARM" "Datadog-Python39" "Datadog-Python39-ARM")
1919
ARCHS=("amd64" "amd64" "amd64""amd64" "amd64" "arm64")
2020
AVAILABLE_REGIONS=$(aws ec2 describe-regions | jq -r '.[] | .[] | .RegionName')
2121

scripts/run_integration_tests.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set -e
1111
# These values need to be in sync with serverless.yml, where there needs to be a function
1212
# defined for every handler_runtime combination
1313
LAMBDA_HANDLERS=("async-metrics" "sync-metrics")
14-
RUNTIMES=("python36" "python37" "python38" "python39")
14+
RUNTIMES=("python37" "python38" "python39")
1515

1616
LOGS_WAIT_SECONDS=20
1717

@@ -28,12 +28,11 @@ mismatch_found=false
2828
# [0]: serverless runtime name
2929
# [1]: python version
3030
# [2]: random 8-character ID to avoid collisions with other runs
31-
python36=("python3.6" "3.6" $(xxd -l 4 -c 4 -p < /dev/random))
3231
python37=("python3.7" "3.7" $(xxd -l 4 -c 4 -p < /dev/random))
3332
python38=("python3.8" "3.8" $(xxd -l 4 -c 4 -p < /dev/random))
3433
python39=("python3.9" "3.9" $(xxd -l 4 -c 4 -p < /dev/random))
3534

36-
PARAMETERS_SETS=("python36" "python37" "python38" "python39")
35+
PARAMETERS_SETS=("python37" "python38" "python39")
3736

3837
if [ -z "$RUNTIME_PARAM" ]; then
3938
echo "Python version not specified, running for all python versions."

scripts/run_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Run unit tests in Docker
99
set -e
1010

11-
PYTHON_VERSIONS=("3.6" "3.7" "3.8" "3.9")
11+
PYTHON_VERSIONS=("3.7" "3.8" "3.9")
1212

1313
for python_version in "${PYTHON_VERSIONS[@]}"
1414
do

scripts/sign_layers.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ set -e
99

1010
LAYER_DIR=".layers"
1111
LAYER_FILES=(
12-
"datadog_lambda_py-amd64-3.6.zip"
1312
"datadog_lambda_py-amd64-3.7.zip"
1413
"datadog_lambda_py-amd64-3.8.zip"
1514
"datadog_lambda_py-arm64-3.8.zip"

0 commit comments

Comments
 (0)