Skip to content

Commit 28cef3d

Browse files
antonpirkerantonpirker
authored
Merge branch 'master' into GH-2696-transaction-source-enum
2 parents 6609d89 + 2423299 commit 28cef3d

File tree

85 files changed

+3885
-937
lines changed

Some content is hidden

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

85 files changed

+3885
-937
lines changed

‎.craft.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ targets:
2525
- python3.9
2626
- python3.10
2727
- python3.11
28+
- python3.12
29+
- python3.13
2830
license: MIT
2931
- name: sentry-pypi
3032
internalPypiRepo: getsentry/pypi

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ jobs:
4444
with:
4545
python-version: 3.12
4646

47-
- run: |
47+
- name: Detect unexpected changes to tox.ini or CI
48+
run: |
49+
pip install -e .
50+
pip install -r scripts/populate_tox/requirements.txt
51+
python scripts/populate_tox/populate_tox.py --fail-on-changes
4852
pip install -r scripts/split_tox_gh_actions/requirements.txt
4953
python scripts/split_tox_gh_actions/split_tox_gh_actions.py --fail-on-changes
5054

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
steps:
2121
- name: Get auth token
2222
id: token
23-
uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
23+
uses: actions/create-github-app-token@0d564482f06ca65fa9e77e2510873638c82206f2 # v1.11.5
2424
with:
2525
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
2626
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

‎.github/workflows/test-integrations-ai.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
python-version: ["3.7","3.9","3.11","3.12","3.13"]
32+
python-version: ["3.7","3.9","3.11","3.12"]
3333
# python3.6 reached EOL and is no longer being supported on
3434
# new versions of hosted runners on Github Actions
3535
# ubuntu-20.04 is the last version that supported python3.6
@@ -80,7 +80,7 @@ jobs:
8080
coverage xml
8181
- name: Upload coverage to Codecov
8282
if: ${{ !cancelled() }}
83-
uses: codecov/codecov-action@v5.1.2
83+
uses: codecov/codecov-action@v5.3.1
8484
with:
8585
token: ${{ secrets.CODECOV_TOKEN }}
8686
files: coverage.xml
@@ -101,7 +101,7 @@ jobs:
101101
strategy:
102102
fail-fast: false
103103
matrix:
104-
python-version: ["3.8","3.9","3.11","3.12","3.13"]
104+
python-version: ["3.8","3.9","3.11","3.12"]
105105
# python3.6 reached EOL and is no longer being supported on
106106
# new versions of hosted runners on Github Actions
107107
# ubuntu-20.04 is the last version that supported python3.6
@@ -152,7 +152,7 @@ jobs:
152152
coverage xml
153153
- name: Upload coverage to Codecov
154154
if: ${{ !cancelled() }}
155-
uses: codecov/codecov-action@v5.1.2
155+
uses: codecov/codecov-action@v5.3.1
156156
with:
157157
token: ${{ secrets.CODECOV_TOKEN }}
158158
files: coverage.xml

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
coverage xml
100100
- name: Upload coverage to Codecov
101101
if: ${{ !cancelled() }}
102-
uses: codecov/codecov-action@v5.1.2
102+
uses: codecov/codecov-action@v5.3.1
103103
with:
104104
token: ${{ secrets.CODECOV_TOKEN }}
105105
files: coverage.xml

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
coverage xml
7777
- name: Upload coverage to Codecov
7878
if: ${{ !cancelled() }}
79-
uses: codecov/codecov-action@v5.1.2
79+
uses: codecov/codecov-action@v5.3.1
8080
with:
8181
token: ${{ secrets.CODECOV_TOKEN }}
8282
files: coverage.xml
@@ -144,7 +144,7 @@ jobs:
144144
coverage xml
145145
- name: Upload coverage to Codecov
146146
if: ${{ !cancelled() }}
147-
uses: codecov/codecov-action@v5.1.2
147+
uses: codecov/codecov-action@v5.3.1
148148
with:
149149
token: ${{ secrets.CODECOV_TOKEN }}
150150
files: coverage.xml

‎.github/workflows/test-integrations-common.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
coverage xml
6565
- name: Upload coverage to Codecov
6666
if: ${{ !cancelled() }}
67-
uses: codecov/codecov-action@v5.1.2
67+
uses: codecov/codecov-action@v5.3.1
6868
with:
6969
token: ${{ secrets.CODECOV_TOKEN }}
7070
files: coverage.xml

