diff --git a/docs-requirements.txt b/docs-requirements.txt index 0188c11e64..7fe80644c6 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -4,11 +4,11 @@ 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 --e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-api&subdirectory=opentelemetry-api" --e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions" --e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk" --e "git+https://github.com/open-telemetry/opentelemetry-python-contrib.git#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http" -./opentelemetry-instrumentation +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 diff --git a/tox.ini b/tox.ini index 7621e182f5..d197684663 100644 --- a/tox.ini +++ b/tox.ini @@ -857,13 +857,7 @@ deps = -c {toxinidir}/dev-requirements.txt -r {toxinidir}/docs-requirements.txt pytest - -commands_pre = - python -m pip install {env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api - python -m pip install {env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions - python -m pip install {env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk - python -m pip install {toxinidir}/opentelemetry-instrumentation - python -m pip install {toxinidir}/util/opentelemetry-util-http + {[testenv]test_deps} changedir = docs @@ -934,9 +928,9 @@ commands = {toxinidir}/scripts/generate_instrumentation_metapackage.py [testenv:generate-workflows] - -commands_pre = - pip install {toxinidir}/.github/workflows/generate_workflows_lib +recreate = True +deps = + {toxinidir}/.github/workflows/generate_workflows_lib commands = python {toxinidir}/.github/workflows/generate_workflows.py