Skip to content

Commit 0b9fbcd

Browse files
committed
Merge remote-tracking branch 'upstream/master' into majorgreys/feature/ext_asgi
2 parents 16f37f7 + ae533f7 commit 0b9fbcd

39 files changed

+477
-1232
lines changed

Diff for: .travis.yml

+14-7
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,20 @@ language: python
44

55
cache: pip
66

7-
python:
8-
- 'pypy3'
9-
- '3.8'
10-
- '3.4'
11-
- '3.5'
12-
- '3.6'
13-
- '3.7'
7+
matrix:
8+
include:
9+
- python: 3.8
10+
env: TOXENV=lint
11+
- python: pypy3
12+
- python: 3.8
13+
- python: 3.4
14+
- python: 3.5
15+
- python: 3.6
16+
- python: 3.7
17+
- python: 3.8
18+
env: TOXENV=docker-tests
19+
- python: 3.8
20+
env: TOXENV=docs
1421

1522
#matrix:
1623
# allow_failures:

Diff for: docs/examples/auto-instrumentation/README.md

-165
This file was deleted.

Diff for: docs/examples/basic_tracer/README.rst

-39
This file was deleted.

Diff for: docs/examples/basic_tracer/__init__.py

-14
This file was deleted.

Diff for: docs/examples/http/README.rst

-65
This file was deleted.

Diff for: docs/examples/http/__init__.py

-13
This file was deleted.

Diff for: docs/examples/http/requirements.txt

-1
This file was deleted.

Diff for: docs/examples/http/server.py

-59
This file was deleted.

0 commit comments

Comments
 (0)