Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare release v1.6.2 and 0.25b2 #2230

Merged
merged 2 commits into from
Oct 19, 2021
Merged

Prepare release v1.6.2 and 0.25b2 #2230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e65baa4
Prepare release v1.6.2 and 0.25b2
owais Oct 19, 2021
4acab74
Merge branch 'main' into release/1.6.2-0.25b2
owais Oct 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
# Otherwise, set variable to the commit of your branch on
# opentelemetry-python-contrib which is compatible with these Core repo
# changes.
CONTRIB_REPO_SHA: 95187df38312671ea171b68de8247838d6be65c1
CONTRIB_REPO_SHA: a7c054b257225948c68a9dccb3f2973537d9b4ec
# This is needed because we do not clone the core repo in contrib builds anymore.
# When running contrib builds as part of core builds, we use actions/checkout@v2 which
# does not set an environment variable (simply just runs tox), which is different when
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.6.1-0.25b1...HEAD)

## [1.6.1-0.25b1](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.6.1-0.25b1) - 2021-10-18
## [1.6.2-0.25b2](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.6.2-0.25b2) - 2021-10-19


## [1.6.1-0.25b1](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.6.1-0.25b1) - 2021-10-18


- Upgrade GRPC/protobuf related dependency and regenerate otlp protobufs
Expand Down
4 changes: 2 additions & 2 deletions eachdist.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ sortfirst=
exporter/*

[stable]
version=1.6.1
version=1.6.2

packages=
opentelemetry-sdk
Expand All @@ -30,7 +30,7 @@ packages=
opentelemetry-api

[prerelease]
version=0.25b1
version=0.25b2

packages=
opentelemetry-opentracing-shim
Expand Down
2 changes: 1 addition & 1 deletion ...emetry-exporter-jaeger-proto-grpc/src/opentelemetry/exporter/jaeger/proto/grpc/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.6.1"
__version__ = "1.6.2"
2 changes: 1 addition & 1 deletion .../opentelemetry-exporter-jaeger-thrift/src/opentelemetry/exporter/jaeger/thrift/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.6.1"
__version__ = "1.6.2"
4 changes: 2 additions & 2 deletions exporter/opentelemetry-exporter-jaeger/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ python_requires = >=3.6

packages=find_namespace:
install_requires =
opentelemetry-exporter-jaeger-proto-grpc == 1.6.1
opentelemetry-exporter-jaeger-thrift == 1.6.1
opentelemetry-exporter-jaeger-proto-grpc == 1.6.2
opentelemetry-exporter-jaeger-thrift == 1.6.2

[options.extras_require]
test =
Expand Down
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.6.1"
__version__ = "1.6.2"
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.25b1"
__version__ = "0.25b2"
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ install_requires =
googleapis-common-protos ~= 1.52
opentelemetry-api ~= 1.3
opentelemetry-sdk ~= 1.3
opentelemetry-proto == 1.6.1
opentelemetry-proto == 1.6.2
backoff ~= 1.10.0

[options.extras_require]
Expand Down
2 changes: 1 addition & 1 deletion ...ntelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.6.1"
__version__ = "1.6.2"
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-otlp-proto-http/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ install_requires =
googleapis-common-protos ~= 1.52
opentelemetry-api ~= 1.3
opentelemetry-sdk ~= 1.3
opentelemetry-proto == 1.6.1
opentelemetry-proto == 1.6.2
backoff ~= 1.10.0

[options.extras_require]
Expand Down
2 changes: 1 addition & 1 deletion ...ntelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.6.1"
__version__ = "1.6.2"
4 changes: 2 additions & 2 deletions exporter/opentelemetry-exporter-otlp/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ classifiers =
python_requires = >=3.6
packages=find_namespace:
install_requires =
opentelemetry-exporter-otlp-proto-grpc == 1.6.1
opentelemetry-exporter-otlp-proto-http == 1.6.1
opentelemetry-exporter-otlp-proto-grpc == 1.6.2
opentelemetry-exporter-otlp-proto-http == 1.6.2

[options.entry_points]
opentelemetry_traces_exporter =
Expand Down
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.6.1"
__version__ = "1.6.2"
2 changes: 1 addition & 1 deletion ...rter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.6.1"
__version__ = "1.6.2"
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-zipkin-proto-http/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ install_requires =
requests ~= 2.7
opentelemetry-api ~= 1.3
opentelemetry-sdk ~= 1.3
opentelemetry-exporter-zipkin-json == 1.6.1
opentelemetry-exporter-zipkin-json == 1.6.2

[options.packages.find]
where = src
Expand Down
2 changes: 1 addition & 1 deletion ...emetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.6.1"
__version__ = "1.6.2"
4 changes: 2 additions & 2 deletions exporter/opentelemetry-exporter-zipkin/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ classifiers =
python_requires = >=3.6
packages=find_namespace:
install_requires =
opentelemetry-exporter-zipkin-json == 1.6.1
opentelemetry-exporter-zipkin-proto-http == 1.6.1
opentelemetry-exporter-zipkin-json == 1.6.2
opentelemetry-exporter-zipkin-proto-http == 1.6.2

[options.extras_require]
test =
Expand Down
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.6.1"
__version__ = "1.6.2"
2 changes: 1 addition & 1 deletion opentelemetry-api/src/opentelemetry/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.6.1"
__version__ = "1.6.2"
2 changes: 1 addition & 1 deletion opentelemetry-proto/src/opentelemetry/proto/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.6.1"
__version__ = "1.6.2"
4 changes: 2 additions & 2 deletions opentelemetry-sdk/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ packages=find_namespace:
zip_safe = False
include_package_data = True
install_requires =
opentelemetry-api == 1.6.1
opentelemetry-semantic-conventions == 0.25b1
opentelemetry-api == 1.6.2
opentelemetry-semantic-conventions == 0.25b2

[options.packages.find]
where = src
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-sdk/src/opentelemetry/sdk/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.6.1"
__version__ = "1.6.2"
2 changes: 1 addition & 1 deletion opentelemetry-semantic-conventions/src/opentelemetry/semconv/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.25b1"
__version__ = "0.25b2"
2 changes: 1 addition & 1 deletion propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.6.1"
__version__ = "1.6.2"
2 changes: 1 addition & 1 deletion propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "1.6.1"
__version__ = "1.6.2"
2 changes: 1 addition & 1 deletion shim/opentelemetry-opentracing-shim/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ install_requires =

[options.extras_require]
test =
opentelemetry-test == 0.25b1
opentelemetry-test == 0.25b2
opentracing ~= 2.2.0

[options.packages.find]
Expand Down
2 changes: 1 addition & 1 deletion shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = "0.25b1"
__version__ = "0.25b2"
2 changes: 1 addition & 1 deletion tests/util/src/opentelemetry/test/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.25b1"
__version__ = "0.25b2"