Skip to content

Commit

Permalink
fix: accept default versions of common packages [INPLAT-220] [backpor…
Browse files Browse the repository at this point in the history
…t 2.15] (#11553)

Backport 383f836 from #11464 to 2.15.

This change lowers the minimum supported version of the `click` and
`jinja2` packages to include the default versions installed under Python
3.8.

## Checklist
- [x] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist
- [x] Reviewer has checked that all the criteria below are met 
- Title is accurate
- All changes are related to the pull request's stated goal
- Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- Testing strategy adequately addresses listed risks
- Newly-added code is easy to change
- Release note makes sense to a user of the library
- If necessary, author has acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment
- Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

Co-authored-by: Emmett Butler <[email protected]>
  • Loading branch information
github-actions[bot] and emmettbutler authored Nov 26, 2024
1 parent 7137ed0 commit b462888
Show file tree
Hide file tree
Showing 28 changed files with 389 additions and 390 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/100c918.in
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/1001365.in
#
attrs==23.1.0
attrs==24.2.0
coverage[toml]==7.2.7
exceptiongroup==1.2.0
exceptiongroup==1.2.2
hypothesis==6.45.0
importlib-metadata==6.7.0
iniconfig==2.0.0
jinja2==2.11.3
jinja2==2.10.3
markupsafe==1.1.1
mock==5.1.0
opentracing==2.4.0
packaging==23.2
packaging==24.0
pluggy==1.2.0
pytest==7.4.3
pytest==7.4.4
pytest-cov==4.1.0
pytest-mock==3.11.1
pytest-randomly==3.12.0
Expand Down
38 changes: 19 additions & 19 deletions .riot/requirements/4334c5c.txt → .riot/requirements/121cdba.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --allow-unsafe --no-annotate .riot/requirements/4334c5c.in
# pip-compile --no-annotate .riot/requirements/121cdba.in
#
annotated-types==0.7.0
attrs==24.2.0
aws-sam-translator==1.91.0
aws-sam-translator==1.92.0
aws-xray-sdk==2.14.0
boto==2.49.0
boto3==1.35.14
botocore==1.35.14
boto3==1.35.65
botocore==1.35.65
certifi==2024.8.30
cffi==1.17.1
cfn-lint==0.53.1
charset-normalizer==3.3.2
charset-normalizer==3.4.0
coverage[toml]==7.6.1
cryptography==43.0.1
cryptography==43.0.3
docker==7.1.0
ecdsa==0.14.1
exceptiongroup==1.2.2
hypothesis==6.45.0
idna==2.10
importlib-metadata==8.4.0
importlib-metadata==8.5.0
iniconfig==2.0.0
jinja2==2.11.3
jinja2==2.10.3
jmespath==1.0.1
jsondiff==2.2.1
jsonpatch==1.33
Expand All @@ -37,36 +37,36 @@ more-itertools==10.5.0
moto==1.3.16
networkx==2.8.8
opentracing==2.4.0
packaging==24.1
packaging==24.2
pluggy==1.5.0
pyasn1==0.6.0
pyasn1==0.6.1
pycparser==2.22
pydantic==2.9.0
pydantic-core==2.23.2
pydantic==2.9.2
pydantic-core==2.23.4
pynamodb==5.5.1
pyrsistent==0.20.0
pytest==8.3.2
pytest==8.3.3
pytest-cov==5.0.0
pytest-mock==3.14.0
pytest-randomly==3.15.0
python-dateutil==2.9.0.post0
python-jose[cryptography]==3.3.0
pytz==2024.1
pytz==2024.2
pyyaml==6.0.2
requests==2.32.3
responses==0.25.3
rsa==4.9
s3transfer==0.10.2
s3transfer==0.10.3
six==1.16.0
sortedcontainers==2.4.0
sshpubkeys==3.3.1
tomli==2.0.1
tomli==2.1.0
typing-extensions==4.12.2
urllib3==1.26.20
werkzeug==2.1.2
wrapt==1.16.0
xmltodict==0.13.0
zipp==3.20.1
xmltodict==0.14.2
zipp==3.20.2

# The following packages are considered to be unsafe in a requirements file:
setuptools==74.1.2
# setuptools
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile --allow-unsafe --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/1b3fcdf.in
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/130c755.in
#
annotated-types==0.5.0
attrs==24.2.0
Expand All @@ -14,17 +14,17 @@ botocore==1.33.13
certifi==2024.8.30
cffi==1.15.1
cfn-lint==0.53.1
charset-normalizer==3.3.2
charset-normalizer==3.4.0
coverage[toml]==7.2.7
cryptography==43.0.1
cryptography==43.0.3
docker==6.1.3
ecdsa==0.14.1
exceptiongroup==1.2.2
hypothesis==6.45.0
idna==2.10
importlib-metadata==6.7.0
iniconfig==2.0.0
jinja2==2.11.3
jinja2==2.10.3
jmespath==1.0.1
jsondiff==2.0.0
jsonpatch==1.33
Expand All @@ -51,7 +51,7 @@ pytest-mock==3.11.1
pytest-randomly==3.12.0
python-dateutil==2.9.0.post0
python-jose[cryptography]==3.3.0
pytz==2024.1
pytz==2024.2
pyyaml==6.0.1
requests==2.31.0
responses==0.23.3
Expand All @@ -67,8 +67,8 @@ urllib3==1.26.20
websocket-client==1.6.1
werkzeug==2.1.2
wrapt==1.16.0
xmltodict==0.13.0
xmltodict==0.14.2
zipp==3.15.0

# The following packages are considered to be unsafe in a requirements file:
setuptools==68.0.0
# setuptools
43 changes: 21 additions & 22 deletions .riot/requirements/8fc3285.txt → .riot/requirements/1416d2d.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --allow-unsafe --no-annotate .riot/requirements/8fc3285.in
# pip-compile --no-annotate .riot/requirements/1416d2d.in
#
annotated-types==0.7.0
attrs==24.2.0
aws-sam-translator==1.91.0
aws-sam-translator==1.92.0
aws-xray-sdk==2.14.0
boto==2.49.0
boto3==1.35.14
botocore==1.35.14
boto3==1.35.65
botocore==1.35.65
certifi==2024.8.30
cffi==1.17.1
cfn-lint==0.53.1
charset-normalizer==3.3.2
coverage[toml]==7.6.1
cryptography==43.0.1
charset-normalizer==3.4.0
coverage[toml]==7.6.7
cryptography==43.0.3
docker==7.1.0
ecdsa==0.14.1
hypothesis==6.45.0
idna==2.10
iniconfig==2.0.0
jinja2==2.11.3
jinja2==2.10.3
jmespath==1.0.1
jsondiff==2.2.1
jsonpatch==1.33
Expand All @@ -35,36 +35,35 @@ more-itertools==10.5.0
moto==1.3.16
networkx==2.8.8
opentracing==2.4.0
packaging==24.1
packaging==24.2
pluggy==1.5.0
pyasn1==0.6.0
pyasn1==0.6.1
pycparser==2.22
pydantic==2.9.0
pydantic-core==2.23.2
pydantic==2.9.2
pydantic-core==2.23.4
pynamodb==5.5.1
pyrsistent==0.20.0
pytest==8.3.2
pytest-cov==5.0.0
pytest==8.3.3
pytest-cov==6.0.0
pytest-mock==3.14.0
pytest-randomly==3.15.0
pytest-randomly==3.16.0
python-dateutil==2.9.0.post0
python-jose[cryptography]==3.3.0
pytz==2024.1
pytz==2024.2
pyyaml==6.0.2
requests==2.32.3
responses==0.25.3
rsa==4.9
s3transfer==0.10.2
s3transfer==0.10.3
six==1.16.0
sortedcontainers==2.4.0
sshpubkeys==3.3.1
typing-extensions==4.12.2
tzdata==2024.1
urllib3==2.2.2
urllib3==2.2.3
werkzeug==2.1.2
wrapt==1.16.0
xmltodict==0.13.0
zipp==3.20.1
xmltodict==0.14.2
zipp==3.21.0

# The following packages are considered to be unsafe in a requirements file:
setuptools==74.1.2
# setuptools
22 changes: 11 additions & 11 deletions .riot/requirements/118d2ec.txt → .riot/requirements/142556c.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,36 @@
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile --config=pyproject.toml --no-annotate .riot/requirements/118d2ec.in
# pip-compile --no-annotate .riot/requirements/142556c.in
#
atomicwrites==1.4.1
attrs==23.2.0
blinker==1.7.0
attrs==24.2.0
blinker==1.9.0
click==8.1.7
coverage[toml]==7.4.4
exceptiongroup==1.2.0
coverage[toml]==7.6.7
exceptiongroup==1.2.2
flask==0.12.5
flask-cache==0.13.1
hypothesis==6.45.0
importlib-metadata==7.1.0
importlib-metadata==8.5.0
itsdangerous==1.1.0
jinja2==2.11.3
jinja2==2.10.3
markupsafe==1.1.1
mock==5.1.0
more-itertools==8.10.0
opentracing==2.4.0
packaging==24.0
packaging==24.2
pluggy==0.13.1
py==1.11.0
pytest==4.6.11
pytest-cov==3.0.0
pytest-mock==2.0.0
pytest-randomly==3.15.0
pytest-randomly==3.16.0
python-memcached==1.62
redis==2.10.6
six==1.16.0
sortedcontainers==2.4.0
tomli==2.0.1
tomli==2.1.0
wcwidth==0.2.13
werkzeug==0.16.1
zipp==3.18.1
zipp==3.21.0
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile --no-annotate --resolver=backtracking .riot/requirements/14a42dd.in
# pip-compile --config=pyproject.toml --no-annotate --resolver=backtracking .riot/requirements/160ef98.in
#
atomicwrites==1.4.1
attrs==23.2.0
attrs==24.2.0
blinker==1.6.3
click==8.1.7
coverage[toml]==7.2.7
Expand All @@ -14,7 +14,7 @@ flask-cache==0.13.1
hypothesis==6.45.0
importlib-metadata==6.7.0
itsdangerous==1.1.0
jinja2==2.11.3
jinja2==2.10.3
markupsafe==1.1.1
mock==5.1.0
more-itertools==8.10.0
Expand Down
Loading

0 comments on commit b462888

Please sign in to comment.