Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Python 3.9 to build #1441

Merged
merged 1 commit into from
Dec 11, 2020
Merged

Add Python 3.9 to build #1441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,23 @@ jobs:
py36: 3.6
py37: 3.7
py38: 3.8
py39: 3.9
gliptak marked this conversation as resolved.
Show resolved Hide resolved
pypy3: pypy3
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
matrix:
python-version: [ py35, py36, py37, py38, pypy3 ]
python-version: [ py35, py36, py37, py38, py39, pypy3 ]
package: ["instrumentation", "core", "exporter"]
os: [ ubuntu-latest ]
include:
- python-version: py38
- python-version: py39
package: "tracecontext"
os: ubuntu-latest
- python-version: py38
- python-version: py39
package: "mypy"
os: ubuntu-latest
- python-version: py38
- python-version: py39
package: "mypyinstalled"
os: ubuntu-latest
# py35-instrumentation segfaults on 18.04 so we instead run on 20.04
Expand Down Expand Up @@ -85,7 +86,7 @@ jobs:
repository: open-telemetry/opentelemetry-python-contrib
ref: ${{ env.CONTRIB_REPO_SHA }}
path: opentelemetry-python-contrib
- name: Set up Python 3.8
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.8
Expand All @@ -106,12 +107,13 @@ jobs:
py36: 3.6
py37: 3.7
py38: 3.8
py39: 3.9
pypy3: pypy3
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
matrix:
python-version: [ py35, py36, py37, py38, pypy3 ]
python-version: [ py35, py36, py37, py38, py39, pypy3 ]
package: ["instrumentation", "exporter"]
os: [ ubuntu-latest ]
include:
Expand Down Expand Up @@ -166,10 +168,10 @@ jobs:
with:
repository: open-telemetry/opentelemetry-python
path: opentelemetry-python-core
- name: Set up Python 3.8
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: 3.9
- name: Install tox
run: pip install -U tox
- name: Cache tox environment
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v0.16b1...HEAD)

- Add support for Python 3.9
([#1441](https://github.com/open-telemetry/opentelemetry-python/pull/1441))

### Added
- Add `fields` to propagators
([#1374](https://github.com/open-telemetry/opentelemetry-python/pull/1374))
Expand Down
2 changes: 1 addition & 1 deletion dev-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ pylint==2.4.4
flake8~=3.7
isort~=4.3
black>=19.3b0,==19.*
mypy==0.770
mypy==0.790
sphinx~=2.1
sphinx-rtd-theme~=0.4
sphinx-autodoc-typehints~=1.10.2
Expand Down
1 change: 1 addition & 0 deletions docs/examples/error_hander/error_handler_0/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ classifiers =
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9

[options]
python_requires = >=3.5
Expand Down
1 change: 1 addition & 0 deletions docs/examples/error_hander/error_handler_1/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ classifiers =
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9

[options]
python_requires = >=3.5
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-opencensus/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9

[options]
python_requires = >=3.5
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-otlp/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9

[options]
python_requires = >=3.5
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-prometheus/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9

[options]
python_requires = >=3.5
Expand Down
1 change: 1 addition & 0 deletions exporter/opentelemetry-exporter-zipkin/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9

[options]
python_requires = >=3.5
Expand Down
1 change: 1 addition & 0 deletions instrumentation/opentelemetry-instrumentation-opentracing-shim/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9

[options]
python_requires = >=3.5
Expand Down
1 change: 1 addition & 0 deletions opentelemetry-api/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9

[options]
python_requires = >=3.5
Expand Down
1 change: 1 addition & 0 deletions opentelemetry-instrumentation/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9

[options]
python_requires = >=3.5
Expand Down
1 change: 1 addition & 0 deletions opentelemetry-proto/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9

[options]
python_requires = >=3.5
Expand Down
1 change: 1 addition & 0 deletions opentelemetry-sdk/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ classifiers =
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9

[options]
python_requires = >=3.5
Expand Down
1 change: 1 addition & 0 deletions tests/util/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ classifiers =
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9

[options]
python_requires = >=3.5
Expand Down
32 changes: 16 additions & 16 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,52 +5,52 @@ envlist =
; Environments are organized by individual package, allowing
; for specifying supported Python versions per package.
; opentelemetry-api
py3{5,6,7,8}-test-core-api
py3{5,6,7,8,9}-test-core-api
pypy3-test-core-api

; opentelemetry-proto
py3{5,6,7,8}-test-core-proto
py3{5,6,7,8,9}-test-core-proto
pypy3-test-core-proto

; opentelemetry-sdk
py3{5,6,7,8}-test-core-sdk
py3{5,6,7,8,9}-test-core-sdk
pypy3-test-core-sdk

; opentelemetry-instrumentation
py3{5,6,7,8}-test-core-instrumentation
py3{5,6,7,8,9}-test-core-instrumentation
pypy3-test-core-instrumentation

; docs/getting-started
py3{5,6,7,8}-test-core-getting-started
py3{5,6,7,8,9}-test-core-getting-started
pypy3-test-core-getting-started

; opentelemetry-exporter-jaeger
py3{5,6,7,8}-test-exporter-jaeger
py3{5,6,7,8,9}-test-exporter-jaeger
pypy3-test-exporter-jaeger

; opentelemetry-exporter-opencensus
py3{5,6,7,8}-test-exporter-opencensus
py3{5,6,7,8,9}-test-exporter-opencensus
; exporter-opencensus intentionally excluded from pypy3

; opentelemetry-exporter-otlp
py3{5,6,7,8}-test-exporter-otlp
py3{5,6,7,8,9}-test-exporter-otlp
; exporter-otlp intentionally excluded from pypy3

; opentelemetry-exporter-prometheus
py3{5,6,7,8}-test-exporter-prometheus
py3{5,6,7,8,9}-test-exporter-prometheus
pypy3-test-exporter-prometheus

; opentelemetry-exporter-zipkin
py3{5,6,7,8}-test-exporter-zipkin
py3{5,6,7,8,9}-test-exporter-zipkin
pypy3-test-exporter-zipkin

; opentelemetry-opentracing-shim
py3{5,6,7,8}-test-core-opentracing-shim
py3{5,6,7,8,9}-test-core-opentracing-shim
pypy3-test-core-opentracing-shim

lint
py38-tracecontext
py38-{mypy,mypyinstalled}
py39-tracecontext
py39-{mypy,mypyinstalled}
docs
docker-tests

Expand Down Expand Up @@ -80,7 +80,7 @@ changedir =

commands_pre =
; Install without -e to test the actual installation
py3{5,6,7,8}: python -m pip install -U pip setuptools wheel
py3{5,6,7,8,9}: python -m pip install -U pip setuptools wheel
; Install common packages for all the tests. These are not needed in all the
; cases but it saves a lot of boilerplate in this file.
test: pip install {toxinidir}/opentelemetry-api {toxinidir}/opentelemetry-sdk {toxinidir}/tests/util
Expand Down Expand Up @@ -164,8 +164,8 @@ changedir = docs
commands =
sphinx-build -E -a -W -b html -T . _build/html

[testenv:py38-tracecontext]
basepython: python3.8
[testenv:py39-tracecontext]
basepython: python3.9
deps =
# needed for tracecontext
aiohttp~=3.6
Expand Down