diff --git a/dev-requirements.txt b/dev-requirements.txt index 253c0895072..8ea405d92ab 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -8,6 +8,4 @@ sphinx-rtd-theme~=0.4 sphinx-autodoc-typehints~=1.10.2 pytest!=5.2.3 pytest-cov>=2.8 -readme-renderer~=24.0 -httpretty~=1.0 -opentracing~=2.2.0 \ No newline at end of file +readme-renderer~=24.0 \ No newline at end of file diff --git a/docs/examples/opentelemetry-example-app/setup.py b/docs/examples/opentelemetry-example-app/setup.py index 4d87c27afc2..02333384afb 100644 --- a/docs/examples/opentelemetry-example-app/setup.py +++ b/docs/examples/opentelemetry-example-app/setup.py @@ -43,6 +43,7 @@ "requests", "protobuf~=3.11", ], + extras_require={"test": []}, license="Apache-2.0", package_dir={"": "src"}, packages=setuptools.find_namespace_packages(where="src"), diff --git a/ext/opentelemetry-exporter-cloud-monitoring/setup.cfg b/ext/opentelemetry-exporter-cloud-monitoring/setup.cfg index 37665ee48bc..8875937751f 100644 --- a/ext/opentelemetry-exporter-cloud-monitoring/setup.cfg +++ b/ext/opentelemetry-exporter-cloud-monitoring/setup.cfg @@ -45,4 +45,7 @@ install_requires = google-cloud-monitoring [options.packages.find] -where = src \ No newline at end of file +where = src + +[options.extras_require] +test = diff --git a/ext/opentelemetry-exporter-cloud-trace/setup.cfg b/ext/opentelemetry-exporter-cloud-trace/setup.cfg index df6c2ce587b..41ffc4116ad 100644 --- a/ext/opentelemetry-exporter-cloud-trace/setup.cfg +++ b/ext/opentelemetry-exporter-cloud-trace/setup.cfg @@ -45,3 +45,6 @@ install_requires = [options.packages.find] where = src + +[options.extras_require] +test = diff --git a/ext/opentelemetry-ext-aiohttp-client/setup.cfg b/ext/opentelemetry-ext-aiohttp-client/setup.cfg index e2a6493922c..74fc3a9a86c 100644 --- a/ext/opentelemetry-ext-aiohttp-client/setup.cfg +++ b/ext/opentelemetry-ext-aiohttp-client/setup.cfg @@ -45,3 +45,6 @@ install_requires = [options.packages.find] where = src + +[options.extras_require] +test = diff --git a/ext/opentelemetry-ext-datadog/setup.cfg b/ext/opentelemetry-ext-datadog/setup.cfg index afdd739d123..074206dc826 100644 --- a/ext/opentelemetry-ext-datadog/setup.cfg +++ b/ext/opentelemetry-ext-datadog/setup.cfg @@ -45,3 +45,6 @@ install_requires = [options.packages.find] where = src + +[options.extras_require] +test = diff --git a/ext/opentelemetry-ext-jaeger/setup.cfg b/ext/opentelemetry-ext-jaeger/setup.cfg index 339ac32c287..9d734606bba 100644 --- a/ext/opentelemetry-ext-jaeger/setup.cfg +++ b/ext/opentelemetry-ext-jaeger/setup.cfg @@ -46,3 +46,6 @@ install_requires = [options.packages.find] where = src + +[options.extras_require] +test = diff --git a/ext/opentelemetry-ext-opencensusexporter/setup.cfg b/ext/opentelemetry-ext-opencensusexporter/setup.cfg index 11fc3a61c7c..96c30ac9af6 100644 --- a/ext/opentelemetry-ext-opencensusexporter/setup.cfg +++ b/ext/opentelemetry-ext-opencensusexporter/setup.cfg @@ -48,3 +48,6 @@ install_requires = [options.packages.find] where = src + +[options.extras_require] +test = diff --git a/ext/opentelemetry-ext-opentracing-shim/setup.cfg b/ext/opentelemetry-ext-opentracing-shim/setup.cfg index 2ad18381c56..ceb7d4c0ad5 100644 --- a/ext/opentelemetry-ext-opentracing-shim/setup.cfg +++ b/ext/opentelemetry-ext-opentracing-shim/setup.cfg @@ -47,6 +47,7 @@ install_requires = [options.extras_require] test = opentelemetry-test == 0.9.dev0 + opentracing ~= 2.2.0 [options.packages.find] where = src diff --git a/ext/opentelemetry-ext-prometheus/setup.cfg b/ext/opentelemetry-ext-prometheus/setup.cfg index 653c72a4049..14b9f409a40 100644 --- a/ext/opentelemetry-ext-prometheus/setup.cfg +++ b/ext/opentelemetry-ext-prometheus/setup.cfg @@ -46,3 +46,6 @@ install_requires = [options.packages.find] where = src + +[options.extras_require] +test = diff --git a/ext/opentelemetry-ext-zipkin/setup.cfg b/ext/opentelemetry-ext-zipkin/setup.cfg index 809db512375..cc945f8ba34 100644 --- a/ext/opentelemetry-ext-zipkin/setup.cfg +++ b/ext/opentelemetry-ext-zipkin/setup.cfg @@ -46,3 +46,6 @@ install_requires = [options.packages.find] where = src + +[options.extras_require] +test = diff --git a/opentelemetry-api/setup.cfg b/opentelemetry-api/setup.cfg index d6d68a710d3..8300be0d0ac 100644 --- a/opentelemetry-api/setup.cfg +++ b/opentelemetry-api/setup.cfg @@ -57,3 +57,6 @@ opentelemetry_meter_provider = default_meter_provider = opentelemetry.metrics:DefaultMeterProvider opentelemetry_tracer_provider = default_tracer_provider = opentelemetry.trace:DefaultTracerProvider + +[options.extras_require] +test = diff --git a/opentelemetry-instrumentation/setup.cfg b/opentelemetry-instrumentation/setup.cfg index 119beeec113..98c1fa40967 100644 --- a/opentelemetry-instrumentation/setup.cfg +++ b/opentelemetry-instrumentation/setup.cfg @@ -52,3 +52,6 @@ where = src console_scripts = opentelemetry-instrument = opentelemetry.instrumentation.auto_instrumentation:run opentelemetry-bootstrap = opentelemetry.instrumentation.bootstrap:run + +[options.extras_require] +test = diff --git a/opentelemetry-proto/setup.cfg b/opentelemetry-proto/setup.cfg index 3796b5ef496..59b0309ad48 100644 --- a/opentelemetry-proto/setup.cfg +++ b/opentelemetry-proto/setup.cfg @@ -46,3 +46,6 @@ install_requires = [options.packages.find] where = src + +[options.extras_require] +test = diff --git a/opentelemetry-sdk/setup.cfg b/opentelemetry-sdk/setup.cfg index 323bca728f3..a5cff106aff 100644 --- a/opentelemetry-sdk/setup.cfg +++ b/opentelemetry-sdk/setup.cfg @@ -52,3 +52,6 @@ opentelemetry_meter_provider = sdk_meter_provider = opentelemetry.sdk.metrics:MeterProvider opentelemetry_tracer_provider = sdk_tracer_provider = opentelemetry.sdk.trace:TracerProvider + +[options.extras_require] +test = diff --git a/scripts/eachdist.py b/scripts/eachdist.py index f1c5e18b60b..15b9b8edcbb 100755 --- a/scripts/eachdist.py +++ b/scripts/eachdist.py @@ -205,6 +205,7 @@ def setup_instparser(instparser): setup_instparser(instparser) instparser.add_argument("--editable", "-e", action="store_true") + instparser.add_argument("--with-test-deps", action="store_true") instparser.add_argument("--with-dev-deps", action="store_true") instparser.add_argument("--eager-upgrades", action="store_true") @@ -214,7 +215,10 @@ def setup_instparser(instparser): ) setup_instparser(devparser) devparser.set_defaults( - editable=True, with_dev_deps=True, eager_upgrades=True + editable=True, + with_dev_deps=True, + eager_upgrades=True, + with_test_deps=True, ) lintparser = subparsers.add_parser( @@ -424,7 +428,16 @@ def install_args(args): check=True, ) - allfmt = "-e 'file://{}'" if args.editable else "'file://{}'" + allfmt = "-e 'file://{}" if args.editable else "'file://{}" + # packages should provide an extra_requires that is named + # 'test', to denote test dependencies. + extras = [] + if args.with_test_deps: + extras.append("test") + if extras: + allfmt += "[{}]".format(",".join(extras)) + # note the trailing single quote, to close the quote opened above. + allfmt += "'" execute_args( parse_subargs( args,