Skip to content

Commit c94a362

Browse files
authored
Merge branch 'main' into herin049
2 parents 522414b + a649408 commit c94a362

4 files changed

Lines changed: 9 additions & 0 deletions

File tree

docs-requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ sphinx==7.1.2
22
sphinx-rtd-theme==2.0.0rc4
33
sphinx-autodoc-typehints==1.25.2
44

5+
# Required to avoid breakages for pyramid and cassandra packages
6+
setuptools<82.0.0
7+
58
# Required by opentelemetry-instrumentation
69
fastapi>=0.65.2
710
pymemcache~=1.3

instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ pluggy==1.5.0
1010
py-cpuinfo==9.0.0
1111
pyramid==2.0.2
1212
pytest==7.4.4
13+
setuptools==81.0.0
1314
tomli==2.0.1
1415
translationstring==1.4
1516
typing_extensions==4.12.2

test-constraints.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Source install of cassandra-driver requires pkg_resources, if
2+
# it's not found the install script is broken and fails to build
3+
setuptools<82.0.0

tox.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,8 @@ setenv =
763763
CORE_REPO_SHA={env:CORE_REPO_SHA:main}
764764
CORE_REPO=git+https://github.com/open-telemetry/opentelemetry-python.git@{env:CORE_REPO_SHA}
765765
UV_CONFIG_FILE={toxinidir}/tox-uv.toml
766+
PIP_CONSTRAINTS={toxinidir}/test-constraints.txt
767+
UV_BUILD_CONSTRAINT={toxinidir}/test-constraints.txt
766768

767769
commands_pre =
768770
; In order to get a health coverage report,

0 commit comments

Comments
 (0)