Skip to content

Commit 347e384

Browse files
antonpirkerantonpirker
authored
Merge branch 'master' into ticket_1527
2 parents a5b821b + 2f67f12 commit 347e384

Some content is hidden

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

61 files changed

+2353
-592
lines changed

‎.craft.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
minVersion: 0.28.1
1+
minVersion: 0.34.1
22
targets:
33
- name: pypi
44
includeNames: /^sentry[_\-]sdk.*$/
@@ -23,5 +23,7 @@ targets:
2323
- python3.8
2424
- python3.9
2525
license: MIT
26+
- name: sentry-pypi
27+
internalPypiRepo: getsentry/pypi
2628
changelog: CHANGELOG.md
2729
changelogPolicy: auto

‎.github/workflows/test-common.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ jobs:
2424
continue-on-error: true
2525
strategy:
2626
matrix:
27-
os: [ubuntu-latest]
27+
# python3.6 reached EOL and is no longer being supported on
28+
# new versions of hosted runners on Github Actions
29+
# ubuntu-20.04 is the last version that supported python3.6
30+
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
31+
os: [ubuntu-20.04]
2832
python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
2933
services:
3034
postgres:
@@ -51,15 +55,10 @@ jobs:
5155
python-version: ${{ matrix.python-version }}
5256

5357
- name: Setup Test Env
54-
env:
55-
PGHOST: localhost
56-
PGPASSWORD: sentry
5758
run: |
5859
pip install codecov tox
5960
6061
- name: Run Tests
61-
env:
62-
CI_PYTHON_VERSION: ${{ matrix.python-version }}
6362
timeout-minutes: 45
6463
shell: bash
6564
run: |
@@ -69,4 +68,4 @@ jobs:
6968
./scripts/runtox.sh "py${{ matrix.python-version }}$" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch --ignore=tests/integrations
7069
coverage combine .coverage*
7170
coverage xml -i
72-
codecov --file coverage.xml
71+
codecov --file coverage.xml

‎.github/workflows/test-integration-aiohttp.yml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,16 @@ jobs:
2727
name: aiohttp, python ${{ matrix.python-version }}, ${{ matrix.os }}
2828
runs-on: ${{ matrix.os }}
2929
timeout-minutes: 45
30-
continue-on-error: true
3130

3231
strategy:
32+
fail-fast: false
3333
matrix:
3434
python-version: ["3.7","3.8","3.9","3.10"]
35-
os: [ubuntu-latest]
35+
# python3.6 reached EOL and is no longer being supported on
36+
# new versions of hosted runners on Github Actions
37+
# ubuntu-20.04 is the last version that supported python3.6
38+
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
39+
os: [ubuntu-20.04]
3640

3741
steps:
3842
- uses: actions/checkout@v3
@@ -41,15 +45,10 @@ jobs:
4145
python-version: ${{ matrix.python-version }}
4246

4347
- name: Setup Test Env
44-
env:
45-
PGHOST: localhost
46-
PGPASSWORD: sentry
4748
run: |
48-
pip install codecov tox
49+
pip install codecov "tox>=3,<4"
4950
5051
- name: Test aiohttp
51-
env:
52-
CI_PYTHON_VERSION: ${{ matrix.python-version }}
5352
timeout-minutes: 45
5453
shell: bash
5554
run: |
@@ -60,3 +59,15 @@ jobs:
6059
coverage combine .coverage*
6160
coverage xml -i
6261
codecov --file coverage.xml
62+
63+
check_required_tests:
64+
name: All aiohttp tests passed or skipped
65+
needs: test
66+
# Always run this, even if a dependent job failed
67+
if: always()
68+
runs-on: ubuntu-20.04
69+
steps:
70+
- name: Check for failures
71+
if: contains(needs.test.result, 'failure')
72+
run: |
73+
echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1

‎.github/workflows/test-integration-asgi.yml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,16 @@ jobs:
2727
name: asgi, python ${{ matrix.python-version }}, ${{ matrix.os }}
2828
runs-on: ${{ matrix.os }}
2929
timeout-minutes: 45
30-
continue-on-error: true
3130

3231
strategy:
32+
fail-fast: false
3333
matrix:
3434
python-version: ["3.7","3.8","3.9","3.10"]
35-
os: [ubuntu-latest]
35+
# python3.6 reached EOL and is no longer being supported on
36+
# new versions of hosted runners on Github Actions
37+
# ubuntu-20.04 is the last version that supported python3.6
38+
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
39+
os: [ubuntu-20.04]
3640

