Skip to content

Conversation

@rithikanarayan
Copy link
Contributor

@rithikanarayan rithikanarayan commented Jan 30, 2026

What does this PR do?

Dedups the poetry and project sections of the pyproject.toml file.

Motivation

Fixing dependency management of ddtrace version based on Python runtime in the PyPI wheel. Response to #713

Testing Guidelines

CI. Made a sample python package with the new format of the pyproject.toml file and uploaded it to the test PyPI website. Made sure that differentp Python runtimes depend on different versions of ddtrace and that Python 3.10+ users can customize which version of ddtrace 4.X they want to use.

Additional Notes

Types of Changes

  • Bug fix
  • New feature
  • Breaking change
  • Misc (docs, refactoring, dependency upgrade, etc.)

Check all that apply

  • This PR's description is comprehensive
  • This PR contains breaking changes that are documented in the description
  • This PR introduces new APIs or parameters that are documented and unlikely to change in the foreseeable future
  • This PR impacts documentation, and it has been updated (or a ticket has been logged)
  • This PR's changes are covered by the automated tests
  • This PR collects user input/sensitive content into Datadog
  • This PR passes the integration tests (ask a Datadog member to run the tests)

@rithikanarayan rithikanarayan marked this pull request as ready for review February 2, 2026 16:21
@rithikanarayan rithikanarayan requested review from a team as code owners February 2, 2026 16:21
run: |
echo "Patching pyproject.toml to use latest build of dd-trace-py"
sed -i 's|^ddtrace =.*$|ddtrace = { file = "${{ steps.find-ddtrace-wheel.outputs.wheel_path }}" }|' pyproject.toml
sed -zEi 's|^ddtrace =.*$|ddtrace = { file = "${{ steps.find-ddtrace-wheel.outputs.wheel_path }}" }|' pyproject.toml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious, what does this change do?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The workflow for the system-tests previously assumed that the ddtrace dependency definition would be on one line and this resulted in all of the Github actions (but not local or Gitlab) build layer jobs failing. This flag allows the more complex definition. @florentinl

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oooh, very nice!

@rithikanarayan rithikanarayan merged commit aee6842 into main Feb 2, 2026
105 checks passed
@rithikanarayan rithikanarayan deleted the rithika.narayan/fixing-wheel branch February 2, 2026 17:42
wrapt = "^1.11.2"
ddtrace = ">=3.19.1,<4"
ddtrace = [
{version = ">=3.19.1,<4", python = ">=3.8,<3.10"},
Copy link
Contributor

@taegyunkim taegyunkim Feb 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this syntax is poetry specific and invalid for pip's TOML parser causing build failures in
https://gitlab.ddbuild.io/DataDog/serverless-tools/-/jobs/1395912909
and https://github.com/DataDog/dd-trace-py/actions/runs/21604577086/job/62290700940?pr=16313

rithikanarayan added a commit that referenced this pull request Feb 3, 2026
rithikanarayan added a commit that referenced this pull request Feb 3, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants