Skip to content

Commit e75ce2f

Browse files
author
alrex
authored
Merge branch 'master' into issue_903
2 parents c83cf9e + 5ff9600 commit e75ce2f

File tree

39 files changed

+304
-2862
lines changed

39 files changed

+304
-2862
lines changed

.circleci/config.yml

+17-10
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,8 @@ jobs:
6464
docs:
6565
executor: py38
6666
steps:
67-
- checkout
68-
- setup_tox
69-
- restore_tox_cache
70-
- run: tox -e docs
71-
- save_tox_cache
67+
- run_tox_scenario:
68+
pattern: docs
7269

7370
docker-tests:
7471
machine:
@@ -92,11 +89,17 @@ jobs:
9289
lint:
9390
executor: py38
9491
steps:
95-
- checkout
96-
- setup_tox
97-
- restore_tox_cache
98-
- run: tox -e lint
99-
- save_tox_cache
92+
- run_tox_scenario:
93+
pattern: lint
94+
95+
build-py38:
96+
parameters:
97+
package:
98+
type: string
99+
executor: py38
100+
steps:
101+
- run_tox_scenario:
102+
pattern: py38-<< parameters.package >>
100103

101104
build-py34:
102105
parameters:
@@ -131,6 +134,10 @@ jobs:
131134
workflows:
132135
circleci-build:
133136
jobs:
137+
- build-py38:
138+
matrix:
139+
parameters:
140+
package: ["core", "exporter", "instrumentation", "tracecontext", "mypy", "mypyinstalled"]
134141
- build:
135142
matrix:
136143
parameters:

.travis.yml

-37
This file was deleted.

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<img alt="license" src="https://img.shields.io/badge/license-Apache_2.0-green.svg?style=for-the-badge">
2121
</a>
2222
<br/>
23-
<a href="https://travis-ci.org/open-telemetry/opentelemetry-python">
24-
<img alt="Build Status" src="https://travis-ci.org/open-telemetry/opentelemetry-python.svg?branch=master">
23+
<a href="https://circleci.com/gh/open-telemetry/opentelemetry-python">
24+
<img alt="Build Status" src="https://circleci.com/gh/open-telemetry/opentelemetry-python.svg?style=shield">
2525
</a>
2626
<img alt="Beta" src="https://img.shields.io/badge/status-beta-informational?logo=data:image/png;base64,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">
2727
</p>

docs-requirements.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ wrapt>=1.0.0,<2.0.0
2525
celery>=4.0
2626
psutil~=5.7.0
2727
boto~=2.0
28-
google-cloud-trace >=0.23.0
29-
google-cloud-monitoring>=0.36.0
3028
botocore~=1.0
3129
starlette~=0.13
32-
fastapi~=0.58.1
30+
fastapi~=0.58.1
31+
opentelemetry-exporter-cloud-trace==0.10b0
32+
opentelemetry-exporter-cloud-monitoring==0.10b0

ext/opentelemetry-exporter-cloud-monitoring/CHANGELOG.md

-21
This file was deleted.

ext/opentelemetry-exporter-cloud-monitoring/LICENSE

-201
This file was deleted.

ext/opentelemetry-exporter-cloud-monitoring/MANIFEST.in

-9
This file was deleted.

ext/opentelemetry-exporter-cloud-monitoring/README.rst

-18
This file was deleted.

0 commit comments

Comments
 (0)