Skip to content

Commit 6c68609

Browse files
authored
chore: depend on ddsketch 3 (#8810)
This change upgrades the ddsketch dependency to one that doesn't depend on protobuf. This aids the bugfix in #8797 by completely removing protobuf from the entire dependency tree. ## Checklist - [x] Change(s) are motivated and described in the PR description - [x] Testing strategy is described if automated tests are not included in the PR - [x] Risks are described (performance impact, potential for breakage, maintainability) - [x] Change is maintainable (easy to change, telemetry, documentation) - [x] [Library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) are followed or label `changelog/no-changelog` is set - [x] Documentation is included (in-code, generated user docs, [public corp docs](https://github.com/DataDog/documentation/)) - [x] Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) - [x] If this PR changes the public interface, I've notified `@DataDog/apm-tees`. - [x] If change touches code that signs or publishes builds or packages, or handles credentials of any kind, I've requested a review from `@DataDog/security-design-and-guidance`. ## Reviewer Checklist - [x] Title is accurate - [x] All changes are related to the pull request's stated goal - [x] Description motivates each change - [x] Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes - [x] Testing strategy adequately addresses listed risks - [x] Change is maintainable (easy to change, telemetry, documentation) - [x] Release note makes sense to a user of the library - [x] Author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment - [x] 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)
1 parent ad2fe25 commit 6c68609

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

.riot/requirements/1580f89.txt renamed to .riot/requirements/1b57ac2.txt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile with Python 3.11
33
# by the following command:
44
#
5-
# pip-compile --no-annotate .riot/requirements/1580f89.in
5+
# pip-compile --no-annotate .riot/requirements/1b57ac2.in
66
#
77
aiosqlite==0.17.0
88
attrs==23.2.0
@@ -12,42 +12,42 @@ cattrs==22.2.0
1212
certifi==2024.2.2
1313
charset-normalizer==3.3.2
1414
click==8.1.7
15-
coverage[toml]==7.4.1
16-
ddsketch==2.0.4
15+
coverage[toml]==7.4.4
16+
ddsketch==3.0.1
1717
deprecated==1.2.14
1818
envier==0.5.1
1919
flask==3.0.2
2020
greenlet==3.0.3
2121
hypothesis==6.45.0
2222
idna==3.6
23-
importlib-metadata==6.11.0
23+
importlib-metadata==7.0.0
2424
iniconfig==2.0.0
2525
iso8601==1.1.0
2626
itsdangerous==2.1.2
2727
jinja2==3.1.3
2828
markupsafe==2.1.5
2929
mock==5.1.0
30-
opentelemetry-api==1.22.0
30+
opentelemetry-api==1.24.0
3131
opentracing==2.4.0
32-
packaging==23.2
32+
packaging==24.0
3333
peewee==3.17.1
3434
pluggy==1.4.0
3535
pony==0.7.17
36-
protobuf==4.25.2
36+
protobuf==5.26.1
3737
pypika-tortoise==0.1.6
38-
pytest==8.0.0
39-
pytest-cov==4.1.0
40-
pytest-mock==3.12.0
38+
pytest==8.1.1
39+
pytest-cov==5.0.0
40+
pytest-mock==3.14.0
4141
pytz==2024.1
4242
requests==2.31.0
4343
six==1.16.0
4444
sortedcontainers==2.4.0
45-
sqlalchemy==2.0.25
45+
sqlalchemy==2.0.29
4646
sqlparse==0.4.4
4747
tortoise-orm==0.20.0
48-
typing-extensions==4.9.0
49-
urllib3==2.2.0
48+
typing-extensions==4.10.0
49+
urllib3==2.2.1
5050
werkzeug==3.0.1
5151
wrapt==1.16.0
5252
xmltodict==0.13.0
53-
zipp==3.17.0
53+
zipp==3.18.1

hatch.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ dev-mode = false
6767
python = "3.10"
6868
features = ["opentracing"]
6969
dependencies = [ # copied from library dependencies
70-
"ddsketch>=2.0.1",
70+
"ddsketch>=3.0.0",
7171
"protobuf>=3",
7272
"attrs>=20",
7373
"cattrs",
@@ -194,7 +194,7 @@ test = [
194194

195195
# python 3.12 should replace 3.11 in this list, but installation is failing on 3.12
196196
# if you add or remove a version here, please also update the parallelism parameter
197-
# in .circleci/config.templ.yml
197+
# in .circleci/config.templ.yml
198198
[[envs.appsec_threats_django.matrix]]
199199
python = ["3.7", "3.9"]
200200
django = ["~=2.2"]
@@ -238,7 +238,7 @@ test = [
238238

239239
# python 3.12 should replace some 3.11 in this list, but installation is failing on 3.12
240240
# if you add or remove a version here, please also update the parallelism parameter
241-
# in .circleci/config.templ.yml
241+
# in .circleci/config.templ.yml
242242
[[envs.appsec_threats_flask.matrix]]
243243
python = ["3.7", "3.9"]
244244
flask = ["~=1.1"]
@@ -279,7 +279,7 @@ test = [
279279

280280
# python 3.12 should replace some 3.11 in this list, but installation is failing on 3.12
281281
# if you add or remove a version here, please also update the parallelism parameter
282-
# in .circleci/config.templ.yml
282+
# in .circleci/config.templ.yml
283283
[[envs.appsec_threats_fastapi.matrix]]
284284
python = ["3.7", "3.9", "3.11"]
285285
fastapi = ["==0.86.0"]

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies = [
3030
"bytecode>=0.14.0; python_version~='3.11.0'",
3131
"bytecode>=0.13.0; python_version<'3.11'",
3232
"cattrs",
33-
"ddsketch>=2.0.1",
33+
"ddsketch>=3.0.0",
3434
"envier~=0.5",
3535
"importlib_metadata<=6.5.0; python_version<'3.8'",
3636
"opentelemetry-api>=1",

riotfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ def select_pys(min_version=MIN_PYTHON_VERSION, max_version=MAX_PYTHON_VERSION):
192192
"six": ">=1.12.0",
193193
"envier": "==0.5.1",
194194
"cattrs": "<23.1.1",
195-
"ddsketch": ">=2.0.1",
195+
"ddsketch": ">=3.0.0",
196196
"protobuf": ">=3",
197197
"attrs": ">=20",
198198
"typing_extensions": latest,

0 commit comments

Comments
 (0)