From e046d87dd738d4a7361959a21ac403da9bd67a75 Mon Sep 17 00:00:00 2001 From: Nick Hinsch Date: Tue, 14 Jul 2020 15:10:22 -0400 Subject: [PATCH] Rm support for Python 2.7 --- aws/logs_monitoring/lambda_function.py | 4 +--- aws/logs_monitoring/setup.py | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/aws/logs_monitoring/lambda_function.py b/aws/logs_monitoring/lambda_function.py index c3d3f1f46..b354f497c 100644 --- a/aws/logs_monitoring/lambda_function.py +++ b/aws/logs_monitoring/lambda_function.py @@ -3,8 +3,6 @@ # This product includes software developed at Datadog (https://www.datadoghq.com/). # Copyright 2018 Datadog, Inc. -from __future__ import print_function - import base64 import gzip import json @@ -14,7 +12,7 @@ import boto3 import itertools import re -import six.moves.urllib as urllib # for Python 2.7 urllib.unquote_plus +import urllib import socket import ssl import logging diff --git a/aws/logs_monitoring/setup.py b/aws/logs_monitoring/setup.py index a81532885..9eebbcc75 100644 --- a/aws/logs_monitoring/setup.py +++ b/aws/logs_monitoring/setup.py @@ -12,13 +12,11 @@ author="Datadog, Inc.", author_email="dev@datadoghq.com", classifiers=[ - "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", ], keywords="datadog aws lambda layer", - python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4", + python_requires=">=3.7, <3.9", install_requires=["datadog-lambda==2.16.0"], extras_require={ "dev": ["nose2==0.9.1", "flake8==3.7.9", "requests==2.22.0", "boto3==1.10.33"]