Restructure wrapt test requirements

blarghmatey · Copilot · blarghmatey · commit 392574480bcf · 2026-02-17T13:17:30.000-05:00
- Remove wrapt from base test-requirements.txt (installed via pyproject.toml)
- Remove Deprecated from base test-requirements.txt (version conflicts with wrapt 2.x)
- Create test-requirements-wrapt1.txt with wrapt&lt;2.0.0 and Deprecated==1.2.14
- Create test-requirements-wrapt2.txt with wrapt&gt;=2.0.0 and Deprecated&gt;=1.2.18
- Update tox.ini to use requirements files instead of factor-based deps
- Add Deprecated to lint environment deps

This follows the pattern used by other packages (botocore, httpx) and
resolves dependency conflicts where Deprecated 1.2.14 requires wrapt&lt;2.

Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;
diff --git a/opentelemetry-instrumentation/test-requirements-wrapt1.txt b/opentelemetry-instrumentation/test-requirements-wrapt1.txt
@@ -0,0 +1,3 @@
+-r test-requirements.txt
+Deprecated==1.2.14
+wrapt>=1.0.0,<2.0.0
diff --git a/opentelemetry-instrumentation/test-requirements-wrapt2.txt b/opentelemetry-instrumentation/test-requirements-wrapt2.txt
@@ -0,0 +1,3 @@
+-r test-requirements.txt
+Deprecated>=1.2.18
+wrapt>=2.0.0,<3.0.0
diff --git a/opentelemetry-instrumentation/test-requirements.txt b/opentelemetry-instrumentation/test-requirements.txt
@@ -1,5 +1,4 @@
 asgiref==3.8.1
-Deprecated==1.2.14
 gevent==25.5.1
 iniconfig==2.0.0
 packaging==24.0
@@ -8,6 +7,5 @@ py-cpuinfo==9.0.0
 pytest==7.4.4
 tomli==2.0.1
 typing_extensions==4.12.2
-wrapt==1.16.0
 zipp==3.19.2
 -e opentelemetry-instrumentation
diff --git a/tox.ini b/tox.ini
@@ -458,12 +458,11 @@ deps =
   coverage: pytest
   coverage: pytest-cov
 
-  ; wrapt version matrix
-  wrapt1: wrapt>=1.0.0,<2.0.0
-  wrapt2: wrapt>=2.0.0,<3.0.0
-
   opentelemetry-instrumentation: {[testenv]test_deps}
-  opentelemetry-instrumentation: -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt
+  wrapt1: -r {toxinidir}/opentelemetry-instrumentation/test-requirements-wrapt1.txt
+  wrapt2: -r {toxinidir}/opentelemetry-instrumentation/test-requirements-wrapt2.txt
+  lint-opentelemetry-instrumentation: -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt
+  lint-opentelemetry-instrumentation: Deprecated==1.2.14
 
   distro: {[testenv]test_deps}
   distro: -r {toxinidir}/opentelemetry-distro/test-requirements.txt

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+-r test-requirements.txt`
	`2`	`+Deprecated==1.2.14`
	`3`	`+wrapt>=1.0.0,<2.0.0`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+-r test-requirements.txt`
	`2`	`+Deprecated>=1.2.18`
	`3`	`+wrapt>=2.0.0,<3.0.0`