Skip to content

Commit e6f1561

Browse files
committed
Release opentelemetry-test
fixes open-telemetry#2263
1 parent 9ed60ea commit e6f1561

File tree

18 files changed

+20
-17
lines changed

18 files changed

+20
-17
lines changed

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
# Otherwise, set variable to the commit of your branch on
1111
# opentelemetry-python-contrib which is compatible with these Core repo
1212
# changes.
13-
CONTRIB_REPO_SHA: a7c054b257225948c68a9dccb3f2973537d9b4ec
13+
CONTRIB_REPO_SHA: 45f1bfa679eff4659aa02254db258f995cf987cf
1414
# This is needed because we do not clone the core repo in contrib builds anymore.
1515
# When running contrib builds as part of core builds, we use actions/checkout@v2 which
1616
# does not set an environment variable (simply just runs tox), which is different when

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2222
([#2242](https://github.com/open-telemetry/opentelemetry-python/pull/2242))
2323
- `opentelemetry-sdk` Sanitize env var resource attribute pairs
2424
([#2256](https://github.com/open-telemetry/opentelemetry-python/pull/2256))
25+
- `opentelemetry-test` start releasing to pypi.org
26+
([#2269](https://github.com/open-telemetry/opentelemetry-python/pull/2269))
2527

2628
## [1.6.2-0.25b2](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.6.2-0.25b2) - 2021-10-19
2729

eachdist.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ sortfirst=
77
opentelemetry-sdk
88
opentelemetry-proto
99
opentelemetry-distro
10-
tests/util
10+
tests/opentelemetry-tests
1111
exporter/*
1212

1313
[stable]

scripts/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ DISTDIR=dist
1616
mkdir -p $DISTDIR
1717
rm -rf $DISTDIR/*
1818

19-
for d in opentelemetry-api/ opentelemetry-sdk/ opentelemetry-proto/ opentelemetry-semantic-conventions/ exporter/*/ shim/*/ propagator/*/; do
19+
for d in opentelemetry-api/ opentelemetry-sdk/ opentelemetry-proto/ opentelemetry-semantic-conventions/ exporter/*/ shim/*/ propagator/*/ tests/opentelemetry-tests/; do
2020
(
2121
echo "building $d"
2222
cd "$d"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
OpenTelemetry Test Utilities
2+
============================
3+
4+
This package provides internal testing utilities for the OpenTelemetry Python project and provides no stability or quality guarantees.
5+
Please do not use it for anything other than writing or running tests for the OpenTelemetry Python project (github.com/open-telemetry/opentelemetry-python).
6+
7+
8+
References
9+
----------
10+
* `OpenTelemetry Project <https://opentelemetry.io/>`_

tests/util/setup.cfg renamed to tests/opentelemetry-test/opentelemetry-tests/setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ name = opentelemetry-test
1717
description = Test utilities for OpenTelemetry unit tests
1818
author = OpenTelemetry Authors
1919
author_email = [email protected]
20-
url = https://github.com/open-telemetry/opentelemetry-python/tests/util
20+
url = https://github.com/open-telemetry/opentelemetry-python/tests/opentelemetry-tests
2121
platforms = any
2222
license = Apache-2.0
2323
classifiers =

tests/util/README.rst

-9
This file was deleted.

tox.ini

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ setenv =
7979
; i.e: CONTRIB_REPO_SHA=dde62cebffe519c35875af6d06fae053b3be65ec tox -e <env to test>
8080
CONTRIB_REPO_SHA={env:CONTRIB_REPO_SHA:"main"}
8181
CONTRIB_REPO="git+https://github.com/open-telemetry/opentelemetry-python-contrib.git@{env:CONTRIB_REPO_SHA}"
82-
mypy: MYPYPATH={toxinidir}/opentelemetry-api/src/:{toxinidir}/tests/util/src/
82+
mypy: MYPYPATH={toxinidir}/opentelemetry-api/src/:{toxinidir}/tests/opentelemetry-tests/src/
8383

8484
changedir =
8585
api: opentelemetry-api/tests
@@ -108,7 +108,7 @@ commands_pre =
108108
py3{6,7,8,9,10}: python -m pip install -U pip setuptools wheel
109109
; Install common packages for all the tests. These are not needed in all the
110110
; cases but it saves a lot of boilerplate in this file.
111-
opentelemetry: pip install {toxinidir}/opentelemetry-api {toxinidir}/opentelemetry-semantic-conventions {toxinidir}/opentelemetry-sdk {toxinidir}/tests/util
111+
opentelemetry: pip install {toxinidir}/opentelemetry-api {toxinidir}/opentelemetry-semantic-conventions {toxinidir}/opentelemetry-sdk {toxinidir}/tests/opentelemetry-tests
112112

113113
protobuf: pip install {toxinidir}/opentelemetry-proto
114114

@@ -192,7 +192,7 @@ commands_pre =
192192
python -m pip install -e {toxinidir}/opentelemetry-semantic-conventions[test]
193193
python -m pip install -e {toxinidir}/opentelemetry-sdk[test]
194194
python -m pip install -e {toxinidir}/opentelemetry-proto[test]
195-
python -m pip install -e {toxinidir}/tests/util[test]
195+
python -m pip install -e {toxinidir}/tests/opentelemetry-tests[test]
196196
python -m pip install -e {toxinidir}/shim/opentelemetry-opentracing-shim[test]
197197
python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-jaeger-proto-grpc[test]
198198
python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-jaeger-thrift[test]
@@ -254,7 +254,7 @@ commands_pre =
254254
pip install -e {toxinidir}/opentelemetry-api \
255255
-e {toxinidir}/opentelemetry-semantic-conventions \
256256
-e {toxinidir}/opentelemetry-sdk \
257-
-e {toxinidir}/tests/util \
257+
-e {toxinidir}/tests/opentelemetry-tests \
258258
-e {toxinidir}/exporter/opentelemetry-exporter-opencensus \
259259
-e {toxinidir}/opentelemetry-proto \
260260
-e {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-grpc \

0 commit comments

Comments
 (0)