Merge branch 'main' into feat/3073

eachdist.ini

@@ -34,6 +34,7 @@ version=0.39b0.dev
 
 packages=
     opentelemetry-opentracing-shim
+    opentelemetry-opencensus-shim
     opentelemetry-exporter-opencensus
     opentelemetry-exporter-prometheus
     opentelemetry-distro

scripts/eachdist.py

@@ -576,13 +576,18 @@ def update_version_files(targets, version, packages):
 
 def update_dependencies(targets, version, packages):
     print("updating dependencies")
-    targets = filter_packages(targets, packages)
+    # PEP 508 allowed specifier operators
+    operators = ['==', '!=', '<=', '>=', '<', '>', '===', '~=', '=']
+    operators_pattern = '|'.join(re.escape(op) for op in operators)
+
     for pkg in packages:
+        search = rf"({basename(pkg)}[^,]*)({operators_pattern})(.*\.dev)"
+        replace = r"\1\2 " + version
         update_files(
             targets,
             "pyproject.toml",
-            rf"({basename(pkg)}.*)==(.*)",
-            r"\1== " + version + '",',
+            search,
+            replace,
         )
 
 

shim/opentelemetry-opencensus-shim/pyproject.toml

@@ -33,7 +33,10 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-test = ["opentelemetry-test-utils == 0.39b0.dev", "opencensus == 0.11.1"]
+test = [
+  "opentelemetry-test-utils == 0.39b0.dev",
+  "opencensus == 0.11.1",
+]
 
 [project.urls]
 Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/shim/opentelemetry-opencensus-shim"

tox.ini

@@ -300,6 +300,7 @@ commands =
 deps =
   pytest
   docker-compose >= 1.25.2
+  requests < 2.29.0
 
   ; proto 3 and 4 tests install the respective version of protobuf
   proto3: protobuf~=3.19.0