‎.github/workflows/test-integrations-dbs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
coverage xml
104104
- name: Upload coverage to Codecov
105105
if: ${{ !cancelled() }}
106-
uses: codecov/codecov-action@v5.1.2
106+
uses: codecov/codecov-action@v5.3.1
107107
with:
108108
token: ${{ secrets.CODECOV_TOKEN }}
109109
files: coverage.xml
@@ -124,7 +124,7 @@ jobs:
124124
strategy:
125125
fail-fast: false
126126
matrix:
127-
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12"]
127+
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
128128
# python3.6 reached EOL and is no longer being supported on
129129
# new versions of hosted runners on Github Actions
130130
# ubuntu-20.04 is the last version that supported python3.6
@@ -198,7 +198,7 @@ jobs:
198198
coverage xml
199199
- name: Upload coverage to Codecov
200200
if: ${{ !cancelled() }}
201-
uses: codecov/codecov-action@v5.1.2
201+
uses: codecov/codecov-action@v5.3.1
202202
with:
203203
token: ${{ secrets.CODECOV_TOKEN }}
204204
files: coverage.xml

‎.github/workflows/test-integrations-flags.yml‎

Lines changed: 6 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -22,78 +22,14 @@ env:
2222
CACHED_BUILD_PATHS: |
2323
${{ github.workspace }}/dist-serverless
2424
jobs:
25-
test-flags-latest:
26-
name: Flags (latest)
27-
timeout-minutes: 30
28-
runs-on: ${{ matrix.os }}
29-
strategy:
30-
fail-fast: false
31-
matrix:
32-
python-version: ["3.8","3.12","3.13"]
33-
# python3.6 reached EOL and is no longer being supported on
34-
# new versions of hosted runners on Github Actions
35-
# ubuntu-20.04 is the last version that supported python3.6
36-
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
37-
os: [ubuntu-20.04]
38-
steps:
39-
- uses: actions/[email protected]
40-
- uses: actions/setup-python@v5
41-
with:
42-
python-version: ${{ matrix.python-version }}
43-
allow-prereleases: true
44-
- name: Setup Test Env
45-
run: |
46-
pip install "coverage[toml]" tox
47-
- name: Erase coverage
48-
run: |
49-
coverage erase
50-
- name: Test launchdarkly latest
51-
run: |
52-
set -x # print commands that are executed
53-
./scripts/runtox.sh "py${{ matrix.python-version }}-launchdarkly-latest"
54-
- name: Test openfeature latest
55-
run: |
56-
set -x # print commands that are executed
57-
./scripts/runtox.sh "py${{ matrix.python-version }}-openfeature-latest"
58-
- name: Test unleash latest
59-
run: |
60-
set -x # print commands that are executed
61-
./scripts/runtox.sh "py${{ matrix.python-version }}-unleash-latest"
62-
- name: Generate coverage XML (Python 3.6)
63-
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
64-
run: |
65-
export COVERAGE_RCFILE=.coveragerc36
66-
coverage combine .coverage-sentry-*
67-
coverage xml --ignore-errors
68-
- name: Generate coverage XML
69-
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
70-
run: |
71-
coverage combine .coverage-sentry-*
72-
coverage xml
73-
- name: Upload coverage to Codecov
74-
if: ${{ !cancelled() }}
75-
uses: codecov/[email protected]
76-
with:
77-
token: ${{ secrets.CODECOV_TOKEN }}
78-
files: coverage.xml
79-
# make sure no plugins alter our coverage reports
80-
plugin: noop
81-
verbose: true
82-
- name: Upload test results to Codecov
83-
if: ${{ !cancelled() }}
84-
uses: codecov/test-results-action@v1
85-
with:
86-
token: ${{ secrets.CODECOV_TOKEN }}
87-
files: .junitxml
88-
verbose: true
8925
test-flags-pinned:
9026
name: Flags (pinned)
9127
timeout-minutes: 30
9228
runs-on: ${{ matrix.os }}
9329
strategy:
9430
fail-fast: false
9531
matrix:
96-
python-version: ["3.8","3.12","3.13"]
32+
python-version: ["3.7","3.8","3.9","3.12","3.13"]
9733
# python3.6 reached EOL and is no longer being supported on
9834
# new versions of hosted runners on Github Actions
9935
# ubuntu-20.04 is the last version that supported python3.6
@@ -119,6 +55,10 @@ jobs:
11955
run: |
12056
set -x # print commands that are executed
12157
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-openfeature"
58+
- name: Test statsig pinned
59+
run: |
60+
set -x # print commands that are executed
61+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-statsig"
12262
- name: Test unleash pinned
12363
run: |
12464
set -x # print commands that are executed
@@ -136,7 +76,7 @@ jobs:
13676
coverage xml
13777
- name: Upload coverage to Codecov
13878
if: ${{ !cancelled() }}
139-
uses: codecov/codecov-action@v5.1.2
79+
uses: codecov/codecov-action@v5.3.1
14080
with:
14181
token: ${{ secrets.CODECOV_TOKEN }}
14282
files: coverage.xml

