Skip to content

Commit a11af21

Browse files
committed
Drop support for Python < 3.7
Includes: - pinning images and package dependencies in CircleCI - removing stale `master` branch - dropping pylons framework test - updating versioning documentation - drop Python < 3.7 as supported on setup.py - removing pylons/boto from CI suitespec - release note for 2.0
1 parent db7372d commit a11af21

File tree

442 files changed

+518
-14796
lines changed

Some content is hidden

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

442 files changed

+518
-14796
lines changed

.circleci/config.templ.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -449,12 +449,12 @@ jobs:
449449
- run_test:
450450
pattern: 'vendor'
451451

452-
boto:
452+
botocore:
453453
<<: *machine_executor
454454
parallelism: 6
455455
steps:
456456
- run_test:
457-
pattern: '^boto' # run boto and botocore
457+
pattern: 'botocore'
458458
snapshot: true
459459
docker_services: "localstack"
460460

@@ -493,16 +493,6 @@ jobs:
493493
snapshot: true
494494
docker_services: 'postgres'
495495

496-
pylons:
497-
<<: *contrib_job_small
498-
docker:
499-
- image: *ddtrace_dev_image
500-
- *testagent
501-
steps:
502-
- run_test:
503-
pattern: 'pylons'
504-
trace_agent_url: "http://localhost:8126"
505-
506496
aiohttp:
507497
<<: *machine_executor
508498
parallelism: 3

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ jobs:
3838
workflows:
3939
setup:
4040
jobs:
41-
- setup
41+
- setup

.github/workflows/build_deploy.yml

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -24,68 +24,6 @@ on:
2424
- cron: 0 2 * * 2-6
2525

