Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 731f577

Browse files
authored
chore: installation of test packages in eachdist (open-telemetry#794)
eachdist.py did not support the installation of test packages, (as defined by the extra_requires:test package group). As a result, test packages were being added to dev-requirements.txt By having eachdist.py develop install test packages, and moving develop/test package definitions to the individual instrumentations, it is easier to determine which packages require which dependencies for testing purposes, and enables support for existing dependencies that follow the extra_requires:test pattern.
1 parent 94aabcb commit 731f577

File tree

16 files changed

+55
-6
lines changed

16 files changed

+55
-6
lines changed

dev-requirements.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,4 @@ sphinx-rtd-theme~=0.4
88
sphinx-autodoc-typehints~=1.10.2
99
pytest!=5.2.3
1010
pytest-cov>=2.8
11-
readme-renderer~=24.0
12-
httpretty~=1.0
13-
opentracing~=2.2.0
11+
readme-renderer~=24.0

docs/examples/opentelemetry-example-app/setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"requests",
4444
"protobuf~=3.11",
4545
],
46+
extras_require={"test": []},
4647
license="Apache-2.0",
4748
package_dir={"": "src"},
4849
packages=setuptools.find_namespace_packages(where="src"),

ext/opentelemetry-exporter-cloud-monitoring/setup.cfg

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,7 @@ install_requires =
4545
google-cloud-monitoring
4646

4747
[options.packages.find]
48-
where = src
48+
where = src
49+
50+
[options.extras_require]
51+
test =

ext/opentelemetry-exporter-cloud-trace/setup.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,6 @@ install_requires =
4545

4646
[options.packages.find]
4747
where = src
48+
49+
[options.extras_require]
50+
test =

ext/opentelemetry-ext-aiohttp-client/setup.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,6 @@ install_requires =
4545

4646
[options.packages.find]
4747
where = src
48+
49+
[options.extras_require]
50+
test =

ext/opentelemetry-ext-datadog/setup.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,6 @@ install_requires =
4545

4646
[options.packages.find]
4747
where = src
48+
49+
[options.extras_require]
50+
test =

ext/opentelemetry-ext-jaeger/setup.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,6 @@ install_requires =
4646

4747
[options.packages.find]
4848
where = src
49+
50+
[options.extras_require]
51+
test =

ext/opentelemetry-ext-opencensusexporter/setup.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,6 @@ install_requires =
4848

4949
[options.packages.find]
5050
where = src
51+
52+
[options.extras_require]
53+
test =

ext/opentelemetry-ext-opentracing-shim/setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ install_requires =
4747
[options.extras_require]
4848
test =
4949
opentelemetry-test == 0.9.dev0
50+
opentracing ~= 2.2.0
5051

5152
[options.packages.find]
5253
where = src

ext/opentelemetry-ext-prometheus/setup.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,6 @@ install_requires =
4646

4747
[options.packages.find]
4848
where = src
49+
50+
[options.extras_require]
51+
test =

ext/opentelemetry-ext-zipkin/setup.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,6 @@ install_requires =
4646

4747
[options.packages.find]
4848
where = src
49+
50+
[options.extras_require]
51+
test =

opentelemetry-api/setup.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,6 @@ opentelemetry_meter_provider =
5757
default_meter_provider = opentelemetry.metrics:DefaultMeterProvider
5858
opentelemetry_tracer_provider =
5959
default_tracer_provider = opentelemetry.trace:DefaultTracerProvider
60+
61+
[options.extras_require]
62+
test =

opentelemetry-instrumentation/setup.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,6 @@ where = src
5252
console_scripts =
5353
opentelemetry-instrument = opentelemetry.instrumentation.auto_instrumentation:run
5454
opentelemetry-bootstrap = opentelemetry.instrumentation.bootstrap:run
55+
56+
[options.extras_require]
57+
test =

opentelemetry-proto/setup.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,6 @@ install_requires =
4646

4747
[options.packages.find]
4848
where = src
49+
50+
[options.extras_require]
51+
test =

opentelemetry-sdk/setup.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,6 @@ opentelemetry_meter_provider =
5252
sdk_meter_provider = opentelemetry.sdk.metrics:MeterProvider
5353
opentelemetry_tracer_provider =
5454
sdk_tracer_provider = opentelemetry.sdk.trace:TracerProvider
55+
56+
[options.extras_require]
57+
test =

scripts/eachdist.py

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ def setup_instparser(instparser):
205205

206206
setup_instparser(instparser)
207207
instparser.add_argument("--editable", "-e", action="store_true")
208+
instparser.add_argument("--with-test-deps", action="store_true")
208209
instparser.add_argument("--with-dev-deps", action="store_true")
209210
instparser.add_argument("--eager-upgrades", action="store_true")
210211

@@ -214,7 +215,10 @@ def setup_instparser(instparser):
214215
)
215216
setup_instparser(devparser)
216217
devparser.set_defaults(
217-
editable=True, with_dev_deps=True, eager_upgrades=True
218+
editable=True,
219+
with_dev_deps=True,
220+
eager_upgrades=True,
221+
with_test_deps=True,
218222
)
219223

220224
lintparser = subparsers.add_parser(
@@ -424,7 +428,16 @@ def install_args(args):
424428
check=True,
425429
)
426430

427-
allfmt = "-e 'file://{}'" if args.editable else "'file://{}'"
431+
allfmt = "-e 'file://{}" if args.editable else "'file://{}"
432+
# packages should provide an extra_requires that is named
433+
# 'test', to denote test dependencies.
434+
extras = []
435+
if args.with_test_deps:
436+
extras.append("test")
437+
if extras:
438+
allfmt += "[{}]".format(",".join(extras))
439+
# note the trailing single quote, to close the quote opened above.
440+
allfmt += "'"
428441
execute_args(
429442
parse_subargs(
430443
args,

0 commit comments

Comments
 (0)