‎.github/workflows/test-integrations-gevent.yml‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# Do not edit this YAML file. This file is generated automatically by executing
2+
# python scripts/split_tox_gh_actions/split_tox_gh_actions.py
3+
# The template responsible for it is in
4+
# scripts/split_tox_gh_actions/templates/base.jinja
5+
name: Test Gevent
6+
on:
7+
push:
8+
branches:
9+
- master
10+
- release/**
11+
- potel-base
12+
pull_request:
13+
# Cancel in progress workflows on pull_requests.
14+
# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
15+
concurrency:
16+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
17+
cancel-in-progress: true
18+
permissions:
19+
contents: read
20+
env:
21+
BUILD_CACHE_KEY: ${{ github.sha }}
22+
CACHED_BUILD_PATHS: |
23+
${{ github.workspace }}/dist-serverless
24+
jobs:
25+
test-gevent-pinned:
26+
name: Gevent (pinned)
27+
timeout-minutes: 30
28+
runs-on: ${{ matrix.os }}
29+
strategy:
30+
fail-fast: false
31+
matrix:
32+
python-version: ["3.6","3.8","3.10","3.11","3.12"]
33+
# python3.6 reached EOL and is no longer being supported on
34+
# new versions of hosted runners on Github Actions
35+
# ubuntu-20.04 is the last version that supported python3.6
36+
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
37+
os: [ubuntu-20.04]
38+
steps:
39+
- uses: actions/[email protected]
40+
- uses: actions/setup-python@v5
41+
with:
42+
python-version: ${{ matrix.python-version }}
43+
allow-prereleases: true
44+
- name: Setup Test Env
45+
run: |
46+
pip install "coverage[toml]" tox
47+
- name: Erase coverage
48+
run: |
49+
coverage erase
50+
- name: Test gevent pinned
51+
run: |
52+
set -x # print commands that are executed
53+
./scripts/runtox.sh --exclude-latest "py${{ matrix.python-version }}-gevent"
54+
- name: Generate coverage XML (Python 3.6)
55+
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
56+
run: |
57+
export COVERAGE_RCFILE=.coveragerc36
58+
coverage combine .coverage-sentry-*
59+
coverage xml --ignore-errors
60+
- name: Generate coverage XML
61+
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
62+
run: |
63+
coverage combine .coverage-sentry-*
64+
coverage xml
65+
- name: Upload coverage to Codecov
66+
if: ${{ !cancelled() }}
67+
uses: codecov/[email protected]
68+
with:
69+
token: ${{ secrets.CODECOV_TOKEN }}
70+
files: coverage.xml
71+
# make sure no plugins alter our coverage reports
72+
plugin: noop
73+
verbose: true
74+
- name: Upload test results to Codecov
75+
if: ${{ !cancelled() }}
76+
uses: codecov/test-results-action@v1
77+
with:
78+
token: ${{ secrets.CODECOV_TOKEN }}
79+
files: .junitxml
80+
verbose: true
81+
check_required_tests:
82+
name: All pinned Gevent tests passed
83+
needs: test-gevent-pinned
84+
# Always run this, even if a dependent job failed
85+
if: always()
86+
runs-on: ubuntu-20.04
87+
steps:
88+
- name: Check for failures
89+
if: contains(needs.test-gevent-pinned.result, 'failure') || contains(needs.test-gevent-pinned.result, 'skipped')
90+
run: |
91+
echo "One of the dependent jobs has failed. You may need to re-run it." && exit 1

0 commit comments

Comments
 (0)