Merge branch 'master' into feature/trace-get-current-span

open-telemetry · May 22, 2020 · 6973d24 · 6973d24
2 parents 791c31b + f15d76a
commit 6973d24
Show file tree

Hide file tree

Showing 48 changed files with 1,173 additions and 1,091 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,13 +4,20 @@ language: python
 
 cache: pip
 
-python:
-  - 'pypy3'
-  - '3.8'
-  - '3.4'
-  - '3.5'
-  - '3.6'
-  - '3.7'
+matrix:
+  include:
+    - python: 3.8
+      env: TOXENV=lint
+    - python: pypy3
+    - python: 3.8
+    - python: 3.4
+    - python: 3.5
+    - python: 3.6
+    - python: 3.7
+    - python: 3.8
+      env: TOXENV=docker-tests
+    - python: 3.8
+      env: TOXENV=docs
 
 #matrix:
 #  allow_failures:

diff --git a/docs/examples/auto-instrumentation/README.md b/docs/examples/auto-instrumentation/README.md
diff --git a/docs/examples/basic_tracer/README.rst b/docs/examples/basic_tracer/README.rst
diff --git a/docs/examples/basic_tracer/__init__.py b/docs/examples/basic_tracer/__init__.py
diff --git a/docs/examples/http/README.rst b/docs/examples/http/README.rst
diff --git a/docs/examples/http/requirements.txt b/docs/examples/http/requirements.txt
diff --git a/docs/examples/http/server.py b/docs/examples/http/server.py