Skip to content

Revert pyproject.toml changes, refactor sed command#720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rithikanarayan merged 7 commits into from
Feb 6, 2026
Merged

Revert pyproject.toml changes, refactor sed command #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9cdd1e9
Revert pyproject.toml changes and add environment variable for ddtrac…
rithikanarayan Feb 4, 2026
d3a0714
version typo
rithikanarayan Feb 4, 2026
97bd3f5
add commit branch variable
rithikanarayan Feb 4, 2026
f3ec180
prints
rithikanarayan Feb 4, 2026
af375fd
fix environment variable checks
rithikanarayan Feb 4, 2026
a606615
Remove debug prints
rithikanarayan Feb 4, 2026
19c28e8
eof newline
rithikanarayan Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions .github/workflows/build_layer.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,15 +34,10 @@ jobs:
pip download --no-index --no-deps --find-links https://dd-trace-py-builds.s3.amazonaws.com/main/index.html --pre --python-version "${{ matrix.python_version}}" --platform "${PLATFORM_TAG}" ddtrace
echo "wheel_path=$(find . -name "*.whl" | head -n 1)" >> $GITHUB_OUTPUT

- name: Patch pyproject.toml
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

- name: Build layer for Python ${{ matrix.python_version }} on ${{ matrix.arch }}
run: |
echo "Building layer for Python ${{ matrix.python_version }} on ${{ matrix.arch }}"
ARCH=${{ matrix.arch }} PYTHON_VERSION=${{ matrix.python_version }} ./scripts/build_layers.sh
ARCH=${{ matrix.arch }} PYTHON_VERSION=${{ matrix.python_version }} DD_TRACE_WHEEL="${{ steps.find-ddtrace-wheel.outputs.wheel_path }}" ./scripts/build_layers.sh

- name: Upload layer artifact
uses: actions/upload-artifact@v4
Expand Down
28 changes: 4 additions & 24 deletions pyproject.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,31 +3,19 @@ name = "datadog_lambda"
version = "8.123.0.dev0"
description = "The Datadog AWS Lambda Library"
authors = ["Datadog, Inc. <dev@datadoghq.com>"]

[project]
name = "datadog_lambda"

@duncanistaduncanistaFeb 5, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

why is this removed?

@rithikanarayanrithikanarayanFeb 5, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

had to duplicate the poetry and project sections in december to support two versions of ddtrace based on python runtime, deduped in response to this issue.

@rithikanarayanrithikanarayanFeb 5, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

first PR to branch ddtrace versions, original dedup PR that had to be reverted

license = "Apache-2.0"
readme = "README.md"
requires-python = ">=3.8.0,<4"

@duncanistaduncanistaFeb 5, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

why are we removing this?

repository = "https://github.com/DataDog/datadog-lambda-python"
keywords = [
"datadog",
"aws",
"lambda",
"layer",
]
dependencies = [
"datadog>=0.51.0,<1.0.0",
"wrapt>=1.11.2,<2",
"ddtrace>=3.19.1,<4; python_version>='3.9.0' and python_version < '3.10'",
"ddtrace>=4.1.1,<5; python_version>='3.10.0'",
"ujson>=5.9.0",
]
packages = [
{ include = "datadog_lambda" }
]
classifiers = [
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
Expand All@@ -37,13 +25,14 @@ classifiers = [
"Programming Language :: Python :: 3.14",
]

# can remove tool.poetry.depencies and tool.poetry.extras
# after deprecation of Python 3.8
[tool.poetry.dependencies]
python = ">=3.8.0,<4"
datadog = ">=0.51.0,<1.0.0"
wrapt = "^1.11.2"
ddtrace = ">=3.19.1,<4"
ddtrace = [
{version = ">=3.19.1,<4", python = ">=3.8,<3.10"},
{version = ">=4.1.1,<5", python = ">=3.10"}
]
ujson = ">=5.9.0"
botocore = { version = "^1.34.0", optional = true }
requests = { version ="^2.22.0", optional = true }
Expand All@@ -60,15 +49,6 @@ dev = [
"requests",
]

[project.optional-dependencies]
dev = [
"botocore>=1.34.0,<2",
"requests>=2.22.0,<3",
"pytest>=8.0.0,<9",
"pytest-benchmark>=4.0,<5",
"flake8>=5.0.4,<6",
]

[build-system]
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"
Expand Down
8 changes: 8 additions & 0 deletions scripts/build_layers.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,6 +46,14 @@ else
PYTHON_VERSIONS=$PYTHON_VERSION
fi

# Replace ddtrace wheel used if necessary
if [ -n "$DD_TRACE_COMMIT_BRANCH" ]; then
sed -z -E -i 's|(ddtrace = )\[[^]]*]|\1{ git = "https://github.com/DataDog/dd-trace-py.git", branch = \"'"$DD_TRACE_COMMIT_BRANCH"'\" }|g' pyproject.toml
else
if [ -n "$DD_TRACE_WHEEL" ]; then
sed -z -E -i 's|(ddtrace = )\[[^]]*]|\1{ file = "'"$DD_TRACE_WHEEL"'" }|g' pyproject.toml
fi
fi

function make_path_absolute {
echo "$(cd "$(dirname "$1")"; pwd)/$(basename "$1")"
Expand Down
Loading