Revert pyproject.toml changes, refactor sed command by rithikanarayan · Pull Request #720 · DataDog/datadog-lambda-python · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 4 additions & 24 deletions pyproject.toml
Original file line number Diff line number Diff 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"
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?

Copy link
Copy Markdown
Contributor Author

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.

Copy link
Copy Markdown
Contributor Author

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"
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
Loading