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
483 changes: 343 additions & 140 deletions poetry.lock

Large diffs are not rendered by default.

18 changes: 14 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ classifiers = [
]

[tool.poetry.dependencies]
python = ">=3.8.0,<4"
python = ">=3.8.0,<3.15"
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.

I don't think we should pin this one. We'll just have to change it every time aws does a new language release. I think we should keep it to <4. Unless you have some reason otherwise?

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.

I had to add this when running poetry lock to make it compatible with dd-trace. Otherwise I get the following error:
image

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.

weird, ok sounds good

datadog = ">=0.51.0,<1.0.0"
wrapt = "^1.11.2"
ddtrace = [
Expand All @@ -35,11 +35,21 @@ ddtrace = [
]
ujson = [
{version = ">=5.10.0,<5.12.0", python = ">=3.8,<3.10"},
{version = ">=5.12.0", python = ">=3.10"}
{version = "^5.12.0", python = ">=3.10"},
]
urllib3 = [
{version = ">=1.25.4,<1.27", python = ">=3.8,<3.10"},
{version = "^2.6.3", python = ">=3.10"},
]
botocore = { version = "^1.34.0", optional = true }
requests = { version ="^2.22.0", optional = true }
pytest = { version= "^8.0.0", optional = true }
requests = [
{ version = "^2.22.0", optional = true, python = ">=3.8,<3.10" },
{ version = "^2.33.0", optional = true, python = ">=3.10" },
]
pytest = [
{ version = "^8.3.4", optional = true, python = ">=3.8,<3.10" },
{ version = "^9.0.3", optional = true, python = ">=3.10" },
]
pytest-benchmark = { version = "^4.0", optional = true }
flake8 = { version = "^5.0.4", optional = true }

Expand Down
123 changes: 99 additions & 24 deletions tests/integration/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions tests/integration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,11 @@
"devDependencies": {
"serverless-plugin-datadog": "^2.18.0",
"serverless-python-requirements": "^6.1.2"
},
"resolutions": {
"minimatch": "^3.1.3"
},
"overrides": {
"minimatch": "^3.1.3"
}
}
3 changes: 2 additions & 1 deletion tests/integration/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
certifi==2024.12.14
charset-normalizer==3.4.1
idna==3.10
requests==2.32.4
requests==2.32.4; python_version < "3.10"
requests==2.33.1; python_version >= "3.10"
Loading
Loading