Skip to content

Commit 1afaf6b

Browse files
sentrivanasentrivana
authored
chore: Drop 3.6 from CI (#5036)
### Description Remove 3.6 from CI and CI templates on the new major branch. #### Issues Closes #4999 #### Reminders - Please add tests to validate your changes, and lint your code using `tox -e linters`. - Add GH Issue ID _&_ Linear ID (if applicable) - PR title should use [conventional commit](https://develop.sentry.dev/engineering-practices/commit-messages/#type) style (`feat:`, `fix:`, `ref:`, `meta:`) - For external contributors: [CONTRIBUTING.md](https://github.com/getsentry/sentry-python/blob/master/CONTRIBUTING.md), [Sentry SDK development docs](https://develop.sentry.dev/sdk/), [Discord community](https://discord.gg/Ww9hbqr)
1 parent fefaa38 commit 1afaf6b

20 files changed

+117
-310
lines changed

‎.github/workflows/enforce-license-compliance.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- master
77
- main
88
- release/*
9-
- potel-base
9+
- major/**
1010
pull_request:
1111

1212
# Cancel in progress workflows on pull_requests.

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,10 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
python-version: ["3.8","3.9","3.10","3.11","3.12","3.13","3.14","3.14t"]
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
3733
os: [ubuntu-22.04]
38-
# Use Docker container only for Python 3.6
39-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
4034
steps:
4135
- uses: actions/[email protected]
4236
- uses: actions/setup-python@v6
43-
if: ${{ matrix.python-version != '3.6' }}
4437
with:
4538
python-version: ${{ matrix.python-version }}
4639
allow-prereleases: true
@@ -102,14 +95,8 @@ jobs:
10295
run: |
10396
set -x # print commands that are executed
10497
./scripts/runtox.sh "py${{ matrix.python-version }}-pydantic_ai"
105-
- name: Generate coverage XML (Python 3.6)
106-
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
107-
run: |
108-
export COVERAGE_RCFILE=.coveragerc36
109-
coverage combine .coverage-sentry-*
110-
coverage xml --ignore-errors
11198
- name: Generate coverage XML
112-
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
99+
if: ${{ !cancelled() }}
113100
run: |
114101
coverage combine .coverage-sentry-*
115102
coverage xml

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

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,15 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13","3.14","3.14t"]
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
32+
python-version: ["3.7","3.8","3.9","3.10","3.11","3.12","3.13","3.14","3.14t"]
3733
os: [ubuntu-22.04]
3834
services:
3935
docker:
4036
image: docker:dind # Required for Docker network management
4137
options: --privileged # Required for Docker-in-Docker operations
42-
# Use Docker container only for Python 3.6
43-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
4438
steps:
4539
- uses: actions/[email protected]
4640
- uses: actions/setup-python@v6
47-
if: ${{ matrix.python-version != '3.6' }}
4841
with:
4942
python-version: ${{ matrix.python-version }}
5043
allow-prereleases: true
@@ -74,14 +67,8 @@ jobs:
7467
run: |
7568
set -x # print commands that are executed
7669
./scripts/runtox.sh "py${{ matrix.python-version }}-gcp"
77-
- name: Generate coverage XML (Python 3.6)
78-
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
79-
run: |
80-
export COVERAGE_RCFILE=.coveragerc36
81-
coverage combine .coverage-sentry-*
82-
coverage xml --ignore-errors
8370
- name: Generate coverage XML
84-
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
71+
if: ${{ !cancelled() }}
8572
run: |
8673
coverage combine .coverage-sentry-*
8774
coverage xml

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

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,11 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13","3.14","3.14t"]
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
32+
python-version: ["3.7","3.8","3.9","3.10","3.11","3.12","3.13","3.14","3.14t"]
3733
os: [ubuntu-22.04]
38-
# Use Docker container only for Python 3.6
39-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
4034
steps:
4135
- uses: actions/[email protected]
4236
- uses: actions/setup-python@v6
43-
if: ${{ matrix.python-version != '3.6' }}
4437
with:
4538
python-version: ${{ matrix.python-version }}
4639
allow-prereleases: true
@@ -54,14 +47,8 @@ jobs:
5447
run: |
5548
set -x # print commands that are executed
5649
./scripts/runtox.sh "py${{ matrix.python-version }}-common"
57-
- name: Generate coverage XML (Python 3.6)
58-
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
59-
run: |
60-
export COVERAGE_RCFILE=.coveragerc36
61-
coverage combine .coverage-sentry-*
62-
coverage xml --ignore-errors
6350
- name: Generate coverage XML
64-
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
51+
if: ${{ !cancelled() }}
6552
run: |
6653
coverage combine .coverage-sentry-*
6754
coverage xml

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

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","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
32+
python-version: ["3.7","3.8","3.9","3.10","3.11","3.12","3.13"]
3733
os: [ubuntu-22.04]
3834
services:
3935
postgres:
@@ -50,15 +46,12 @@ jobs:
5046
ports:
5147
- 5432:5432
5248
env:
53-
SENTRY_PYTHON_TEST_POSTGRES_HOST: ${{ matrix.python-version == '3.6' && 'postgres' || 'localhost' }}
49+
SENTRY_PYTHON_TEST_POSTGRES_HOST: localhost
5450
SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
5551
SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
56-
# Use Docker container only for Python 3.6
57-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
5852
steps:
5953
- uses: actions/[email protected]
6054
- uses: actions/setup-python@v6
61-
if: ${{ matrix.python-version != '3.6' }}
6255
with:
6356
python-version: ${{ matrix.python-version }}
6457
allow-prereleases: true
@@ -94,14 +87,8 @@ jobs:
9487
run: |
9588
set -x # print commands that are executed
9689
./scripts/runtox.sh "py${{ matrix.python-version }}-sqlalchemy"
97-
- name: Generate coverage XML (Python 3.6)
98-
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
99-
run: |
100-
export COVERAGE_RCFILE=.coveragerc36
101-
coverage combine .coverage-sentry-*
102-
coverage xml --ignore-errors
10390
- name: Generate coverage XML
104-
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
91+
if: ${{ !cancelled() }}
10592
run: |
10693
coverage combine .coverage-sentry-*
10794
coverage xml

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,10 @@ jobs:
3030
fail-fast: false
3131
matrix:
3232
python-version: ["3.7","3.8","3.9","3.12","3.13","3.14","3.14t"]
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
3733
os: [ubuntu-22.04]
38-
# Use Docker container only for Python 3.6
39-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
4034
steps:
4135
- uses: actions/[email protected]
4236
- uses: actions/setup-python@v6
43-
if: ${{ matrix.python-version != '3.6' }}
4437
with:
4538
python-version: ${{ matrix.python-version }}
4639
allow-prereleases: true
@@ -66,14 +59,8 @@ jobs:
6659
run: |
6760
set -x # print commands that are executed
6861
./scripts/runtox.sh "py${{ matrix.python-version }}-unleash"
69-
- name: Generate coverage XML (Python 3.6)
70-
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
71-
run: |
72-
export COVERAGE_RCFILE=.coveragerc36
73-
coverage combine .coverage-sentry-*
74-
coverage xml --ignore-errors
7562
- name: Generate coverage XML
76-
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
63+
if: ${{ !cancelled() }}
7764
run: |
7865
coverage combine .coverage-sentry-*
7966
coverage xml

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

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,11 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
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
32+
python-version: ["3.8","3.10","3.11","3.12"]
3733
os: [ubuntu-22.04]
38-
# Use Docker container only for Python 3.6
39-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
4034
steps:
4135
- uses: actions/[email protected]
4236
- uses: actions/setup-python@v6
43-
if: ${{ matrix.python-version != '3.6' }}
4437
with:
4538
python-version: ${{ matrix.python-version }}
4639
allow-prereleases: true
@@ -54,14 +47,8 @@ jobs:
5447
run: |
5548
set -x # print commands that are executed
5649
./scripts/runtox.sh "py${{ matrix.python-version }}-gevent"
57-
- name: Generate coverage XML (Python 3.6)
58-
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
59-
run: |
60-
export COVERAGE_RCFILE=.coveragerc36
61-
coverage combine .coverage-sentry-*
62-
coverage xml --ignore-errors
6350
- name: Generate coverage XML
64-
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
51+
if: ${{ !cancelled() }}
6552
run: |
6653
coverage combine .coverage-sentry-*
6754
coverage xml

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

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,11 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
python-version: ["3.6","3.8","3.9","3.10","3.11","3.12","3.13","3.14","3.14t"]
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
32+
python-version: ["3.7","3.8","3.9","3.10","3.11","3.12","3.13","3.14","3.14t"]
3733
os: [ubuntu-22.04]
38-
# Use Docker container only for Python 3.6
39-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
4034
steps:
4135
- uses: actions/[email protected]
4236
- uses: actions/setup-python@v6
43-
if: ${{ matrix.python-version != '3.6' }}
4437
with:
4538
python-version: ${{ matrix.python-version }}
4639
allow-prereleases: true
@@ -66,14 +59,8 @@ jobs:
6659
run: |
6760
set -x # print commands that are executed
6861
./scripts/runtox.sh "py${{ matrix.python-version }}-strawberry"
69-
- name: Generate coverage XML (Python 3.6)
70-
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
71-
run: |
72-
export COVERAGE_RCFILE=.coveragerc36
73-
coverage combine .coverage-sentry-*
74-
coverage xml --ignore-errors
7562
- name: Generate coverage XML
76-
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
63+
if: ${{ !cancelled() }}
7764
run: |
7865
coverage combine .coverage-sentry-*
7966
coverage xml

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

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,11 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13","3.14","3.14t"]
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
32+
python-version: ["3.7","3.8","3.9","3.10","3.11","3.12","3.13","3.14","3.14t"]
3733
os: [ubuntu-22.04]
38-
# Use Docker container only for Python 3.6
39-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
4034
steps:
4135
- uses: actions/[email protected]
4236
- uses: actions/setup-python@v6
43-
if: ${{ matrix.python-version != '3.6' }}
4437
with:
4538
python-version: ${{ matrix.python-version }}
4639
allow-prereleases: true
@@ -74,14 +67,8 @@ jobs:
7467
run: |
7568
set -x # print commands that are executed
7669
./scripts/runtox.sh "py${{ matrix.python-version }}-typer"
77-
- name: Generate coverage XML (Python 3.6)
78-
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
79-
run: |
80-
export COVERAGE_RCFILE=.coveragerc36
81-
coverage combine .coverage-sentry-*
82-
coverage xml --ignore-errors
8370
- name: Generate coverage XML
84-
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
71+
if: ${{ !cancelled() }}
8572
run: |
8673
coverage combine .coverage-sentry-*
8774
coverage xml

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

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,11 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
python-version: ["3.6","3.7","3.8","3.9","3.10","3.11","3.12","3.13","3.14","3.14t"]
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
32+
python-version: ["3.7","3.8","3.9","3.10","3.11","3.12","3.13","3.14","3.14t"]
3733
os: [ubuntu-22.04]
38-
# Use Docker container only for Python 3.6
39-
container: ${{ matrix.python-version == '3.6' && 'python:3.6' || null }}
4034
steps:
4135
- uses: actions/[email protected]
4236
- uses: actions/setup-python@v6
43-
if: ${{ matrix.python-version != '3.6' }}
4437
with:
4538
python-version: ${{ matrix.python-version }}
4639
allow-prereleases: true
@@ -62,14 +55,8 @@ jobs:
6255
run: |
6356
set -x # print commands that are executed
6457
./scripts/runtox.sh "py${{ matrix.python-version }}-requests"
65-
- name: Generate coverage XML (Python 3.6)
66-
if: ${{ !cancelled() && matrix.python-version == '3.6' }}
67-
run: |
68-
export COVERAGE_RCFILE=.coveragerc36
69-
coverage combine .coverage-sentry-*
70-
coverage xml --ignore-errors
7158
- name: Generate coverage XML
72-
if: ${{ !cancelled() && matrix.python-version != '3.6' }}
59+
if: ${{ !cancelled() }}
7360
run: |
7461
coverage combine .coverage-sentry-*
7562
coverage xml

0 commit comments

Comments
 (0)