update doc naming

open-telemetry · Jun 8, 2020 · 8b9cfc4 · 8b9cfc4
1 parent 5f6ea0a
commit 8b9cfc4
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/docs/index.rst b/docs/index.rst
@@ -68,7 +68,7 @@ install <https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs>
 
     api/api
     sdk/sdk
-    auto_instrumentation/auto_instrumentation
+    instrumentation/instrumentation
 
 .. toctree::
     :maxdepth: 2

diff --git a/..._instrumentation/auto_instrumentation.rst → docs/instrumentation/instrumentation.rst b/..._instrumentation/auto_instrumentation.rst → docs/instrumentation/instrumentation.rst
@@ -1,5 +1,5 @@
-OpenTelemetry Python Autoinstrumentation
-========================================
+OpenTelemetry Python Instrumentation
+====================================
 
 .. automodule:: opentelemetry.instrumentation
     :members:

diff --git a/docs/auto_instrumentation/instrumentor.rst → docs/instrumentation/instrumentor.rst b/docs/auto_instrumentation/instrumentor.rst → docs/instrumentation/instrumentor.rst
@@ -1,5 +1,5 @@
 opentelemetry.instrumentation.instrumentor package
-=======================================================
+==================================================
 
 .. automodule:: opentelemetry.instrumentation.instrumentor
     :members:

diff --git a/opentelemetry-instrumentation/setup.cfg b/opentelemetry-instrumentation/setup.cfg
@@ -41,7 +41,9 @@ package_dir=
 packages=find_namespace:
 zip_safe = False
 include_package_data = True
-install_requires = opentelemetry-api == 0.9.dev0
+install_requires =
+    opentelemetry-api == 0.9.dev0
+    wrapt >= 1.0.0, < 2.0.0
 
 [options.packages.find]
 where = src

diff --git a/tox.ini b/tox.ini
@@ -182,11 +182,11 @@ commands_pre =
 ; cases but it saves a lot of boilerplate in this file.
   test: pip install {toxinidir}/opentelemetry-api {toxinidir}/opentelemetry-sdk {toxinidir}/tests/util
 
-  ext: pip install {toxinidir}/opentelemetry-instrumentation
+  ext,instrumentation: pip install {toxinidir}/opentelemetry-instrumentation
 
-  example-app: {toxinidir}/ext/opentelemetry-ext-requests {toxinidir}/ext/opentelemetry-ext-wsgi {toxinidir}/ext/opentelemetry-ext-flask {toxinidir}/docs/examples/opentelemetry-example-app
+  example-app: pip install {toxinidir}/opentelemetry-instrumentation {toxinidir}/ext/opentelemetry-ext-requests {toxinidir}/ext/opentelemetry-ext-wsgi {toxinidir}/ext/opentelemetry-ext-flask {toxinidir}/docs/examples/opentelemetry-example-app
 
-  getting-started: pip install -e {toxinidir}/ext/opentelemetry-ext-requests -e {toxinidir}/ext/opentelemetry-ext-wsgi -e {toxinidir}/ext/opentelemetry-ext-flask
+  getting-started: pip install -e {toxinidir}/opentelemetry-instrumentation -e {toxinidir}/ext/opentelemetry-ext-requests -e {toxinidir}/ext/opentelemetry-ext-wsgi -e {toxinidir}/ext/opentelemetry-ext-flask
 
   grpc: pip install {toxinidir}/ext/opentelemetry-ext-grpc[test]