require dependency for api/sdk to match major version (#1933)

open-telemetry · Jul 12, 2021 · da16df0 · da16df0
1 parent f11ed2f
commit da16df0
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#1915](https://github.com/open-telemetry/opentelemetry-python/pull/1915))
 - Fix OTLP SpanExporter to distinguish spans based off Resource and InstrumentationInfo
   ([#1927](https://github.com/open-telemetry/opentelemetry-python/pull/1927))
+- Updating dependency for opentelemetry api/sdk packages to support major version instead of
+  pinning to specific versions.
+  ([#1933](https://github.com/open-telemetry/opentelemetry-python/pull/1933))
 
 ### Fixed
 - Updated `opentelementry-opentracing-shim` `ScopeShim` to report exceptions in

diff --git a/docs/examples/error_handler/error_handler_0/setup.cfg b/docs/examples/error_handler/error_handler_0/setup.cfg
@@ -36,7 +36,7 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-sdk == 1.4.0.dev0
+    opentelemetry-sdk ~= 1.3
 
 [options.packages.find]
 where = src

diff --git a/docs/examples/error_handler/error_handler_1/setup.cfg b/docs/examples/error_handler/error_handler_1/setup.cfg
@@ -36,7 +36,7 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-sdk == 1.4.0.dev0
+    opentelemetry-sdk ~= 1.3
 
 [options.packages.find]
 where = src

diff --git a/exporter/opentelemetry-exporter-jaeger-proto-grpc/setup.cfg b/exporter/opentelemetry-exporter-jaeger-proto-grpc/setup.cfg
@@ -42,8 +42,8 @@ packages=find_namespace:
 install_requires =
     grpcio >= 1.0.0, < 2.0.0
     googleapis-common-protos ~= 1.52
-    opentelemetry-api == 1.4.0.dev0
-    opentelemetry-sdk == 1.4.0.dev0
+    opentelemetry-api ~= 1.3
+    opentelemetry-sdk ~= 1.3
 
 [options.packages.find]
 where = src

diff --git a/exporter/opentelemetry-exporter-jaeger-thrift/setup.cfg b/exporter/opentelemetry-exporter-jaeger-thrift/setup.cfg
@@ -41,8 +41,8 @@ package_dir=
 packages=find_namespace:
 install_requires =
     thrift >= 0.10.0
-    opentelemetry-api == 1.4.0.dev0
-    opentelemetry-sdk == 1.4.0.dev0
+    opentelemetry-api ~= 1.3
+    opentelemetry-sdk ~= 1.3
 
 [options.packages.find]
 where = src

diff --git a/exporter/opentelemetry-exporter-opencensus/setup.cfg b/exporter/opentelemetry-exporter-opencensus/setup.cfg
@@ -42,8 +42,8 @@ packages=find_namespace:
 install_requires =
     grpcio >= 1.0.0, < 2.0.0
     opencensus-proto >= 0.1.0, < 1.0.0
-    opentelemetry-api == 1.4.0.dev0
-    opentelemetry-sdk == 1.4.0.dev0
+    opentelemetry-api ~= 1.3
+    opentelemetry-sdk ~= 1.3
     protobuf >= 3.13.0
 
 [options.packages.find]

diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg b/exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg
@@ -41,8 +41,8 @@ packages=find_namespace:
 install_requires =
     grpcio >= 1.0.0, < 2.0.0
     googleapis-common-protos ~= 1.52
-    opentelemetry-api == 1.4.0.dev0
-    opentelemetry-sdk == 1.4.0.dev0
+    opentelemetry-api ~= 1.3
+    opentelemetry-sdk ~= 1.3
     opentelemetry-proto == 1.4.0.dev0
     backoff ~= 1.10.0
 

diff --git a/exporter/opentelemetry-exporter-zipkin-json/setup.cfg b/exporter/opentelemetry-exporter-zipkin-json/setup.cfg
@@ -42,8 +42,8 @@ package_dir=
 packages=find_namespace:
 install_requires =
     requests ~= 2.7
-    opentelemetry-api == 1.4.0.dev0
-    opentelemetry-sdk == 1.4.0.dev0
+    opentelemetry-api ~= 1.3
+    opentelemetry-sdk ~= 1.3
 
 [options.packages.find]
 where = src

diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg b/exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg
@@ -43,8 +43,8 @@ packages=find_namespace:
 install_requires =
     protobuf >= 3.12
     requests ~= 2.7
-    opentelemetry-api == 1.4.0.dev0
-    opentelemetry-sdk == 1.4.0.dev0
+    opentelemetry-api ~= 1.3
+    opentelemetry-sdk ~= 1.3
     opentelemetry-exporter-zipkin-json == 1.4.0.dev0
 
 [options.packages.find]

diff --git a/opentelemetry-distro/setup.cfg b/opentelemetry-distro/setup.cfg
@@ -41,7 +41,7 @@ packages=find_namespace:
 zip_safe = False
 include_package_data = True
 install_requires =
-    opentelemetry-api == 1.4.0.dev0
+    opentelemetry-api ~= 1.3
     opentelemetry-instrumentation == 0.23.dev0
     opentelemetry-sdk == 1.4.0.dev0
 

diff --git a/propagator/opentelemetry-propagator-b3/setup.cfg b/propagator/opentelemetry-propagator-b3/setup.cfg
@@ -40,7 +40,7 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 1.4.0.dev0
+    opentelemetry-api ~= 1.3
     deprecated >= 1.2.6
 
 [options.extras_require]

diff --git a/propagator/opentelemetry-propagator-jaeger/setup.cfg b/propagator/opentelemetry-propagator-jaeger/setup.cfg
@@ -40,7 +40,7 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 1.4.0.dev0
+    opentelemetry-api ~= 1.3
 
 [options.extras_require]
 test =

diff --git a/shim/opentelemetry-opentracing-shim/setup.cfg b/shim/opentelemetry-opentracing-shim/setup.cfg
@@ -42,7 +42,7 @@ packages=find_namespace:
 install_requires =
     Deprecated >= 1.2.6
     opentracing ~= 2.0
-    opentelemetry-api == 1.4.0.dev0
+    opentelemetry-api ~= 1.3
 
 [options.extras_require]
 test =

diff --git a/tests/util/setup.cfg b/tests/util/setup.cfg
@@ -37,8 +37,8 @@ package_dir=
     =src
 packages=find_namespace:
 install_requires =
-    opentelemetry-api == 1.4.0.dev0
-    opentelemetry-sdk == 1.4.0.dev0
+    opentelemetry-api ~= 1.3
+    opentelemetry-sdk ~= 1.3
 
 [options.extras_require]
 test = flask~=1.0