Skip to content

Commit 2d8195b

Browse files
[release/v1.26.x-0.47bx] Prepare release 1.26.0/0.47b0 (#4076)
* Prepare release 1.26.0/0.47b0 * Fix remaining versions * Update SHA * Update SHA in lint --------- Co-authored-by: Diego Hurtado <[email protected]>
1 parent 3f95781 commit 2d8195b

File tree

33 files changed

+58
-41
lines changed

33 files changed

+58
-41
lines changed

.github/workflows/lint.yml

+17
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,23 @@ on:
55
branches-ignore:
66
- 'release/*'
77
pull_request:
8+
env:
9+
# Set variable to 'main' if your change will not affect Contrib.
10+
# Otherwise, set variable to the commit of your branch on
11+
# opentelemetry-python-contrib which is compatible with these Core repo
12+
# changes.
13+
CONTRIB_REPO_SHA: c5a4de79586e5cbc4f6ff616e3fb136f98c8a7a1
14+
15+
# This is needed because we do not clone the core repo in contrib builds anymore.
16+
# When running contrib builds as part of core builds, we use actions/checkout@v4 which
17+
# does not set an environment variable (simply just runs tox), which is different when
18+
# contrib builds are run directly from contrib (since test.yml is executed, which sets CORE_REPO_SHA)
19+
# The solution is to include CORE_REPO_SHA as part of THIS environment so it can be accessed
20+
# from within the contrib build.
21+
CORE_REPO_SHA: ${{ github.sha }}
22+
23+
# See #3879 and https://pip.pypa.io/en/stable/cli/pip/#exists-action-option
24+
PIP_EXISTS_ACTION: w
825

926
jobs:
1027
lint-3_12:

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
# Otherwise, set variable to the commit of your branch on
1111
# opentelemetry-python-contrib which is compatible with these Core repo
1212
# changes.
13-
CONTRIB_REPO_SHA: main
13+
CONTRIB_REPO_SHA: c5a4de79586e5cbc4f6ff616e3fb136f98c8a7a1
1414

1515
# This is needed because we do not clone the core repo in contrib builds anymore.
1616
# When running contrib builds as part of core builds, we use actions/checkout@v4 which

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## Unreleased
8+
## Version 1.26.0/0.47b0 (2024-07-23)
99

1010
- Standardizing timeout calculation in measurement consumer collect to nanoseconds
1111
([#4074](https://github.com/open-telemetry/opentelemetry-python/pull/4074))

eachdist.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ sortfirst=
1111
exporter/*
1212

1313
[stable]
14-
version=1.26.0.dev
14+
version=1.26.0
1515

1616
packages=
1717
opentelemetry-sdk
@@ -27,7 +27,7 @@ packages=
2727
opentelemetry-api
2828

2929
[prerelease]
30-
version=0.47b0.dev
30+
version=0.47b0
3131

3232
packages=
3333
opentelemetry-opentracing-shim

exporter/opentelemetry-exporter-opencensus/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ classifiers = [
3030
dependencies = [
3131
"grpcio >= 1.0.0, < 2.0.0",
3232
"opencensus-proto >= 0.1.0, < 1.0.0",
33-
"opentelemetry-api >= 1.26.0.dev",
33+
"opentelemetry-api >= 1.26.0",
3434
"opentelemetry-sdk >= 1.15",
3535
"protobuf ~= 3.13",
3636
"setuptools >= 16.0",

exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.47b0.dev"
15+
__version__ = "0.47b0"

exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ classifiers = [
2727
"Programming Language :: Python :: 3.12",
2828
]
2929
dependencies = [
30-
"opentelemetry-proto == 1.26.0.dev",
30+
"opentelemetry-proto == 1.26.0",
3131
]
3232

3333
[project.urls]

exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "1.26.0.dev"
15+
__version__ = "1.26.0"

exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ dependencies = [
3131
"googleapis-common-protos ~= 1.52",
3232
"grpcio >= 1.0.0, < 2.0.0",
3333
"opentelemetry-api ~= 1.15",
34-
"opentelemetry-proto == 1.26.0.dev",
35-
"opentelemetry-sdk ~= 1.26.0.dev",
36-
"opentelemetry-exporter-otlp-proto-common == 1.26.0.dev",
34+
"opentelemetry-proto == 1.26.0",
35+
"opentelemetry-sdk ~= 1.26.0",
36+
"opentelemetry-exporter-otlp-proto-common == 1.26.0",
3737
]
3838

3939
[project.entry-points.opentelemetry_logs_exporter]

exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "1.26.0.dev"
15+
__version__ = "1.26.0"

exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ dependencies = [
3030
"Deprecated >= 1.2.6",
3131
"googleapis-common-protos ~= 1.52",
3232
"opentelemetry-api ~= 1.15",
33-
"opentelemetry-proto == 1.26.0.dev",
34-
"opentelemetry-sdk ~= 1.26.0.dev",
35-
"opentelemetry-exporter-otlp-proto-common == 1.26.0.dev",
33+
"opentelemetry-proto == 1.26.0",
34+
"opentelemetry-sdk ~= 1.26.0",
35+
"opentelemetry-exporter-otlp-proto-common == 1.26.0",
3636
"requests ~= 2.7",
3737
]
3838

exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "1.26.0.dev"
15+
__version__ = "1.26.0"

exporter/opentelemetry-exporter-otlp/pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ classifiers = [
2828
"Typing :: Typed",
2929
]
3030
dependencies = [
31-
"opentelemetry-exporter-otlp-proto-grpc == 1.26.0.dev",
32-
"opentelemetry-exporter-otlp-proto-http == 1.26.0.dev",
31+
"opentelemetry-exporter-otlp-proto-grpc == 1.26.0",
32+
"opentelemetry-exporter-otlp-proto-http == 1.26.0",
3333
]
3434

3535
[project.entry-points.opentelemetry_logs_exporter]

exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "1.26.0.dev"
15+
__version__ = "1.26.0"

exporter/opentelemetry-exporter-prometheus/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ classifiers = [
2929
dependencies = [
3030
"opentelemetry-api ~= 1.12",
3131
# DONOTMERGE: confirm that this will becomes ~= 1.21 in the next release
32-
"opentelemetry-sdk ~= 1.26.0.dev",
32+
"opentelemetry-sdk ~= 1.26.0",
3333
"prometheus_client >= 0.5.0, < 1.0.0",
3434
]
3535

exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.47b0.dev"
15+
__version__ = "0.47b0"

exporter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "1.26.0.dev"
15+
__version__ = "1.26.0"

exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ classifiers = [
2929
]
3030
dependencies = [
3131
"opentelemetry-api ~= 1.3",
32-
"opentelemetry-exporter-zipkin-json == 1.26.0.dev",
32+
"opentelemetry-exporter-zipkin-json == 1.26.0",
3333
"opentelemetry-sdk ~= 1.11",
3434
"protobuf ~= 3.12",
3535
"requests ~= 2.7",

exporter/opentelemetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "1.26.0.dev"
15+
__version__ = "1.26.0"

exporter/opentelemetry-exporter-zipkin/pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ classifiers = [
2828
"Typing :: Typed",
2929
]
3030
dependencies = [
31-
"opentelemetry-exporter-zipkin-json == 1.26.0.dev",
32-
"opentelemetry-exporter-zipkin-proto-http == 1.26.0.dev",
31+
"opentelemetry-exporter-zipkin-json == 1.26.0",
32+
"opentelemetry-exporter-zipkin-proto-http == 1.26.0",
3333
]
3434

3535
[project.entry-points.opentelemetry_traces_exporter]

exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "1.26.0.dev"
15+
__version__ = "1.26.0"

opentelemetry-api/src/opentelemetry/version/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "1.26.0.dev"
15+
__version__ = "1.26.0"

opentelemetry-proto/src/opentelemetry/proto/version/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "1.26.0.dev"
15+
__version__ = "1.26.0"

opentelemetry-sdk/pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ classifiers = [
2727
"Typing :: Typed",
2828
]
2929
dependencies = [
30-
"opentelemetry-api == 1.26.0.dev",
31-
"opentelemetry-semantic-conventions == 0.47b0.dev",
30+
"opentelemetry-api == 1.26.0",
31+
"opentelemetry-semantic-conventions == 0.47b0",
3232
"typing-extensions >= 3.7.4",
3333
]
3434

opentelemetry-sdk/src/opentelemetry/sdk/version/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "1.26.0.dev"
15+
__version__ = "1.26.0"

opentelemetry-semantic-conventions/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ classifiers = [
2727
]
2828

2929
dependencies = [
30-
"opentelemetry-api == 1.26.0.dev",
30+
"opentelemetry-api == 1.26.0",
3131
"Deprecated >= 1.2.6",
3232
]
3333

opentelemetry-semantic-conventions/src/opentelemetry/semconv/version/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.47b0.dev"
15+
__version__ = "0.47b0"

propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "1.26.0.dev"
15+
__version__ = "1.26.0"

propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "1.26.0.dev"
15+
__version__ = "1.26.0"

shim/opentelemetry-opencensus-shim/src/opentelemetry/shim/opencensus/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.47b0.dev"
15+
__version__ = "0.47b0"

shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.47b0.dev"
15+
__version__ = "0.47b0"

tests/opentelemetry-test-utils/pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ classifiers = [
2727
]
2828
dependencies = [
2929
"asgiref ~= 3.0",
30-
"opentelemetry-api == 1.26.0.dev",
31-
"opentelemetry-sdk == 1.26.0.dev",
30+
"opentelemetry-api == 1.26.0",
31+
"opentelemetry-sdk == 1.26.0",
3232
]
3333

3434
[project.urls]
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.47b0.dev"
1+
__version__ = "0.47b0"

0 commit comments

Comments
 (0)