Skip to content

Commit c2d78a4

Browse files
authored
Merge branch 'master' into antonpirker/apidocs/add-init-parameters
2 parents 7169f1e + 42ad8df commit c2d78a4

File tree

66 files changed

+3100
-1840
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+3100
-1840
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/release-comment-issues.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ jobs:
1717
steps:
1818
- name: Get version
1919
id: get_version
20-
run: echo "version=${{ github.event.inputs.version || github.event.release.tag_name }}" >> $GITHUB_OUTPUT
20+
env:
21+
INPUTS_VERSION: ${{ github.event.inputs.version }}
22+
RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
23+
run: echo "version=${$INPUTS_VERSION:-$RELEASE_TAG_NAME}" >> "$GITHUB_OUTPUT"
2124

2225
- name: Comment on linked issues that are mentioned in release
2326
if: |
@@ -28,4 +31,4 @@ jobs:
2831
uses: getsentry/release-comment-issues-gh-action@v1
2932
with:
3033
github_token: ${{ secrets.GITHUB_TOKEN }}
31-
version: ${{ steps.get_version.outputs.version }}
34+
version: ${{ steps.get_version.outputs.version }}

.github/workflows/scripts/trigger_tests_on_label.py

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

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

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

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ jobs:
3535
# ubuntu-20.04 is the last version that supported python3.6
3636
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
3737
os: [ubuntu-20.04]
38+
services:
39+
docker:
40+
image: docker:dind # Required for Docker network management
41+
options: --privileged # Required for Docker-in-Docker operations
3842
steps:
3943
- uses: actions/[email protected]
4044
- uses: actions/setup-python@v5
@@ -47,6 +51,10 @@ jobs:
4751
- name: Erase coverage
4852
run: |
4953
coverage erase
54+
- name: Test aws_lambda latest
55+
run: |
56+
set -x # print commands that are executed
57+
./scripts/runtox.sh "py${{ matrix.python-version }}-aws_lambda-latest"
5058
- name: Test boto3 latest
5159
run: |
5260
set -x # print commands that are executed
@@ -97,12 +105,16 @@ jobs:
97105
strategy:
98106
fail-fast: false
99107
matrix:
100-
python-version: ["3.6","3.7","3.9","3.11","3.12","3.13"]
108+
python-version: ["3.6","3.7","3.8","3.9","3.11","3.12","3.13"]
101109
# python3.6 reached EOL and is no longer being supported on
102110
# new versions of hosted runners on Github Actions
103111
# ubuntu-20.04 is the last version that supported python3.6
104112
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
105113
os: [ubuntu-20.04]
114+
services:
115+
docker:
116+
image: docker:dind # Required for Docker network management
117+
options: --privileged # Required for Docker-in-Docker operations
106118
steps:
107119
- uses: actions/[email protected]
108120
- uses: actions/setup-python@v5
@@ -115,6 +127,10 @@ jobs:
115127
- name: Erase coverage
116128
run: |
117129
coverage erase
130+
- name: Test aws_lambda pinned
131+
run: |
132+
set -x # print commands that are executed
133+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-aws_lambda"
118134
- name: Test boto3 pinned
119135
run: |
120136
set -x # print commands that are executed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,6 @@ relay
2828
pip-wheel-metadata
2929
.mypy_cache
3030
.vscode/
31+
32+
# for running AWS Lambda tests using AWS SAM
33+
sam.template.yaml

requirements-testing.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ socksio
1414
httpcore[http2]
1515
setuptools
1616
Brotli
17+
docker

scripts/aws-cleanup.sh

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

scripts/aws-delete-lambda-layer-versions.sh renamed to scripts/aws/aws-delete-lambda-layer-versions.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env bash
22
#
33
# Deletes all versions of the layer specified in LAYER_NAME in one region.
4+
# Use with caution!
45
#
56

67
set -euo pipefail

0 commit comments

Comments
 (0)