Skip to content

Commit b3dfe0e

Browse files
authored
Merge branch '3.3' into backport-12833-to-3.3
2 parents cb69ab0 + 07bde25 commit b3dfe0e

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.gitlab/benchmarks/serverless.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ benchmark-serverless:
77
project: DataDog/serverless-tools
88
strategy: depend
99
needs: []
10+
# TODO: Revert this once the build issue has been resolved
11+
allow_failure: true
1012
variables:
1113
UPSTREAM_PIPELINE_ID: $CI_PIPELINE_ID
1214
UPSTREAM_PROJECT_URL: $CI_PROJECT_URL

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Homepage = "https://github.com/DataDog/dd-trace-py"
7777
"Source Code" = "https://github.com/DataDog/dd-trace-py/"
7878

7979
[tool.setuptools_scm]
80-
version_scheme = "release-branch-semver" # Must be "release-branch-semver" for now in main, see https://github.com/DataDog/dd-trace-py/issues/8801
80+
version_scheme = "guess-next-dev" # Must be "release-branch-semver" for now in main, see https://github.com/DataDog/dd-trace-py/issues/8801
8181
write_to = "ddtrace/_version.py"
8282

8383
[tool.cython-lint]

0 commit comments

Comments
 (0)