2626
jobs:
27-
build_wheels_py27_35:
28-
name: Build and test wheels on ${{ matrix.os }} (${{ matrix.archs }})
29-
runs-on: ${{ matrix.os }}
30-
strategy:
31-
matrix:
32-
include:
33-
- os: ubuntu-latest
34-
archs: x86_64 i686
35-
- os: ubuntu-latest
36-
archs: aarch64
37-
- os: windows-latest
38-
archs: AMD64 x86
39-
- os: macos-latest
40-
# universal2 and arm64 builds require CPython 3.8 or newer:
41-
# https://cibuildwheel.readthedocs.io/en/stable/faq/#universal2
42-
archs: x86_64 universal2
43-
steps:
44-
- uses: actions/checkout@v3
45-
# Include all history and tags
46-
with:
47-
fetch-depth: 0
48-
49-
- uses: actions/setup-python@v4
50-
name: Install Python
51-
with:
52-
python-version: '3.8'
53-
54-
- name: Set up QEMU
55-
if: runner.os == 'Linux'
56-
uses: docker/setup-qemu-action@v2
57-
with:
58-
platforms: all
59-
60-
- name: Build wheels python 2.7 and 3.5
61-
uses: joerick/[email protected]
62-
env:
63-
# configure cibuildwheel to build native archs ('auto'), and some
64-
# emulated ones
65-
CIBW_ARCHS: ${{ matrix.archs }}
66-
# PyPY is not supported
67-
# Windows 2.7 wheels no longer can be built https://github.com/DataDog/dd-trace-py/pull/2344
68-
CIBW_SKIP: cp27-win*
69-
CIBW_BUILD: cp27* cp35*
70-
# Run a smoke test on every supported platform
71-
CIBW_TEST_COMMAND: python {project}/tests/smoke_test.py
72-
# Testing arm on MacOS is currently not supported by Github
73-
CIBW_TEST_SKIP: "*-macosx_universal2:arm64"
74-
# Workaround for Macos 11.0 versioning issue, a.k.a.
75-
# `platform.mac_ver()` reports incorrect MacOS version at 11.0
76-
# See: https://stackoverflow.com/a/65402241
77-
CIBW_ENVIRONMENT_MACOS: SYSTEM_VERSION_COMPAT=0
78-
CMAKE_BUILD_PARALLEL_LEVEL: 12
79-
80-
- uses: actions/upload-artifact@v3
81-
with:
82-
path: ./wheelhouse/*.whl
83-
84-
build_wheels_py36:
85-
uses: ./.github/workflows/build_python_3.yml
86-
with:
87-
cibw_build: 'cp36*'
88-
8927
build_wheels_py37:
9028
uses: ./.github/workflows/build_python_3.yml
9129
with:
@@ -171,7 +109,6 @@ jobs:
171109

172110
upload_pypi:
173111
needs:
174-
- build_wheels_py27_35
175112
- build_wheels_py36
176113
- build_wheels_py37
177114
- build_wheels_py38

.github/workflows/changelog.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: Changelog
22
on:
33
push:
44
branches:
5-
- master
65
- 0.x
76
- 1.x
87
pull_request:

.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ name: "CodeQL"
33
on:
44
push:
55
branches:
6-
- master
76
- 0.x
87
- 1.x
98
pull_request:
109
# The branches below must be a subset of the branches above
1110
branches:
12-
- master
1311
- 0.x
1412
- 1.x
1513

.github/workflows/requirements-locks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
2121

2222
- name: Set python interpreters
23-
run: pyenv global 3.10 2.7 3.5 3.6 3.7 3.8 3.9 3.11
23+
run: pyenv global 3.10 3.7 3.8 3.9 3.11
2424

2525
- name: Install Dependencies
2626
run: pip install --upgrade pip && pip install riot

.github/workflows/test_frameworks.yml

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ name: Framework tests
33
on:
44
push:
55
branches:
6-
- master
76
- 0.x
87
- 1.x
98
pull_request:
@@ -528,52 +527,6 @@ jobs:
528527
# Disable tests checking GC references since profiling can interfere
529528
run: ddtrace-run python -m pytest -k 'not test_record_gc and not test_record_get and not test_record_items and not test_record_iter' tests
530529

531-
pylons-testsuite-1_0_3:
532-
name: Pylons 1.0.3
533-
runs-on: "ubuntu-20.04"
534-
needs: needs-run
535-
# Ubuntu 20.04 is the last version of ubuntu on github setup actions to provide Python 2.7.
536-
container:
537-
image: python:2.7.18-buster
538-
env:
539-
DD_TESTING_RAISE: true
540-
PYTHONPATH: ../ddtrace/tests/debugging/exploration/
541-
CMAKE_BUILD_PARALLEL_LEVEL: 12
542-
defaults:
543-
run:
544-
working-directory: pylons
545-
steps:
546-
- uses: actions/checkout@v3
547-
if: needs.needs-run.outputs.outcome == 'success'
548-
with:
549-
path: ddtrace
550-
- uses: actions/checkout@v3
551-
if: needs.needs-run.outputs.outcome == 'success'
552-
with:
553-
repository: pylons/pylons
554-
ref: master
555-
path: pylons
556-
- name: Install ddtrace
557-
if: needs.needs-run.outputs.outcome == 'success'
558-
run: pip install ../ddtrace
559-
- name: Install test dependencies
560-
if: needs.needs-run.outputs.outcome == 'success'
561-
run: pip install -e .[test]
562-
- name: Pin PasteDeploy to Python 2.7 compatible version
563-
if: needs.needs-run.outputs.outcome == 'success'
564-
run: pip install pastedeploy==2.1.1
565-
- name: MarkupSafe fix
566-
if: needs.needs-run.outputs.outcome == 'success'
567-
run: pip install --upgrade MarkupSafe==0.18 pip setuptools --force
568-
- name: Disable failing tests
569-
if: needs.needs-run.outputs.outcome == 'success'
570-
run: |
571-
sed -i'' "s/test_detect_lang/detect_lang/g" tests/test_units/test_basic_app.py
572-
sed -i'' "s/test_langs/langs/g" tests/test_units/test_basic_app.py
573-
- name: Run tests
574-
if: needs.needs-run.outputs.outcome == 'success'
575-
run: nosetests
576-
577530
gunicorn-testsuite-20_1_0:
578531
name: gunicorn 20.1.0
579532
runs-on: "ubuntu-latest"

.riot/requirements/1017b7b.txt

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

.riot/requirements/10192c8.txt

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

.riot/requirements/102cf0a.txt

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,29 @@
22
# This file is autogenerated by pip-compile with Python 3.7
33
# by the following command:
44
#
5-
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/102cf0a.in
5+
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/102cf0a.in
66
#
77
attrs==23.1.0
8-
coverage[toml]==7.2.3
9-
exceptiongroup==1.1.1
8+
coverage[toml]==7.2.7
9+
exceptiongroup==1.1.2
1010
gevent==1.4.0
1111
greenlet==0.4.14
12-
gunicorn[gevent]==20.1.0
12+
gunicorn[gevent]==21.2.0
1313
hypothesis==6.45.0
14-
importlib-metadata==6.6.0
14+
importlib-metadata==6.7.0
1515
iniconfig==2.0.0
16-
mock==5.0.2
16+
mock==5.1.0
1717
opentracing==2.4.0
1818
packaging==23.1
19-
pluggy==1.0.0
19+
pluggy==1.2.0
2020
py-cpuinfo==8.0.0
21-
pytest==7.3.1
22-
pytest-asyncio==0.21.0
21+
pytest==7.4.0
22+
pytest-asyncio==0.21.1
2323
pytest-benchmark==4.0.0
24-
pytest-cov==4.0.0
25-
pytest-mock==3.10.0
24+
pytest-cov==4.1.0
25+
pytest-mock==3.11.1
2626
sortedcontainers==2.4.0
2727
tomli==2.0.1
28-
typing-extensions==4.7.0
28+
typing-extensions==4.7.1
2929
uwsgi==2.0.21
3030
zipp==3.15.0
31-
32-
# The following packages are considered to be unsafe in a requirements file:
33-
# setuptools

0 commit comments

Comments
 (0)