Skip to content

Commit 82e44f1

Browse files
committed
Modify existing workflow for CI tests
1 parent 48217da commit 82e44f1

File tree

9 files changed

+49
-165
lines changed

9 files changed

+49
-165
lines changed

.coveragerc

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ omit =
44
*/setup.py
55
*/gen/*
66
reference/*
7+
opentelemetry-python-core/*

.flake8

+1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@ exclude =
2121
exporter/opentelemetry-exporter-jaeger/build/*
2222
docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/gen/
2323
docs/examples/opentelemetry-example-app/build/*
24+
opentelemetry-python-core/
2425
opentelemetry-proto/build/*
2526
opentelemetry-proto/src/opentelemetry/proto/

.github/workflows/test.yml

+20-15
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test
1+
name: Contrib Repo Tests
22

33
on:
44
push:
@@ -20,18 +20,9 @@ jobs:
2020
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
2121
matrix:
2222
python-version: [ py35, py36, py37, py38, pypy3 ]
23-
package: ["instrumentation", "core", "exporter"]
23+
package: ["instrumentation", "exporter"]
2424
os: [ ubuntu-latest ]
2525
include:
26-
- python-version: py38
27-
package: "tracecontext"
28-
os: ubuntu-latest
29-
- python-version: py38
30-
package: "mypy"
31-
os: ubuntu-latest
32-
- python-version: py38
33-
package: "mypyinstalled"
34-
os: ubuntu-latest
3526
# py35-instrumentation segfaults on 18.04 so we instead run on 20.04
3627
- python-version: py35
3728
package: instrumentation
@@ -41,7 +32,14 @@ jobs:
4132
python-version: py35
4233
package: instrumentation
4334
steps:
44-
- uses: actions/checkout@v2
35+
- name: Checkout Contrib Repo at SHA - ${{ github.sha }}
36+
uses: actions/checkout@v2
37+
- name: Checkout Core Repo @ tag v0.15b0
38+
uses: actions/checkout@v2
39+
with:
40+
repository: open-telemetry/opentelemetry-python
41+
ref: v0.15b0
42+
path: opentelemetry-python-core
4543
- name: Set up Python ${{ env[matrix.python-version] }}
4644
uses: actions/setup-python@v2
4745
with:
@@ -60,11 +58,18 @@ jobs:
6058
strategy:
6159
fail-fast: false
6260
matrix:
63-
tox-environment: [ "docker-tests", "lint", "docs" ]
61+
tox-environment: [ "docker-tests", "lint" ]
6462
name: ${{ matrix.tox-environment }}
6563
runs-on: ubuntu-latest
6664
steps:
67-
- uses: actions/checkout@v2
65+
- name: Checkout Contrib Repo at SHA - ${{ github.sha }}
66+
uses: actions/checkout@v2
67+
- name: Checkout Core Repo @ tag v0.15b0
68+
uses: actions/checkout@v2
69+
with:
70+
repository: open-telemetry/opentelemetry-python
71+
ref: v0.15b0
72+
path: opentelemetry-python-core
6873
- name: Set up Python 3.8
6974
uses: actions/setup-python@v2
7075
with:
@@ -78,4 +83,4 @@ jobs:
7883
path: .tox
7984
key: tox-cache-${{ matrix.tox-environment }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}
8085
- name: run tox
81-
run: tox -e ${{ matrix.tox-environment }}
86+
run: tox -e ${{ matrix.tox-environment }}

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ lib64
2121
__pycache__
2222
venv*/
2323
.venv*/
24+
opentelemetry-python-core*/
2425

2526
# Installer logs
2627
pip-log.txt

.isort.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ line_length=79
1313
; docs: https://github.com/timothycrosley/isort#multi-line-output-modes
1414
multi_line_output=3
1515
skip=target
16-
skip_glob=**/gen/*,.venv*/*,venv*/*,reference*/*
16+
skip_glob=**/gen/*,.venv*/*,venv*/*,reference*/*,opentelemetry-python-core*/*
1717
known_first_party=opentelemetry
1818
known_third_party=psutil,pytest,redis,redis_opentracing

.pylintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ extension-pkg-whitelist=
77

88
# Add list of files or directories to be excluded. They should be base names, not
99
# paths.
10-
ignore=CVS,gen
10+
ignore=CVS,gen,opentelemetry-python-core
1111

1212
# Add files or directories matching the regex patterns to be excluded. The
1313
# regex matches against base names, not paths.

eachdist.ini

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@
44
ignore=
55
_template
66
reference
7+
opentelemetry-python-core
78

89
sortfirst=
9-
opentelemetry-api
10-
opentelemetry-sdk
11-
opentelemetry-instrumentation
12-
opentelemetry-proto
13-
tests/util
1410
instrumentation/opentelemetry-instrumentation-wsgi
1511
instrumentation/opentelemetry-instrumentation-dbapi
1612
instrumentation/opentelemetry-instrumentation-asgi

pyproject.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ line-length = 79
33
exclude = '''
44
(
55
/(
6-
reference # original files from DataDog
6+
reference|
7+
opentelemetry-python-core
78
)/
89
)
910
'''

0 commit comments

Comments
 (0)