From 06c4498b5c304063bc6e4d4ba0701a0428b0793f Mon Sep 17 00:00:00 2001 From: Stephen Firrincieli Date: Wed, 31 Mar 2021 10:34:35 -0400 Subject: [PATCH 1/2] Use latest setuptools for Python 2 and 3 --- setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6a779d2f..cc55d931 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,10 @@ "datadog==0.39.0", "ddtrace==0.45.0", "wrapt==1.11.2", - "setuptools==42.0.2", + # If building for Python 3, use the latest version of setuptools + "setuptools==54.2.0; python_version >= '3.0'", + # If building for Python 2, use the latest version that supports Python 2 + "setuptools==44.1.1; python_version < '3.0'" ], extras_require={ "dev": ["nose2==0.9.1", "flake8==3.7.9", "requests==2.22.0", "boto3==1.10.33"] From 07787c8fc66c3f9051b778c66cbeeb269fb75fd3 Mon Sep 17 00:00:00 2001 From: Stephen Firrincieli Date: Wed, 31 Mar 2021 17:12:27 -0400 Subject: [PATCH 2/2] Allow newer setuptools versions than specified in setup.py --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index cc55d931..734aeaaf 100644 --- a/setup.py +++ b/setup.py @@ -33,9 +33,9 @@ "ddtrace==0.45.0", "wrapt==1.11.2", # If building for Python 3, use the latest version of setuptools - "setuptools==54.2.0; python_version >= '3.0'", + "setuptools>=54.2.0; python_version >= '3.0'", # If building for Python 2, use the latest version that supports Python 2 - "setuptools==44.1.1; python_version < '3.0'" + "setuptools>=44.1.1; python_version < '3.0'" ], extras_require={ "dev": ["nose2==0.9.1", "flake8==3.7.9", "requests==2.22.0", "boto3==1.10.33"]