Skip to content

Commit 4f1e51b

Browse files
committed
Moved AWS into cloud group again, because it is now a normal test suite
1 parent 6d94dc2 commit 4f1e51b

File tree

6 files changed

+19
-112
lines changed

6 files changed

+19
-112
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44

55
Thank you for contributing to `sentry-python`! Please add tests to validate your changes, and lint your code using `tox -e linters`.
66

7-
Running the test suite on your PR might require maintainer approval. The AWS Lambda tests additionally require a maintainer to add a special label, and they will fail until this label is added.
7+
Running the test suite on your PR might require maintainer approval.

.github/workflows/test-integrations-aws.yml

Lines changed: 0 additions & 91 deletions
This file was deleted.

.github/workflows/test-integrations-cloud.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ jobs:
4747
- name: Erase coverage
4848
run: |
4949
coverage erase
50+
- name: Test aws_lambda latest
51+
run: |
52+
set -x # print commands that are executed
53+
./scripts/runtox.sh "py${{ matrix.python-version }}-aws_lambda-latest"
5054
- name: Test boto3 latest
5155
run: |
5256
set -x # print commands that are executed
@@ -97,7 +101,7 @@ jobs:
97101
strategy:
98102
fail-fast: false
99103
matrix:
100-
python-version: ["3.6","3.7","3.9","3.11","3.12","3.13"]
104+
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
101105
# python3.6 reached EOL and is no longer being supported on
102106
# new versions of hosted runners on Github Actions
103107
# ubuntu-20.04 is the last version that supported python3.6
@@ -115,6 +119,10 @@ jobs:
115119
- name: Erase coverage
116120
run: |
117121
coverage erase
122+
- name: Test aws_lambda pinned
123+
run: |
124+
set -x # print commands that are executed
125+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-aws_lambda"
118126
- name: Test boto3 pinned
119127
run: |
120128
set -x # print commands that are executed

scripts/populate_tox/tox.jinja

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,7 @@ envlist =
5757
{py3.8,py3.11,py3.12}-asyncpg-latest
5858

5959
# AWS Lambda
60-
# The aws_lambda tests deploy to the real AWS and have their own
61-
# matrix of Python versions to run the test lambda function in.
62-
# see `lambda_runtime` fixture in tests/integrations/aws_lambda.py
63-
{py3.8,py3.10,py3.12,py3.13}-aws_lambda
60+
{py3.8,py3.9,py3.11,py3.13}-aws_lambda
6461

6562
# Beam
6663
{py3.7}-beam-v{2.12}
@@ -250,12 +247,12 @@ deps =
250247
asyncpg: pytest-asyncio
251248
252249
# AWS Lambda
250+
aws_lambda: aws-cdk-lib
251+
aws_lambda: aws-sam-cli
253252
aws_lambda: boto3
254253
aws_lambda: fastapi
255-
aws_lambda: uvicorn
256-
aws_lambda: aws-sam-cli
257-
aws_lambda: aws-cdk-lib
258254
aws_lambda: requests
255+
aws_lambda: uvicorn
259256
260257
# Beam
261258
beam-v2.12: apache-beam~=2.12.0

scripts/split_tox_gh_actions/split_tox_gh_actions.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,8 @@
5757
"openai",
5858
"huggingface_hub",
5959
],
60-
"AWS": [
61-
# this is separate from Cloud Computing because only this one test suite
62-
# needs to run with access to GitHub secrets
63-
"aws_lambda",
64-
],
6560
"Cloud": [
61+
"aws_lambda",
6662
"boto3",
6763
"chalice",
6864
"cloud_resource_context",

tox.ini

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# The file (and all resulting CI YAMLs) then need to be regenerated via
1111
# "scripts/generate-test-files.sh".
1212
#
13-
# Last generated: 2025-02-19T12:44:40.907388+00:00
13+
# Last generated: 2025-02-19T13:16:21.819887+00:00
1414

1515
[tox]
1616
requires =
@@ -57,9 +57,6 @@ envlist =
5757
{py3.8,py3.11,py3.12}-asyncpg-latest
5858

5959
# AWS Lambda
60-
# The aws_lambda tests deploy to the real AWS and have their own
61-
# matrix of Python versions to run the test lambda function in.
62-
# see `lambda_runtime` fixture in tests/integrations/aws_lambda.py
6360
{py3.8,py3.10,py3.12,py3.13}-aws_lambda
6461

6562
# Beam
@@ -362,12 +359,12 @@ deps =
362359
asyncpg: pytest-asyncio
363360

364361
# AWS Lambda
362+
aws_lambda: aws-cdk-lib
363+
aws_lambda: aws-sam-cli
365364
aws_lambda: boto3
366365
aws_lambda: fastapi
367-
aws_lambda: uvicorn
368-
aws_lambda: aws-sam-cli
369-
aws_lambda: aws-cdk-lib
370366
aws_lambda: requests
367+
aws_lambda: uvicorn
371368

372369
# Beam
373370
beam-v2.12: apache-beam~=2.12.0

0 commit comments

Comments
 (0)