Skip to content

Commit

Permalink
Fix docs lint docker-tests tests
Browse files Browse the repository at this point in the history
  • Loading branch information
NathanielRN committed Nov 3, 2020
1 parent 92146fa commit 4345c41
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 8 deletions.
4 changes: 3 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))
]
Expand Down
1 change: 0 additions & 1 deletion docs/examples/django/pages/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 1 addition & 3 deletions docs/examples/opentracing/README.rst
Original file line number Diff line number Diff line change
@@ -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>`_.

Expand Down Expand Up @@ -100,6 +99,5 @@ Useful links
------------

- OpenTelemetry_
- :doc:`../../instrumentation/opentracing_shim/opentracing_shim`

.. _OpenTelemetry: https://github.com/open-telemetry/opentelemetry-python/
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
)/
)
Expand Down
12 changes: 10 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

0 comments on commit 4345c41

Please sign in to comment.