3741
steps:
3842
- uses: actions/checkout@v3
@@ -41,15 +45,10 @@ jobs:
4145
python-version: ${{ matrix.python-version }}
4246

4347
- name: Setup Test Env
44-
env:
45-
PGHOST: localhost
46-
PGPASSWORD: sentry
4748
run: |
48-
pip install codecov tox
49+
pip install codecov "tox>=3,<4"
4950
5051
- name: Test asgi
51-
env:
52-
CI_PYTHON_VERSION: ${{ matrix.python-version }}
5352
timeout-minutes: 45
5453
shell: bash
5554
run: |
@@ -60,3 +59,15 @@ jobs:
6059
coverage combine .coverage*
6160
coverage xml -i
6261
codecov --file coverage.xml
62+
63+
check_required_tests:
64+
name: All asgi tests passed or skipped
65+
needs: test
66+
# Always run this, even if a dependent job failed
67+
if: always()
68+
runs-on: ubuntu-20.04
69+
steps:
70+
- name: Check for failures
71+
if: contains(needs.test.result, 'failure')
72+
run: |
73+
echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1

‎.github/workflows/test-integration-aws_lambda.yml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,16 @@ jobs:
2727
name: aws_lambda, python ${{ matrix.python-version }}, ${{ matrix.os }}
2828
runs-on: ${{ matrix.os }}
2929
timeout-minutes: 45
30-
continue-on-error: true
3130

3231
strategy:
32+
fail-fast: false
3333
matrix:
3434
python-version: ["3.7"]
35-
os: [ubuntu-latest]
35+
# python3.6 reached EOL and is no longer being supported on
36+
# new versions of hosted runners on Github Actions
37+
# ubuntu-20.04 is the last version that supported python3.6
38+
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
39+
os: [ubuntu-20.04]
3640

3741
steps:
3842
- uses: actions/checkout@v3
@@ -41,15 +45,10 @@ jobs:
4145
python-version: ${{ matrix.python-version }}
4246

4347
- name: Setup Test Env
44-
env:
45-
PGHOST: localhost
46-
PGPASSWORD: sentry
4748
run: |
48-
pip install codecov tox
49+
pip install codecov "tox>=3,<4"
4950
5051
- name: Test aws_lambda
51-
env:
52-
CI_PYTHON_VERSION: ${{ matrix.python-version }}
5352
timeout-minutes: 45
5453
shell: bash
5554
run: |
@@ -60,3 +59,15 @@ jobs:
6059
coverage combine .coverage*
6160
coverage xml -i
6261
codecov --file coverage.xml
62+
63+
check_required_tests:
64+
name: All aws_lambda tests passed or skipped
65+
needs: test
66+
# Always run this, even if a dependent job failed
67+
if: always()
68+
runs-on: ubuntu-20.04
69+
steps:
70+
- name: Check for failures
71+
if: contains(needs.test.result, 'failure')
72+
run: |
73+
echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1

‎.github/workflows/test-integration-beam.yml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,16 @@ jobs:
2727
name: beam, python ${{ matrix.python-version }}, ${{ matrix.os }}
2828
runs-on: ${{ matrix.os }}
2929
timeout-minutes: 45
30-
continue-on-error: true
3130

3231
strategy:
32+
fail-fast: false
3333
matrix:
3434
python-version: ["3.7"]
35-
os: [ubuntu-latest]
35+
# python3.6 reached EOL and is no longer being supported on
36+
# new versions of hosted runners on Github Actions
37+
# ubuntu-20.04 is the last version that supported python3.6
38+
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
39+
os: [ubuntu-20.04]
3640

3741
steps:
3842
- uses: actions/checkout@v3
@@ -41,15 +45,10 @@ jobs:
4145
python-version: ${{ matrix.python-version }}
4246

