Skip to content

Commit 80b92e2

Browse files
authored
Merge branch 'main' into tyler.finethy/repro-retry-failure
2 parents e9cac05 + 4059d22 commit 80b92e2

File tree

127 files changed

+9333
-2709
lines changed

Some content is hidden

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

127 files changed

+9333
-2709
lines changed

.github/CODEOWNERS

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,12 @@ ddtrace/internal/settings/_config.py @DataDog/python-guild @DataDog/ap
4545
docs/ @DataDog/python-guild
4646
tests/utils.py @DataDog/python-guild
4747
tests/suitespec.yml @DataDog/python-guild @DataDog/apm-core-python
48+
tests/contrib/suitespec.yml @DataDog/python-guild
49+
tests/contrib/flask/app.py @DataDog/python-guild
50+
tests/contrib/django/django1_app/urls.py @DataDog/python-guild
4851
tests/suitespec.py @DataDog/python-guild @DataDog/apm-core-python
4952
scripts/bump_ddtrace.py @DataDog/python-guild
53+
tests/smoke_test.py @DataDog/python-guild
5054

5155
# Core / Language Platform
5256
tests/internal @DataDog/apm-core-python
@@ -125,10 +129,9 @@ ddtrace/internal/iast/ @DataDog/asm-python
125129
tests/appsec/ @DataDog/asm-python
126130
tests/contrib/subprocess @DataDog/asm-python
127131
tests/snapshots/tests*appsec*.json @DataDog/asm-python
128-
tests/contrib/*/test*appsec*.py @DataDog/asm-python
129-
tests/contrib/*/test*iast*.py @DataDog/asm-python
130132
scripts/iast/* @DataDog/asm-python
131133

134+
132135
# Profiling
133136
ddtrace/profiling @DataDog/profiling-python
134137
ddtrace/internal/settings/profiling.py @DataDog/profiling-python
@@ -240,7 +243,7 @@ tests/contrib/azure_functions @DataDog/serverless
240243
tests/contrib/azure_functions_eventhubs @DataDog/serverless @DataDog/apm-serverless
241244
tests/contrib/azure_functions_servicebus @DataDog/serverless @DataDog/apm-serverless
242245
tests/contrib/azure_servicebus @DataDog/serverless @DataDog/apm-serverless
243-
tests/internal/test_serverless.py @DataDog/apm-core-python @DataDog/apm-serverless
246+
tests/internal/test_serverless.py @DataDog/apm-core-python @DataDog/apm-serverless @DataDog/asm-python
244247
tests/snapshots/tests.contrib.aws_lambda.*. @DataDog/apm-serverless
245248
tests/snapshots/tests.contrib.azure_eventhubs.* @DataDog/serverless @DataDog/apm-serverless
246249
tests/snapshots/tests.contrib.azure_functions.* @DataDog/serverless @DataDog/apm-serverless
@@ -251,3 +254,8 @@ tests/snapshots/tests.contrib.azure_servicebus.* @DataDog/serverless
251254
# Data Streams Monitoring
252255
ddtrace/internal/datastreams @DataDog/data-streams-monitoring
253256
tests/datastreams @DataDog/data-streams-monitoring
257+
258+
# ASM (order matters)
259+
tests/**/*appsec* @DataDog/asm-python
260+
tests/**/*iast* @DataDog/asm-python
261+
tests/tracer/test_propagation.py @DataDog/apm-sdk-capabilities-python @DataDog/asm-python

.github/workflows/build_deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
uses: ./.github/workflows/build_python_3.yml
7171
with:
7272
cibw_build: 'cp39* cp310* cp311* cp312* cp313* cp314*'
73-
cibw_skip: 'cp39-win_arm64 cp310-win_arm64 cp314t*'
73+
cibw_skip: 'cp39-win_arm64 cp310-win_arm64 cp314t* *_i686'
7474
library_version: ${{ needs.compute_version.outputs.library_version }}
7575

7676
build_sdist:

0 commit comments

Comments
 (0)