From 4345c416adfbf559a45b1af6ea1760161c8169b7 Mon Sep 17 00:00:00 2001
From: Nathaniel Ruiz Nowell <enowell@amazon.com>
Date: Tue, 3 Nov 2020 14:31:04 -0800
Subject: [PATCH] Fix docs lint docker-tests tests

---
 docs/conf.py                         |  4 +++-
 docs/examples/django/pages/views.py  |  1 -
 docs/examples/opentracing/README.rst |  4 +---
 pyproject.toml                       |  2 +-
 tox.ini                              | 12 ++++++++++--
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 0ee56e9118d..4ccb1ca0b1c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -37,7 +37,9 @@
 
 instr = "../opentelemetry-python-contrib/instrumentation"
 instr_dirs = [
-    os.path.abspath("/".join(["../opentelemetry-python-contrib/instrumentation", f, "src"]))
+    os.path.abspath(
+        "/".join(["../opentelemetry-python-contrib/instrumentation", f, "src"])
+    )
     for f in listdir(instr)
     if isdir(join(instr, f))
 ]
diff --git a/docs/examples/django/pages/views.py b/docs/examples/django/pages/views.py
index 4083888e17b..9d277e2b7f7 100644
--- a/docs/examples/django/pages/views.py
+++ b/docs/examples/django/pages/views.py
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from django.http import HttpResponse
-
 from opentelemetry import trace
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import (
diff --git a/docs/examples/opentracing/README.rst b/docs/examples/opentracing/README.rst
index f56bd3e5fcd..7b125e55790 100644
--- a/docs/examples/opentracing/README.rst
+++ b/docs/examples/opentracing/README.rst
@@ -1,8 +1,7 @@
 OpenTracing Shim Example
 ==========================
 
-This example shows how to use the :doc:`opentelemetry-instrumentation-opentracing-shim
-package <../../instrumentation/opentracing_shim/opentracing_shim>`
+This example shows how to use the ``opentelemetry-instrumentation-opentracing-shim package``
 to interact with libraries instrumented with
 `opentracing-python <https://github.com/opentracing/opentracing-python>`_.
 
@@ -100,6 +99,5 @@ Useful links
 ------------
 
 - OpenTelemetry_
-- :doc:`../../instrumentation/opentracing_shim/opentracing_shim`
 
 .. _OpenTelemetry: https://github.com/open-telemetry/opentelemetry-python/
diff --git a/pyproject.toml b/pyproject.toml
index 76dd29e1a65..370c397a1bc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,7 @@ exclude = '''
     opentelemetry-proto/src/opentelemetry/proto/common|
     opentelemetry-proto/src/opentelemetry/proto/metrics|
     opentelemetry-proto/src/opentelemetry/proto/resource|
-    opentelemetry-proto/src/opentelemetry/proto/trace
+    opentelemetry-proto/src/opentelemetry/proto/trace|
     opentelemetry-python-contrib
   )/
 )
diff --git a/tox.ini b/tox.ini
index 9311728fa2c..ac5e6079f84 100644
--- a/tox.ini
+++ b/tox.ini
@@ -135,7 +135,9 @@ commands =
 basepython: python3.8
 recreate = True
 deps =
+  -e {toxinidir}/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-grpc
   -c dev-requirements.txt
+  asgiref
   pylint
   flake8
   isort
@@ -192,12 +194,18 @@ commands =
 [testenv:docker-tests]
 deps =
   pytest
+  docker-compose >= 1.25.2
 
 changedir =
   tests/opentelemetry-docker-tests/tests
 
 commands_pre =
-  pip install -e {toxinidir}/exporter/opentelemetry-exporter-opencensus
+  pip install -e {toxinidir}/opentelemetry-api \
+              -e {toxinidir}/opentelemetry-sdk \
+              -e {toxinidir}/tests/util \
+              -e {toxinidir}/exporter/opentelemetry-exporter-opencensus
+  docker-compose up -d	
 commands =
   pytest {posargs}
-
+commands_post =
+  docker-compose down -v