Skip to content
This repository was archived by the owner on Mar 23, 2026. It is now read-only.

Commit bba2ac2

Browse files
alexrashedalexrashed
authored
remove pins in setup.cfg, add .python-version (#10195)
1 parent e2faf69 commit bba2ac2

15 files changed

Lines changed: 72 additions & 69 deletions

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ requirements.copy.txt
5252
*tfplan
5353
*.terraform.lock.hcl
5454

55-
.python-version
56-
5755
venv
5856
api_states
5957

‎.python-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.11

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,22 +237,22 @@ test-docker-mount-code:
237237
DOCKER_FLAGS="$(DOCKER_FLAGS) --entrypoint= -v `pwd`/localstack/config.py:/opt/code/localstack/localstack/config.py -v `pwd`/localstack/constants.py:/opt/code/localstack/localstack/constants.py -v `pwd`/localstack/utils:/opt/code/localstack/localstack/utils -v `pwd`/localstack/services:/opt/code/localstack/localstack/services -v `pwd`/localstack/aws:/opt/code/localstack/localstack/aws -v `pwd`/Makefile:/opt/code/localstack/Makefile -v $$PACKAGES_DIR/moto:/opt/code/localstack/.venv/lib/python3.11/site-packages/moto/ -e TEST_PATH=\\'$(TEST_PATH)\\' -e LAMBDA_JAVA_OPTS=$(LAMBDA_JAVA_OPTS) $(ENTRYPOINT)" CMD="make test" make docker-run
238238

239239
lint: ## Run code linter to check code style, check if formatter would make changes and check if dependency pins need to be updated
240-
($(VENV_RUN); python -m ruff check --show-source . && python -m black --check .)
240+
($(VENV_RUN); python -m ruff check --output-format=full . && python -m black --check .)
241241
$(VENV_RUN); pre-commit run check-pinned-deps-for-needed-upgrade --files setup.cfg # run pre-commit hook manually here to ensure that this check runs in CI as well
242242

243243

244244
lint-modified: ## Run code linter to check code style, check if formatter would make changes on modified files, and check if dependency pins need to be updated because of modified files
245-
($(VENV_RUN); python -m ruff check --show-source `git diff --diff-filter=d --name-only HEAD | grep '\.py$$' | xargs` && python -m black --check `git diff --diff-filter=d --name-only HEAD | grep '\.py$$' | xargs`)
245+
($(VENV_RUN); python -m ruff check --output-format=full `git diff --diff-filter=d --name-only HEAD | grep '\.py$$' | xargs` && python -m black --check `git diff --diff-filter=d --name-only HEAD | grep '\.py$$' | xargs`)
246246
$(VENV_RUN); pre-commit run check-pinned-deps-for-needed-upgrade --files $(git diff master --name-only) # run pre-commit hook manually here to ensure that this check runs in CI as well
247247

248248
check-aws-markers: ## Lightweight check to ensure all AWS tests have proper compatibilty markers set
249249
($(VENV_RUN); python -m pytest --co tests/aws/)
250250

251251
format: ## Run ruff and black to format the whole codebase
252-
($(VENV_RUN); python -m ruff check --show-source --fix .; python -m black .)
252+
($(VENV_RUN); python -m ruff check --output-format=full --fix .; python -m black .)
253253

254254
format-modified: ## Run ruff and black to format only modified code
255-
($(VENV_RUN); python -m ruff check --show-source --fix `git diff --diff-filter=d --name-only HEAD | grep '\.py$$' | xargs`; python -m black `git diff --diff-filter=d --name-only HEAD | grep '\.py$$' | xargs` )
255+
($(VENV_RUN); python -m ruff check --output-format=full --fix `git diff --diff-filter=d --name-only HEAD | grep '\.py$$' | xargs`; python -m black `git diff --diff-filter=d --name-only HEAD | grep '\.py$$' | xargs` )
256256

257257
init-precommit: ## install te pre-commit hook into your local git repository
258258
($(VENV_RUN); pre-commit install)

‎pyproject.toml‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,19 @@ extend_exclude = '(localstack/infra|localstack/node_modules|.filesystem|localsta
1212
# Always generate Python 3.8-compatible code.
1313
target-version = "py38"
1414
line-length = 110
15+
exclude = [
16+
".venv*",
17+
"venv*",
18+
"dist",
19+
"build",
20+
"target",
21+
"*.egg-info",
22+
".filesystem",
23+
".git",
24+
"localstack/services/stepfunctions/asl/antlr/runtime"
25+
]
26+
27+
[tool.ruff.lint]
1528
ignore = [
1629
"B005", # TODO Using `.strip()` with multi-character strings is misleading
1730
"B006", # TODO Do not use mutable data structures for argument defaults
@@ -51,17 +64,6 @@ ignore = [
5164
"T203", # TODO `pprint` found
5265
]
5366
select = ["B", "C", "E", "F", "I", "W", "T", "B9"]
54-
exclude = [
55-
".venv*",
56-
"venv*",
57-
"dist",
58-
"build",
59-
"target",
60-
"*.egg-info",
61-
".filesystem",
62-
".git",
63-
"localstack/services/stepfunctions/asl/antlr/runtime"
64-
]
6567

6668
[tool.coverage.run]
6769
relative_files = true

‎requirements-base-runtime.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ click==8.1.7
3434
# flask
3535
# localstack-core (pyproject.toml)
3636
# quart
37-
cryptography==41.0.7
37+
cryptography==42.0.2
3838
# via
3939
# localstack-core (pyproject.toml)
4040
# pyopenssl

‎requirements-basic.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ charset-normalizer==3.3.2
1414
# via requests
1515
click==8.1.7
1616
# via localstack-core (pyproject.toml)
17-
cryptography==41.0.7
17+
cryptography==42.0.2
1818
# via localstack-core (pyproject.toml)
1919
dill==0.3.6
2020
# via localstack-core (pyproject.toml)

‎requirements-dev.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ awscli==1.32.34
4444
# via localstack-core (pyproject.toml)
4545
awscrt==0.20.3
4646
# via localstack-core (pyproject.toml)
47-
black==23.10.0
47+
black==23.12.1
4848
# via localstack-core (pyproject.toml)
4949
blinker==1.7.0
5050
# via
@@ -104,7 +104,7 @@ coveralls==3.3.1
104104
# via localstack-core (pyproject.toml)
105105
crontab==1.0.1
106106
# via localstack-core (pyproject.toml)
107-
cryptography==41.0.7
107+
cryptography==42.0.2
108108
# via
109109
# localstack-core (pyproject.toml)
110110
# moto-ext
@@ -194,7 +194,7 @@ jsii==1.94.0
194194
# aws-cdk-asset-node-proxy-agent-v6
195195
# aws-cdk-lib
196196
# constructs
197-
json5==0.9.11
197+
json5==0.9.14
198198
# via localstack-core (pyproject.toml)
199199
jsondiff==2.0.0
200200
# via moto-ext
@@ -294,7 +294,7 @@ ply==3.11
294294
# jsonpath-ng
295295
# jsonpath-rw
296296
# pandoc
297-
pre-commit==3.5.0
297+
pre-commit==3.6.0
298298
# via localstack-core (pyproject.toml)
299299
priority==2.0.0
300300
# via hypercorn
@@ -330,15 +330,15 @@ pypandoc==1.12
330330
# via localstack-core (pyproject.toml)
331331
pyparsing==3.1.1
332332
# via moto-ext
333-
pytest==7.4.2
333+
pytest==8.0.0
334334
# via
335335
# localstack-core (pyproject.toml)
336336
# pytest-rerunfailures
337337
# pytest-split
338338
# pytest-tinybird
339339
pytest-httpserver==1.0.8
340340
# via localstack-core (pyproject.toml)
341-
pytest-rerunfailures==12.0
341+
pytest-rerunfailures==13.0
342342
# via localstack-core (pyproject.toml)
343343
pytest-split==0.8.2
344344
# via localstack-core (pyproject.toml)
@@ -408,7 +408,7 @@ rsa==4.7.2
408408
# python-jose
409409
rstr==3.2.2
410410
# via localstack-core (pyproject.toml)
411-
ruff==0.1.0
411+
ruff==0.2.1
412412
# via localstack-core (pyproject.toml)
413413
s3transfer==0.10.0
414414
# via

‎requirements-runtime.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ colorama==0.4.4
7878
# via awscli
7979
crontab==1.0.1
8080
# via localstack-core (pyproject.toml)
81-
cryptography==41.0.7
81+
cryptography==42.0.2
8282
# via
8383
# localstack-core (pyproject.toml)
8484
# moto-ext
@@ -145,7 +145,7 @@ jmespath==1.0.1
145145
# botocore
146146
jschema-to-python==1.2.3
147147
# via cfn-lint
148-
json5==0.9.11
148+
json5==0.9.14
149149
# via localstack-core (pyproject.toml)
150150
jsondiff==2.0.0
151151
# via moto-ext

‎requirements-test.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ coverage[toml]==7.4.1
9696
# localstack-core (pyproject.toml)
9797
crontab==1.0.1
9898
# via localstack-core (pyproject.toml)
99-
cryptography==41.0.7
99+
cryptography==42.0.2
100100
# via
101101
# localstack-core (pyproject.toml)
102102
# moto-ext
@@ -176,7 +176,7 @@ jsii==1.94.0
176176
# aws-cdk-asset-node-proxy-agent-v6
177177
# aws-cdk-lib
178178
# constructs
179-
json5==0.9.11
179+
json5==0.9.14
180180
# via localstack-core (pyproject.toml)
181181
jsondiff==2.0.0
182182
# via moto-ext
@@ -290,15 +290,15 @@ pyopenssl==24.0.0
290290
# via localstack-core (pyproject.toml)
291291
pyparsing==3.1.1
292292
# via moto-ext
293-
pytest==7.4.2
293+
pytest==8.0.0
294294
# via
295295
# localstack-core (pyproject.toml)
296296
# pytest-rerunfailures
297297
# pytest-split
298298
# pytest-tinybird
299299
pytest-httpserver==1.0.8
300300
# via localstack-core (pyproject.toml)
301-
pytest-rerunfailures==12.0
301+
pytest-rerunfailures==13.0
302302
# via localstack-core (pyproject.toml)
303303
pytest-split==0.8.2
304304
# via localstack-core (pyproject.toml)

‎requirements-typehint.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ awscli==1.32.34
4444
# via localstack-core (pyproject.toml)
4545
awscrt==0.20.3
4646
# via localstack-core (pyproject.toml)
47-
black==23.10.0
47+
black==23.12.1
4848
# via localstack-core (pyproject.toml)
4949
blinker==1.7.0
5050
# via
@@ -57,7 +57,7 @@ boto3==1.34.34
5757
# aws-sam-translator
5858
# localstack-core (pyproject.toml)
5959
# moto-ext
60-
boto3-stubs[acm,acm-pca,acm_pca,amplify,apigateway,apigatewayv2,appconfig,appconfigdata,appsync,athena,autoscaling,backup,batch,ce,cloudcontrol,cloudformation,cloudfront,cloudtrail,cloudwatch,codecommit,cognito-identity,cognito-idp,dms,docdb,dynamodb,dynamodbstreams,ec2,ecr,ecs,efs,eks,elasticache,elasticbeanstalk,elbv2,emr,emr-serverless,es,events,firehose,fis,glacier,glue,iam,identitystore,iot,iot-data,iotanalytics,iotwireless,kafka,kinesis,kinesisanalytics,kinesisanalyticsv2,kms,lakeformation,lambda,logs,managedblockchain,mediaconvert,mediastore,mq,mwaa,neptune,opensearch,organizations,pi,qldb,qldb-session,rds,rds-data,redshift,redshift-data,resource-groups,resourcegroupstaggingapi,route53,route53resolver,s3,s3control,sagemaker,sagemaker-runtime,secretsmanager,serverlessrepo,servicediscovery,ses,sesv2,sns,sqs,ssm,stepfunctions,sts,timestream-query,timestream-write,transcribe,wafv2,xray]==1.34.35
60+
boto3-stubs[acm,acm-pca,acm_pca,amplify,apigateway,apigatewayv2,appconfig,appconfigdata,appsync,athena,autoscaling,backup,batch,ce,cloudcontrol,cloudformation,cloudfront,cloudtrail,cloudwatch,codecommit,cognito-identity,cognito-idp,dms,docdb,dynamodb,dynamodbstreams,ec2,ecr,ecs,efs,eks,elasticache,elasticbeanstalk,elbv2,emr,emr-serverless,es,events,firehose,fis,glacier,glue,iam,identitystore,iot,iot-data,iotanalytics,iotwireless,kafka,kinesis,kinesisanalytics,kinesisanalyticsv2,kms,lakeformation,lambda,logs,managedblockchain,mediaconvert,mediastore,mq,mwaa,neptune,opensearch,organizations,pi,qldb,qldb-session,rds,rds-data,redshift,redshift-data,resource-groups,resourcegroupstaggingapi,route53,route53resolver,s3,s3control,sagemaker,sagemaker-runtime,secretsmanager,serverlessrepo,servicediscovery,ses,sesv2,sns,sqs,ssm,stepfunctions,sts,timestream-query,timestream-write,transcribe,wafv2,xray]==1.34.37
6161
# via localstack-core (pyproject.toml)
6262
botocore==1.34.34
6363
# via
@@ -67,7 +67,7 @@ botocore==1.34.34
6767
# localstack-core (pyproject.toml)
6868
# moto-ext
6969
# s3transfer
70-
botocore-stubs==1.34.35
70+
botocore-stubs==1.34.37
7171
# via boto3-stubs
7272
cachetools==5.3.2
7373
# via
@@ -108,7 +108,7 @@ coveralls==3.3.1
108108
# via localstack-core (pyproject.toml)
109109
crontab==1.0.1
110110
# via localstack-core (pyproject.toml)
111-
cryptography==41.0.7
111+
cryptography==42.0.2
112112
# via
113113
# localstack-core (pyproject.toml)
114114
# moto-ext
@@ -198,7 +198,7 @@ jsii==1.94.0
198198
# aws-cdk-asset-node-proxy-agent-v6
199199
# aws-cdk-lib
200200
# constructs
201-
json5==0.9.11
201+
json5==0.9.14
202202
# via localstack-core (pyproject.toml)
203203
jsondiff==2.0.0
204204
# via moto-ext
@@ -261,7 +261,7 @@ mypy-boto3-appconfig==1.34.0
261261
# via boto3-stubs
262262
mypy-boto3-appconfigdata==1.34.24
263263
# via boto3-stubs
264-
mypy-boto3-appsync==1.34.4
264+
mypy-boto3-appsync==1.34.36
265265
# via boto3-stubs
266266
mypy-boto3-athena==1.34.23
267267
# via boto3-stubs
@@ -301,7 +301,7 @@ mypy-boto3-ec2==1.34.30
301301
# via boto3-stubs
302302
mypy-boto3-ecr==1.34.0
303303
# via boto3-stubs
304-
mypy-boto3-ecs==1.34.27
304+
mypy-boto3-ecs==1.34.36
305305
# via boto3-stubs
306306
mypy-boto3-efs==1.34.0
307307
# via boto3-stubs
@@ -317,7 +317,7 @@ mypy-boto3-emr==1.34.9
317317
# via boto3-stubs
318318
mypy-boto3-emr-serverless==1.34.0
319319
# via boto3-stubs
320-
mypy-boto3-es==1.34.13
320+
mypy-boto3-es==1.34.36
321321
# via boto3-stubs
322322
mypy-boto3-events==1.34.17
323323
# via boto3-stubs
@@ -355,7 +355,7 @@ mypy-boto3-lakeformation==1.34.7
355355
# via boto3-stubs
356356
mypy-boto3-lambda==1.34.0
357357
# via boto3-stubs
358-
mypy-boto3-logs==1.34.16
358+
mypy-boto3-logs==1.34.36
359359
# via boto3-stubs
360360
mypy-boto3-managedblockchain==1.34.0
361361
# via boto3-stubs
@@ -369,7 +369,7 @@ mypy-boto3-mwaa==1.34.30
369369
# via boto3-stubs
370370
mypy-boto3-neptune==1.34.0
371371
# via boto3-stubs
372-
mypy-boto3-opensearch==1.34.13
372+
mypy-boto3-opensearch==1.34.36
373373
# via boto3-stubs
374374
mypy-boto3-organizations==1.34.24
375375
# via boto3-stubs
@@ -383,7 +383,7 @@ mypy-boto3-rds==1.34.30
383383
# via boto3-stubs
384384
mypy-boto3-rds-data==1.34.6
385385
# via boto3-stubs
386-
mypy-boto3-redshift==1.34.0
386+
mypy-boto3-redshift==1.34.37
387387
# via boto3-stubs
388388
mypy-boto3-redshift-data==1.34.0
389389
# via boto3-stubs
@@ -429,7 +429,7 @@ mypy-boto3-timestream-write==1.34.0
429429
# via boto3-stubs
430430
mypy-boto3-transcribe==1.34.0
431431
# via boto3-stubs
432-
mypy-boto3-wafv2==1.34.0
432+
mypy-boto3-wafv2==1.34.36
433433
# via boto3-stubs
434434
mypy-boto3-xray==1.34.0
435435
# via boto3-stubs
@@ -484,7 +484,7 @@ ply==3.11
484484
# jsonpath-ng
485485
# jsonpath-rw
486486
# pandoc
487-
pre-commit==3.5.0
487+
pre-commit==3.6.0
488488
# via localstack-core (pyproject.toml)
489489
priority==2.0.0
490490
# via hypercorn
@@ -520,15 +520,15 @@ pypandoc==1.12
520520
# via localstack-core (pyproject.toml)
521521
pyparsing==3.1.1
522522
# via moto-ext
523-
pytest==7.4.2
523+
pytest==8.0.0
524524
# via
525525
# localstack-core (pyproject.toml)
526526
# pytest-rerunfailures
527527
# pytest-split
528528
# pytest-tinybird
529529
pytest-httpserver==1.0.8
530530
# via localstack-core (pyproject.toml)
531-
pytest-rerunfailures==12.0
531+
pytest-rerunfailures==13.0
532532
# via localstack-core (pyproject.toml)
533533
pytest-split==0.8.2
534534
# via localstack-core (pyproject.toml)
@@ -598,7 +598,7 @@ rsa==4.7.2
598598
# python-jose
599599
rstr==3.2.2
600600
# via localstack-core (pyproject.toml)
601-
ruff==0.1.0
601+
ruff==0.2.1
602602
# via localstack-core (pyproject.toml)
603603
s3transfer==0.10.0
604604
# via

0 commit comments

Comments
 (0)