Skip to content

Commit

Permalink
Release 1.12.0rc2-0.32b0 (#2795)
Browse files Browse the repository at this point in the history
* Release 1.12.0rc2-0.32b0

* Update CHANGELOG.md

Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com>

Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com>
  • Loading branch information
ocelotl and srikanthccv authored Jul 4, 2022
1 parent e27f2b8 commit b9a6358
Show file tree
Hide file tree
Showing 31 changed files with 41 additions and 37 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
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: ac84e9968fc5bfb16016a4e0ca82059bf1e86511
CONTRIB_REPO_SHA: 42ff80bef8a03ff214a54323a2631da06e6dc5e4
# 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
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.12.0rc1-0.31b0...HEAD)
## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.12.0rc2-0.32b0...HEAD)

## [1.12.0rc2-0.32b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.12.0rc2-0.32b0) - 2022-07-04



- Fix instrument name and unit regexes
([#2796](https://github.com/open-telemetry/opentelemetry-python/pull/2796))
Expand Down
4 changes: 2 additions & 2 deletions eachdist.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ sortfirst=
exporter/*

[stable]
version=1.12.0rc1
version=1.12.0rc2

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

[prerelease]
version=0.31b0
version=0.32b0

packages=
opentelemetry-opentracing-shim
Expand Down
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.12.0rc1"
__version__ = "1.12.0rc2"
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.12.0rc1"
__version__ = "1.12.0rc2"
4 changes: 2 additions & 2 deletions exporter/opentelemetry-exporter-jaeger/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-exporter-jaeger-proto-grpc == 1.12.0rc1
opentelemetry-exporter-jaeger-thrift == 1.12.0rc1
opentelemetry-exporter-jaeger-proto-grpc == 1.12.0rc2
opentelemetry-exporter-jaeger-thrift == 1.12.0rc2

[options.packages.find]
where = src
Expand Down
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.12.0rc1"
__version__ = "1.12.0rc2"
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.31b0"
__version__ = "0.32b0"
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ install_requires =
googleapis-common-protos ~= 1.52
opentelemetry-api ~= 1.3
opentelemetry-sdk ~= 1.11
opentelemetry-proto == 1.12.0rc1
opentelemetry-proto == 1.12.0rc2
backoff >= 1.10.0, < 2.0.0; python_version<'3.7'
backoff >= 1.10.0, < 3.0.0; python_version>='3.7'

Expand Down
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.12.0rc1"
__version__ = "1.12.0rc2"
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-otlp-proto-http/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ install_requires =
googleapis-common-protos ~= 1.52
opentelemetry-api ~= 1.3
opentelemetry-sdk ~= 1.11
opentelemetry-proto == 1.12.0rc1
opentelemetry-proto == 1.12.0rc2
backoff >= 1.10.0, < 2.0.0; python_version<'3.7'
backoff >= 1.10.0, < 3.0.0; python_version>='3.7'

Expand Down
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.12.0rc1"
__version__ = "1.12.0rc2"
4 changes: 2 additions & 2 deletions exporter/opentelemetry-exporter-otlp/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-exporter-otlp-proto-grpc == 1.12.0rc1
opentelemetry-exporter-otlp-proto-http == 1.12.0rc1
opentelemetry-exporter-otlp-proto-grpc == 1.12.0rc2
opentelemetry-exporter-otlp-proto-http == 1.12.0rc2

[options.packages.find]
where = src
Expand Down
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.12.0rc1"
__version__ = "1.12.0rc2"
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.12.0rc1"
__version__ = "0.32b0"
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.12.0rc1"
__version__ = "1.12.0rc2"
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.11
opentelemetry-exporter-zipkin-json == 1.12.0rc1
opentelemetry-exporter-zipkin-json == 1.12.0rc2

[options.packages.find]
where = src
Expand Down
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.12.0rc1"
__version__ = "1.12.0rc2"
4 changes: 2 additions & 2 deletions exporter/opentelemetry-exporter-zipkin/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-exporter-zipkin-json == 1.12.0rc1
opentelemetry-exporter-zipkin-proto-http == 1.12.0rc1
opentelemetry-exporter-zipkin-json == 1.12.0rc2
opentelemetry-exporter-zipkin-proto-http == 1.12.0rc2

[options.packages.find]
where = src
Expand Down
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.12.0rc1"
__version__ = "1.12.0rc2"
2 changes: 1 addition & 1 deletion opentelemetry-api/src/opentelemetry/version.py
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.12.0rc1"
__version__ = "1.12.0rc2"
2 changes: 1 addition & 1 deletion opentelemetry-proto/src/opentelemetry/proto/version.py
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.12.0rc1"
__version__ = "1.12.0rc2"
4 changes: 2 additions & 2 deletions opentelemetry-sdk/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ packages=find_namespace:
zip_safe = False
include_package_data = True
install_requires =
opentelemetry-api == 1.12.0rc1
opentelemetry-semantic-conventions == 0.31b0
opentelemetry-api == 1.12.0rc2
opentelemetry-semantic-conventions == 0.32b0
setuptools >= 16.0
dataclasses == 0.8; python_version < '3.7'
typing-extensions >= 3.7.4
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-sdk/src/opentelemetry/sdk/version.py
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.12.0rc1"
__version__ = "1.12.0rc2"
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.31b0"
__version__ = "0.32b0"
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.12.0rc1"
__version__ = "1.12.0rc2"
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.12.0rc1"
__version__ = "1.12.0rc2"
2 changes: 1 addition & 1 deletion shim/opentelemetry-opentracing-shim/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ install_requires =

[options.extras_require]
test =
opentelemetry-test-utils == 0.31b0
opentelemetry-test-utils == 0.32b0
opentracing ~= 2.2.0

[options.packages.find]
Expand Down
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.31b0"
__version__ = "0.32b0"
4 changes: 2 additions & 2 deletions tests/opentelemetry-test-utils/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.12.0rc1
opentelemetry-sdk == 1.12.0rc1
opentelemetry-api == 1.12.0rc2
opentelemetry-sdk == 1.12.0rc2
asgiref ~= 3.0

[options.extras_require]
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.31b0"
__version__ = "0.32b0"

0 comments on commit b9a6358

Please sign in to comment.