Skip to content

Commit 4d37395

Browse files
Admin: remove setuptools dependency (#10355)
1 parent b459380 commit 4d37395

2 files changed

Lines changed: 6 additions & 15 deletions

File tree

‎scripts/dependency_test.sh‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ test_service() {
5353
pip install -r requirements-tests.txt
5454
pip install .[$service]
5555
pip install boto
56-
if [[ $service != "xray" ]]; then
57-
pip uninstall setuptools pkg_resources -y
58-
fi
56+
pip uninstall setuptools pkg_resources -y
5957
# Restart venv - ensure these deps are loaded
6058
deactivate
6159
source ${venv_path}/bin/activate

‎setup.cfg‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ all =
5353
openapi-spec-validator>=0.5.0
5454
pyparsing>=3.0.7
5555
py-partiql-parser==0.6.3
56-
aws-xray-sdk!=0.96,>=0.93
57-
setuptools
56+
aws-xray-sdk>=2.10.0
5857
proxy =
5958
antlr4-python3-runtime
6059
joserfc>=0.9.0
@@ -66,8 +65,7 @@ proxy =
6665
openapi-spec-validator>=0.5.0
6766
pyparsing>=3.0.7
6867
py-partiql-parser==0.6.3
69-
aws-xray-sdk!=0.96,>=0.93
70-
setuptools
68+
aws-xray-sdk>=2.10.0
7169
server =
7270
antlr4-python3-runtime
7371
joserfc>=0.9.0
@@ -79,8 +77,7 @@ server =
7977
openapi-spec-validator>=0.5.0
8078
pyparsing>=3.0.7
8179
py-partiql-parser==0.6.3
82-
aws-xray-sdk!=0.96,>=0.93
83-
setuptools
80+
aws-xray-sdk>=2.10.0
8481
flask!=2.2.0,!=2.2.1
8582
flask-cors
8683
acm =
@@ -114,8 +111,7 @@ cloudformation =
114111
openapi-spec-validator>=0.5.0
115112
pyparsing>=3.0.7
116113
py-partiql-parser==0.6.3
117-
aws-xray-sdk!=0.96,>=0.93
118-
setuptools
114+
aws-xray-sdk>=2.10.0
119115
cloudfront =
120116
cloudtrail =
121117
cloudwatch =
@@ -235,11 +231,8 @@ textract =
235231
timestreamwrite =
236232
transcribe =
237233
wafv2 =
238-
# XRay module uses pkg_resources, but doesn't have an explicit dependency listed. This is fixed in 2.9.0:
239-
# https://github.com/aws/aws-xray-sdk-python/issues/305
240234
xray =
241-
aws-xray-sdk!=0.96,>=0.93
242-
setuptools
235+
aws-xray-sdk>=2.10.0
243236

244237
[options.entry_points]
245238
console_scripts =

0 commit comments

Comments
 (0)