fix conflicts

Signed-off-by: emdneto <[email protected]>

.readthedocs.yml

@@ -12,4 +12,4 @@ build:
 
 python:
   install:
-    - requirements: docs-requirements.txt
+    - requirements: rtd-requirements.txt

docs-requirements.txt

@@ -2,14 +2,6 @@ sphinx==7.1.2
 sphinx-rtd-theme==2.0.0rc4
 sphinx-autodoc-typehints==1.25.2
 
-# Need to install the api/sdk in the venv for autodoc. Modifying sys.path
-# doesn't work for pkg_resources. Used by .readthedocs.yml
-opentelemetry-api @ git+https://github.com/open-telemetry/opentelemetry-python.git@main#egg=opentelemetry-api&subdirectory=opentelemetry-api
-opentelemetry-semantic-conventions @ git+https://github.com/open-telemetry/opentelemetry-python.git@main#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
-opentelemetry-sdk @ git+https://github.com/open-telemetry/opentelemetry-python.git@main#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
--e ./opentelemetry-instrumentation
--e ./util/opentelemetry-util-http
-
 # Required by opentelemetry-instrumentation
 fastapi>=0.65.2
 pymemcache~=1.3

rtd-requirements.txt

@@ -0,0 +1,7 @@
+# Need to install the api/sdk in the venv for autodoc. Used by .readthedocs.yml
+opentelemetry-api @ git+https://github.com/open-telemetry/opentelemetry-python.git@main#egg=opentelemetry-api&subdirectory=opentelemetry-api
+opentelemetry-semantic-conventions @ git+https://github.com/open-telemetry/opentelemetry-python.git@main#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
+opentelemetry-sdk @ git+https://github.com/open-telemetry/opentelemetry-python.git@main#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
+./opentelemetry-instrumentation
+./util/opentelemetry-util-http
+-r ./docs-requirements.txt