4347
- name: Setup Test Env
44-
env:
45-
PGHOST: localhost
46-
PGPASSWORD: sentry
4748
run: |
48-
pip install codecov tox
49+
pip install codecov "tox>=3,<4"
4950
5051
- name: Test beam
51-
env:
52-
CI_PYTHON_VERSION: ${{ matrix.python-version }}
5352
timeout-minutes: 45
5453
shell: bash
5554
run: |
@@ -60,3 +59,15 @@ jobs:
6059
coverage combine .coverage*
6160
coverage xml -i
6261
codecov --file coverage.xml
62+
63+
check_required_tests:
64+
name: All beam tests passed or skipped
65+
needs: test
66+
# Always run this, even if a dependent job failed
67+
if: always()
68+
runs-on: ubuntu-20.04
69+
steps:
70+
- name: Check for failures
71+
if: contains(needs.test.result, 'failure')
72+
run: |
73+
echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1

‎.github/workflows/test-integration-boto3.yml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,16 @@ jobs:
2727
name: boto3, python ${{ matrix.python-version }}, ${{ matrix.os }}
2828
runs-on: ${{ matrix.os }}
2929
timeout-minutes: 45
30-
continue-on-error: true
3130

3231
strategy:
32+
fail-fast: false
3333
matrix:
3434
python-version: ["2.7","3.6","3.7","3.8"]
35-
os: [ubuntu-latest]
35+
# python3.6 reached EOL and is no longer being supported on
36+
# new versions of hosted runners on Github Actions
37+
# ubuntu-20.04 is the last version that supported python3.6
38+
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
39+
os: [ubuntu-20.04]
3640

3741
steps:
3842
- uses: actions/checkout@v3
@@ -41,15 +45,10 @@ jobs:
4145
python-version: ${{ matrix.python-version }}
4246

4347
- name: Setup Test Env
44-
env:
45-
PGHOST: localhost
46-
PGPASSWORD: sentry
4748
run: |
48-
pip install codecov tox
49+
pip install codecov "tox>=3,<4"
4950
5051
- name: Test boto3
51-
env:
52-
CI_PYTHON_VERSION: ${{ matrix.python-version }}
5352
timeout-minutes: 45
5453
shell: bash
5554
run: |
@@ -60,3 +59,15 @@ jobs:
6059
coverage combine .coverage*
6160
coverage xml -i
6261
codecov --file coverage.xml
62+
63+
check_required_tests:
64+
name: All boto3 tests passed or skipped
65+
needs: test
66+
# Always run this, even if a dependent job failed
67+
if: always()
68+
runs-on: ubuntu-20.04
69+
steps:
70+
- name: Check for failures
71+
if: contains(needs.test.result, 'failure')
72+
run: |
73+
echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1

‎.github/workflows/test-integration-bottle.yml

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,16 @@ jobs:
2727
name: bottle, python ${{ matrix.python-version }}, ${{ matrix.os }}
2828
runs-on: ${{ matrix.os }}
2929
timeout-minutes: 45
30-
continue-on-error: true
3130

3231
strategy:
32+
fail-fast: false
3333
matrix:
3434
python-version: ["2.7","3.5","3.6","3.7","3.8","3.9","3.10"]
35-
os: [ubuntu-latest]
35+
# python3.6 reached EOL and is no longer being supported on
36+
# new versions of hosted runners on Github Actions
37+
# ubuntu-20.04 is the last version that supported python3.6
38+
# see https://github.com/actions/setup-python/issues/544#issuecomment-1332535877
39+
os: [ubuntu-20.04]
3640

3741
steps:
3842
- uses: actions/checkout@v3
@@ -41,15 +45,10 @@ jobs:
4145
python-version: ${{ matrix.python-version }}
4246

4347
- name: Setup Test Env
44-
env:
45-
PGHOST: localhost
46-
PGPASSWORD: sentry
4748
run: |
48-
pip install codecov tox
49+
pip install codecov "tox>=3,<4"
4950
5051
- name: Test bottle
51-
env:
52-
CI_PYTHON_VERSION: ${{ matrix.python-version }}
5352
timeout-minutes: 45
5453
shell: bash
5554
run: |
@@ -60,3 +59,15 @@ jobs:
6059
coverage combine .coverage*
6160
coverage xml -i
6261
codecov --file coverage.xml
62+
63+
check_required_tests:
64+
name: All bottle tests passed or skipped
65+
needs: test
66+
# Always run this, even if a dependent job failed
67+
if: always()
68+
runs-on: ubuntu-20.04
69+
steps:
70+
- name: Check for failures
71+
if: contains(needs.test.result, 'failure')
72+
run: |
73+
echo "One of the dependent jobs have failed. You may need to re-run it." && exit 1

0 commit comments

Comments
 (0)