Rename version.py files to version/__init__.py (#4099)

* Rename version.py files to version/__init__.py Fixes #4097 * Use a better variable name
open-telemetry · Sep 25, 2024 · cafd7f2 · cafd7f2
1 parent f15821f
commit cafd7f2
Show file tree

Hide file tree

Showing 34 changed files with 44 additions and 24 deletions.
diff --git a/.github/workflows/prepare-release-branch.yml b/.github/workflows/prepare-release-branch.yml
@@ -41,6 +41,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install toml
+        run: pip install toml
+
       - name: Create release branch
         env:
           PRERELEASE_VERSION: ${{ github.event.inputs.prerelease_version }}
@@ -105,6 +108,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install toml
+        run: pip install toml
+
       - name: Set environment variables
         env:
           PRERELEASE_VERSION: ${{ github.event.inputs.prerelease_version }}

diff --git a/docs/examples/error_handler/error_handler_0/pyproject.toml b/docs/examples/error_handler/error_handler_0/pyproject.toml
@@ -32,7 +32,7 @@ dependencies = [
 error_handler_0 = "error_handler_0:ErrorHandler0"
 
 [tool.hatch.version]
-path = "src/error_handler_0/version.py"
+path = "src/error_handler_0/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [

diff --git a/..._handler_0/src/error_handler_0/version.py → ...0/src/error_handler_0/version/__init__.py b/..._handler_0/src/error_handler_0/version.py → ...0/src/error_handler_0/version/__init__.py
diff --git a/docs/examples/error_handler/error_handler_1/pyproject.toml b/docs/examples/error_handler/error_handler_1/pyproject.toml
@@ -32,7 +32,7 @@ dependencies = [
 error_handler_1 = "error_handler_1:ErrorHandler1"
 
 [tool.hatch.version]
-path = "src/error_handler_1/version.py"
+path = "src/error_handler_1/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [

diff --git a/..._handler_1/src/error_handler_1/version.py → ...1/src/error_handler_1/version/__init__.py b/..._handler_1/src/error_handler_1/version.py → ...1/src/error_handler_1/version/__init__.py
diff --git a/exporter/opentelemetry-exporter-opencensus/pyproject.toml b/exporter/opentelemetry-exporter-opencensus/pyproject.toml
@@ -43,7 +43,7 @@ opencensus = "opentelemetry.exporter.opencensus.trace_exporter:OpenCensusSpanExp
 Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-opencensus"
 
 [tool.hatch.version]
-path = "src/opentelemetry/exporter/opencensus/version.py"
+path = "src/opentelemetry/exporter/opencensus/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [

diff --git a/...ntelemetry/exporter/opencensus/version.py → ...y/exporter/opencensus/version/__init__.py b/...ntelemetry/exporter/opencensus/version.py → ...y/exporter/opencensus/version/__init__.py
diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml
@@ -34,7 +34,7 @@ dependencies = [
 Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-common"
 
 [tool.hatch.version]
-path = "src/opentelemetry/exporter/otlp/proto/common/version.py"
+path = "src/opentelemetry/exporter/otlp/proto/common/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [

diff --git a/...try/exporter/otlp/proto/common/version.py → ...ter/otlp/proto/common/version/__init__.py b/...try/exporter/otlp/proto/common/version.py → ...ter/otlp/proto/common/version/__init__.py
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml
@@ -49,7 +49,7 @@ otlp_proto_grpc = "opentelemetry.exporter.otlp.proto.grpc.trace_exporter:OTLPSpa
 Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-grpc"
 
 [tool.hatch.version]
-path = "src/opentelemetry/exporter/otlp/proto/grpc/version.py"
+path = "src/opentelemetry/exporter/otlp/proto/grpc/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [

diff --git a/...metry/exporter/otlp/proto/grpc/version.py → ...orter/otlp/proto/grpc/version/__init__.py b/...metry/exporter/otlp/proto/grpc/version.py → ...orter/otlp/proto/grpc/version/__init__.py
diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml
@@ -49,7 +49,7 @@ otlp_proto_http = "opentelemetry.exporter.otlp.proto.http._log_exporter:OTLPLogE
 Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-http"
 
 [tool.hatch.version]
-path = "src/opentelemetry/exporter/otlp/proto/http/version.py"
+path = "src/opentelemetry/exporter/otlp/proto/http/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [

diff --git a/...metry/exporter/otlp/proto/http/version.py → ...orter/otlp/proto/http/version/__init__.py b/...metry/exporter/otlp/proto/http/version.py → ...orter/otlp/proto/http/version/__init__.py
diff --git a/exporter/opentelemetry-exporter-otlp/pyproject.toml b/exporter/opentelemetry-exporter-otlp/pyproject.toml
@@ -45,7 +45,7 @@ otlp = "opentelemetry.exporter.otlp.proto.grpc.trace_exporter:OTLPSpanExporter"
 Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp"
 
 [tool.hatch.version]
-path = "src/opentelemetry/exporter/otlp/version.py"
+path = "src/opentelemetry/exporter/otlp/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [

diff --git a/...rc/opentelemetry/exporter/otlp/version.py → ...lemetry/exporter/otlp/version/__init__.py b/...rc/opentelemetry/exporter/otlp/version.py → ...lemetry/exporter/otlp/version/__init__.py
diff --git a/exporter/opentelemetry-exporter-prometheus/pyproject.toml b/exporter/opentelemetry-exporter-prometheus/pyproject.toml
@@ -40,7 +40,7 @@ prometheus = "opentelemetry.exporter.prometheus:_AutoPrometheusMetricReader"
 Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-prometheus"
 
 [tool.hatch.version]
-path = "src/opentelemetry/exporter/prometheus/version.py"
+path = "src/opentelemetry/exporter/prometheus/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [

diff --git a/...ntelemetry/exporter/prometheus/version.py → ...y/exporter/prometheus/version/__init__.py b/...ntelemetry/exporter/prometheus/version.py → ...y/exporter/prometheus/version/__init__.py
diff --git a/exporter/opentelemetry-exporter-zipkin-json/pyproject.toml b/exporter/opentelemetry-exporter-zipkin-json/pyproject.toml
@@ -40,7 +40,7 @@ zipkin_json = "opentelemetry.exporter.zipkin.json:ZipkinExporter"
 Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-zipkin-json"
 
 [tool.hatch.version]
-path = "src/opentelemetry/exporter/zipkin/json/version.py"
+path = "src/opentelemetry/exporter/zipkin/json/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [

diff --git a/...telemetry/exporter/zipkin/json/version.py → .../exporter/zipkin/json/version/__init__.py b/...telemetry/exporter/zipkin/json/version.py → .../exporter/zipkin/json/version/__init__.py
diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml b/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml
@@ -42,7 +42,7 @@ zipkin_proto = "opentelemetry.exporter.zipkin.proto.http:ZipkinExporter"
 Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-zipkin-proto-http"
 
 [tool.hatch.version]
-path = "src/opentelemetry/exporter/zipkin/proto/http/version.py"
+path = "src/opentelemetry/exporter/zipkin/proto/http/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [

diff --git a/...try/exporter/zipkin/proto/http/version.py → ...ter/zipkin/proto/http/version/__init__.py b/...try/exporter/zipkin/proto/http/version.py → ...ter/zipkin/proto/http/version/__init__.py
diff --git a/exporter/opentelemetry-exporter-zipkin/pyproject.toml b/exporter/opentelemetry-exporter-zipkin/pyproject.toml
@@ -39,7 +39,7 @@ zipkin = "opentelemetry.exporter.zipkin.proto.http:ZipkinExporter"
 Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-zipkin"
 
 [tool.hatch.version]
-path = "src/opentelemetry/exporter/zipkin/version.py"
+path = "src/opentelemetry/exporter/zipkin/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [

diff --git a/.../opentelemetry/exporter/zipkin/version.py → ...metry/exporter/zipkin/version/__init__.py b/.../opentelemetry/exporter/zipkin/version.py → ...metry/exporter/zipkin/version/__init__.py
diff --git a/propagator/opentelemetry-propagator-b3/pyproject.toml b/propagator/opentelemetry-propagator-b3/pyproject.toml
@@ -39,7 +39,7 @@ b3multi = "opentelemetry.propagators.b3:B3MultiFormat"
 Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/propagator/opentelemetry-propagator-b3"
 
 [tool.hatch.version]
-path = "src/opentelemetry/propagators/b3/version.py"
+path = "src/opentelemetry/propagators/b3/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [

diff --git a/...c/opentelemetry/propagators/b3/version.py → ...emetry/propagators/b3/version/__init__.py b/...c/opentelemetry/propagators/b3/version.py → ...emetry/propagators/b3/version/__init__.py
diff --git a/propagator/opentelemetry-propagator-jaeger/pyproject.toml b/propagator/opentelemetry-propagator-jaeger/pyproject.toml
@@ -37,7 +37,7 @@ jaeger = "opentelemetry.propagators.jaeger:JaegerPropagator"
 Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/propagator/opentelemetry-propagator-jaeger"
 
 [tool.hatch.version]
-path = "src/opentelemetry/propagators/jaeger/version.py"
+path = "src/opentelemetry/propagators/jaeger/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [

diff --git a/...entelemetry/propagators/jaeger/version.py → ...ry/propagators/jaeger/version/__init__.py b/...entelemetry/propagators/jaeger/version.py → ...ry/propagators/jaeger/version/__init__.py
diff --git a/scripts/eachdist.py b/scripts/eachdist.py
@@ -7,6 +7,7 @@
 import shutil
 import subprocess
 import sys
+from toml import load
 from configparser import ConfigParser
 from inspect import cleandoc
 from itertools import chain
@@ -554,14 +555,27 @@ def filter_packages(targets, packages):
 
 
 def update_version_files(targets, version, packages):
-    print("updating version.py files")
-    targets = filter_packages(targets, packages)
-    update_files(
-        targets,
-        "version.py",
-        "__version__ .*",
-        f'__version__ = "{version}"',
-    )
+    print("updating version/__init__.py files")
+
+    search = "__version__ .*"
+    replace = f'__version__ = "{version}"'
+
+    for target in filter_packages(targets, packages):
+
+        version_file_path = target.joinpath(
+            load(target.joinpath("pyproject.toml"))
+            ["tool"]["hatch"]["version"]["path"]
+        )
+
+        with open(version_file_path) as file:
+            text = file.read()
+
+        if replace in text:
+            print(f"{version_file_path} already contains {replace}")
+            continue
+
+        with open(version_file_path, "w", encoding="utf-8") as file:
+            file.write(re.sub(search, replace, text))
 
 
 def update_dependencies(targets, version, packages):

diff --git a/shim/opentelemetry-opencensus-shim/pyproject.toml b/shim/opentelemetry-opencensus-shim/pyproject.toml
@@ -39,7 +39,7 @@ dependencies = [
 Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/shim/opentelemetry-opencensus-shim"
 
 [tool.hatch.version]
-path = "src/opentelemetry/shim/opencensus/version.py"
+path = "src/opentelemetry/shim/opencensus/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = ["/src", "/tests"]

diff --git a/.../opentelemetry/shim/opencensus/version.py → ...metry/shim/opencensus/version/__init__.py b/.../opentelemetry/shim/opencensus/version.py → ...metry/shim/opencensus/version/__init__.py
diff --git a/shim/opentelemetry-opentracing-shim/pyproject.toml b/shim/opentelemetry-opentracing-shim/pyproject.toml
@@ -36,7 +36,7 @@ dependencies = [
 Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/shim/opentelemetry-opentracing-shim"
 
 [tool.hatch.version]
-path = "src/opentelemetry/shim/opentracing_shim/version.py"
+path = "src/opentelemetry/shim/opentracing_shim/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [

diff --git a/...elemetry/shim/opentracing_shim/version.py → ...shim/opentracing_shim/version/__init__.py b/...elemetry/shim/opentracing_shim/version.py → ...shim/opentracing_shim/version/__init__.py
diff --git a/tests/opentelemetry-test-utils/pyproject.toml b/tests/opentelemetry-test-utils/pyproject.toml
@@ -35,7 +35,7 @@ dependencies = [
 Homepage = "https://github.com/open-telemetry/opentelemetry-python/tests/opentelemetry-test-utils"
 
 [tool.hatch.version]
-path = "src/opentelemetry/test/version.py"
+path = "src/opentelemetry/test/version/__init__.py"
 
 [tool.hatch.build.targets.sdist]
 include = [

diff --git a/...t-utils/src/opentelemetry/test/version.py → ...rc/opentelemetry/test/version/__init__.py b/...t-utils/src/opentelemetry/test/version.py → ...rc/opentelemetry/test/version/__init__.py