updating changelogs and version to 1.2.0-0.21b0

This commit is contained in:
Alex Boten 2021-05-11 15:11:31 -07:00
parent e606542981
commit 35e6630729
80 changed files with 261 additions and 187 deletions

View File

@ -4,7 +4,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-contrib/compare/v0.200...HEAD)
## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.2.0-0.21b0...HEAD)
## [1.2.0-0.21b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.2.0-0.21b0) - 2021-05-11
### Changed

View File

@ -45,7 +45,7 @@ package_dir=
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
[options.extras_require]
test =

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -16,6 +16,28 @@ sortfirst=
exporter/*
ext/*
[stable]
version=1.2.0
packages=
opentelemetry-sdk
opentelemetry-proto
propagator/opentelemetry-propagator-jaeger
propagator/opentelemetry-propagator-b3
exporter/opentelemetry-exporter-zipkin-proto-http
exporter/opentelemetry-exporter-zipkin-json
exporter/opentelemetry-exporter-zipkin
exporter/opentelemetry-exporter-otlp-proto-grpc
exporter/opentelemetry-exporter-otlp
exporter/opentelemetry-exporter-jaeger-thrift
exporter/opentelemetry-exporter-jaeger-proto-grpc
exporter/opentelemetry-exporter-jaeger
opentelemetry-api
[prerelease]
version=0.21b0
[lintroots]
extraroots=examples/*,scripts/
subglob=*.py,tests/,test/,src/*,examples/*

View File

@ -39,8 +39,8 @@ package_dir=
packages=find_namespace:
install_requires =
ddtrace>=0.34.0,<0.47.0
opentelemetry-api == 1.2.0.dev0
opentelemetry-sdk == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-sdk == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
[options.packages.find]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,9 +38,9 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation == 0.21b0
aiohttp ~= 3.0
wrapt >= 1.0.0, < 2.0.0

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,10 +38,10 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation-dbapi == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation-dbapi == 0.21b0
opentelemetry-instrumentation == 0.21b0
aiopg >= 0.13.0
wrapt >= 1.0.0, < 2.0.0

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,9 +38,9 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation == 0.21b0
asgiref ~= 3.0
[options.extras_require]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,9 +38,9 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation == 0.21b0
asyncpg >= 0.12.0
[options.extras_require]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -39,10 +39,10 @@ package_dir=
packages=find_namespace:
install_requires =
boto ~= 2.0
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation-botocore == 0.21.dev0
opentelemetry-instrumentation == 0.21b0
opentelemetry-instrumentation-botocore == 0.21b0
[options.extras_require]
test =

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -39,9 +39,9 @@ package_dir=
packages=find_namespace:
install_requires =
botocore ~= 1.0
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation == 0.21b0
[options.extras_require]
test =

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -39,9 +39,9 @@ package_dir=
packages=find_namespace:
install_requires =
celery >= 4.0, < 6.0
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation == 0.21b0
[options.extras_require]
test =

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,9 +38,9 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation == 0.21b0
wrapt >= 1.0.0, < 2.0.0
[options.extras_require]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -39,10 +39,10 @@ package_dir=
packages=find_namespace:
install_requires =
django >= 1.10
opentelemetry-util-http == 0.21.dev0
opentelemetry-instrumentation-wsgi == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-api == 1.2.0.dev0
opentelemetry-util-http == 0.21b0
opentelemetry-instrumentation-wsgi == 0.21b0
opentelemetry-instrumentation == 0.21b0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
[options.extras_require]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,9 +38,9 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation == 0.21b0
wrapt >= 1.0.0, < 2.0.0
elasticsearch >= 2.0

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -40,10 +40,10 @@ package_dir=
packages=find_namespace:
install_requires =
falcon ~= 2.0
opentelemetry-instrumentation-wsgi == 0.21.dev0
opentelemetry-util-http == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-api == 1.2.0.dev0
opentelemetry-instrumentation-wsgi == 0.21b0
opentelemetry-util-http == 0.21b0
opentelemetry-instrumentation == 0.21b0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
[options.extras_require]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,11 +38,11 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation-asgi == 0.21.dev0
opentelemetry-util-http == 0.21.dev0
opentelemetry-instrumentation == 0.21b0
opentelemetry-instrumentation-asgi == 0.21b0
opentelemetry-util-http == 0.21b0
[options.entry_points]
opentelemetry_instrumentor =

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -39,10 +39,10 @@ package_dir=
packages=find_namespace:
install_requires =
flask ~= 1.0
opentelemetry-util-http == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation-wsgi == 0.21.dev0
opentelemetry-api == 1.2.0.dev0
opentelemetry-util-http == 0.21b0
opentelemetry-instrumentation == 0.21b0
opentelemetry-instrumentation-wsgi == 0.21b0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
[options.extras_require]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,17 +38,17 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-sdk == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-sdk == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation == 0.21b0
grpcio ~= 1.27
wrapt >= 1.0.0, < 2.0.0
[options.extras_require]
test =
opentelemetry-test == 0.21.dev0
opentelemetry-sdk == 1.2.0.dev0
opentelemetry-sdk == 1.2.0
protobuf >= 3.13.0
[options.packages.find]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -37,8 +37,8 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-api == 1.2.0
opentelemetry-instrumentation == 0.21b0
jinja2~=2.7
wrapt >= 1.0.0, < 2.0.0

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -37,8 +37,8 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-api == 1.2.0
opentelemetry-instrumentation == 0.21b0
[options.extras_require]
test =

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,9 +38,9 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-instrumentation-dbapi == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-api == 1.2.0
opentelemetry-instrumentation-dbapi == 0.21b0
opentelemetry-instrumentation == 0.21b0
mysql-connector-python ~= 8.0
wrapt >= 1.0.0, < 2.0.0

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,9 +38,9 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-instrumentation-dbapi == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-api == 1.2.0
opentelemetry-instrumentation-dbapi == 0.21b0
opentelemetry-instrumentation == 0.21b0
psycopg2-binary >= 2.7.3.1
wrapt >= 1.0.0, < 2.0.0

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,9 +38,9 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation == 0.21b0
pymemcache ~= 1.3
wrapt >= 1.0.0, < 2.0.0

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,9 +38,9 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation == 0.21b0
pymongo ~= 3.1
[options.extras_require]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,9 +38,9 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-instrumentation-dbapi == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-api == 1.2.0
opentelemetry-instrumentation-dbapi == 0.21b0
opentelemetry-instrumentation == 0.21b0
PyMySQL ~= 0.10.1
[options.extras_require]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -39,11 +39,11 @@ package_dir=
packages=find_namespace:
install_requires =
pyramid >= 1.7
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-api == 1.2.0.dev0
opentelemetry-instrumentation == 0.21b0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation-wsgi == 0.21.dev0
opentelemetry-util-http == 0.21.dev0
opentelemetry-instrumentation-wsgi == 0.21b0
opentelemetry-util-http == 0.21b0
wrapt >= 1.0.0, < 2.0.0
[options.extras_require]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,16 +38,16 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation == 0.21b0
redis >= 2.6
wrapt >= 1.12.1
[options.extras_require]
test =
opentelemetry-test == 0.21.dev0
opentelemetry-sdk == 1.2.0.dev0
opentelemetry-sdk == 1.2.0
[options.packages.find]
where = src

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,9 +38,9 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation == 0.21b0
requests ~= 2.0
[options.extras_require]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,8 +38,8 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-api == 1.2.0
opentelemetry-instrumentation == 0.21b0
scikit-learn ~= 0.22.0
[options.extras_require]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,15 +38,15 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation == 0.21b0
wrapt >= 1.11.2
sqlalchemy
[options.extras_require]
test =
opentelemetry-sdk == 1.2.0.dev0
opentelemetry-sdk == 1.2.0
pytest
[options.packages.find]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,9 +38,9 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-instrumentation-dbapi == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-api == 1.2.0
opentelemetry-instrumentation-dbapi == 0.21b0
opentelemetry-instrumentation == 0.21b0
wrapt >= 1.0.0, < 2.0.0
[options.extras_require]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,11 +38,11 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation-asgi == 0.21.dev0
opentelemetry-util-http == 0.21.dev0
opentelemetry-instrumentation == 0.21b0
opentelemetry-instrumentation-asgi == 0.21b0
opentelemetry-util-http == 0.21b0
[options.entry_points]
opentelemetry_instrumentor =

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,10 +38,10 @@ package_dir=
packages=find_namespace:
install_requires =
tornado >= 6.0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-api == 1.2.0.dev0
opentelemetry-instrumentation == 0.21b0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-util-http == 0.21.dev0
opentelemetry-util-http == 0.21b0
[options.extras_require]
test =

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,9 +38,9 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation == 0.21b0
[options.extras_require]
test =

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,9 +38,9 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation == 0.21b0
urllib3 >= 1.0.0, < 2.0.0
wrapt >= 1.0.0, < 2.0.0

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,9 +38,9 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-semantic-conventions == 0.21.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-instrumentation == 0.21b0
[options.extras_require]
test =

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -41,7 +41,7 @@ packages=find_namespace:
zip_safe = False
include_package_data = True
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
wrapt >= 1.0.0, < 2.0.0
[options.packages.find]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,8 +38,8 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-sdk == 1.2.0.dev0
opentelemetry-api == 1.2.0
opentelemetry-sdk == 1.2.0
[options.packages.find]
where = src

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -229,16 +229,18 @@ def parse_args(args=None):
)
releaseparser = subparsers.add_parser(
"release", help="Prepares release, used by maintainers and CI",
"update_versions",
help="Updates version numbers, used by maintainers and CI",
)
releaseparser.set_defaults(func=release_args)
releaseparser.add_argument("--version", required=True)
releaseparser.add_argument("--versions", required=True)
releaseparser.add_argument(
"releaseargs", nargs=argparse.REMAINDER, help=extraargs_help("pytest")
)
fmtparser = subparsers.add_parser(
"format", help="Formats all source code with black and isort.",
"format",
help="Formats all source code with black and isort.",
)
fmtparser.set_defaults(func=format_args)
fmtparser.add_argument(
@ -247,6 +249,21 @@ def parse_args(args=None):
help="Format only this path instead of entire repository",
)
versionparser = subparsers.add_parser(
"version",
help="Get the version for a release",
)
versionparser.set_defaults(func=version_args)
versionparser.add_argument(
"--mode",
"-m",
default="DEFAULT",
help=cleandoc(
"""Section of config file to use for target selection configuration.
See description of exec for available options."""
),
)
return parser.parse_args(args)
@ -353,7 +370,7 @@ def runsubprocess(dry_run, params, *args, **kwargs):
check = kwargs.pop("check") # Enforce specifying check
print(">>>", cmdstr, file=sys.stderr)
print(">>>", cmdstr, file=sys.stderr, flush=True)
# This is a workaround for subprocess.run(['python']) leaving the virtualenv on Win32.
# The cause for this is that when running the python.exe in a virtualenv,
@ -366,7 +383,7 @@ def runsubprocess(dry_run, params, *args, **kwargs):
# Only this would find the "correct" python.exe.
params = list(params)
executable = shutil.which(params[0]) # On Win32, pytho
executable = shutil.which(params[0])
if executable:
params[0] = executable
try:
@ -522,7 +539,11 @@ def lint_args(args):
execute_args(
parse_subargs(
args,
("exec", "python scripts/check_for_valid_readme.py {}", "--all",),
(
"exec",
"python scripts/check_for_valid_readme.py {}",
"--all",
),
)
)
@ -532,13 +553,13 @@ def update_changelog(path, version, new_entry):
try:
with open(path) as changelog:
text = changelog.read()
if "## Version {}".format(version) in text:
if "## [{}]".format(version) in text:
raise AttributeError(
"{} already contans version {}".format(path, version)
)
with open(path) as changelog:
for line in changelog:
if line.startswith("## Unreleased"):
if line.startswith("## [Unreleased]"):
unreleased_changes = False
elif line.startswith("## "):
break
@ -551,26 +572,26 @@ def update_changelog(path, version, new_entry):
if unreleased_changes:
print("updating: {}".format(path))
text = re.sub("## Unreleased", new_entry, text)
text = re.sub(r"## \[Unreleased\].*", new_entry, text)
with open(path, "w") as changelog:
changelog.write(text)
def update_changelogs(targets, version):
print("updating CHANGELOG")
def update_changelogs(version):
today = datetime.now().strftime("%Y-%m-%d")
new_entry = "## Unreleased\n\n## Version {}\n\nReleased {}".format(
version, today
new_entry = """## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v{version}...HEAD)
## [{version}](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v{version}) - {today}
""".format(
version=version, today=today
)
errors = False
for target in targets:
try:
update_changelog(
"{}/CHANGELOG.md".format(target), version, new_entry
)
except Exception as err: # pylint: disable=broad-except
print(str(err))
errors = True
try:
update_changelog("./CHANGELOG.md", version, new_entry)
except Exception as err: # pylint: disable=broad-except
print(str(err))
errors = True
if errors:
sys.exit(1)
@ -583,29 +604,44 @@ def find(name, path):
return None
def update_version_files(targets, version):
def filter_packages(targets, packages):
if not packages:
return targets
filtered_packages = []
for target in targets:
for pkg in packages:
if pkg in str(target):
filtered_packages.append(target)
break
return filtered_packages
def update_version_files(targets, version, packages):
print("updating version.py files")
targets = filter_packages(targets, packages)
update_files(
targets,
version,
"version.py",
"__version__ .*",
'__version__ = "{}"'.format(version),
)
def update_dependencies(targets, version):
def update_dependencies(targets, version, packages):
print("updating dependencies")
update_files(
targets,
version,
"setup.cfg",
r"(opentelemetry-.*)==(.*)",
r"\1== " + version,
)
if packages is None:
packages = targets
for pkg in packages:
package_name = str(pkg).split("/")[-1]
update_files(
targets,
"setup.cfg",
r"({}.*)==(.*)".format(package_name),
r"\1== " + version,
)
def update_files(targets, version, filename, search, replace):
def update_files(targets, filename, search, replace):
errors = False
for target in targets:
curr_file = find(filename, target)
@ -616,9 +652,8 @@ def update_files(targets, version, filename, search, replace):
with open(curr_file) as _file:
text = _file.read()
if version in text:
print("{} already contans version {}".format(curr_file, version))
errors = True
if replace in text:
print("{} already contains {}".format(curr_file, replace))
continue
with open(curr_file, "w") as _file:
@ -633,10 +668,22 @@ def release_args(args):
rootpath = find_projectroot()
targets = list(find_targets_unordered(rootpath))
version = args.version
update_dependencies(targets, version)
update_version_files(targets, version)
update_changelogs(targets, version)
cfg = ConfigParser()
cfg.read(str(find_projectroot() / "eachdist.ini"))
versions = args.versions
updated_versions = []
for group in versions.split(","):
mcfg = cfg[group]
version = mcfg["version"]
updated_versions.append(version)
packages = None
if "packages" in mcfg:
packages = mcfg["packages"].split()
print("update {} packages to {}".format(group, version))
update_dependencies(targets, version, packages)
update_version_files(targets, version, packages)
update_changelogs("-".join(updated_versions))
def test_args(args):
@ -660,7 +707,10 @@ def format_args(args):
format_dir = os.path.join(format_dir, args.path)
runsubprocess(
args.dry_run, ("black", "."), cwd=format_dir, check=True,
args.dry_run,
("black", "."),
cwd=format_dir,
check=True,
)
runsubprocess(
args.dry_run,
@ -670,6 +720,12 @@ def format_args(args):
)
def version_args(args):
cfg = ConfigParser()
cfg.read(str(find_projectroot() / "eachdist.ini"))
print(cfg[args.mode]["version"])
def main():
args = parse_args()
args.func(args)

View File

@ -1,4 +1,4 @@
#!/bin/zsh
#!/bin/bash
#
# This script:
# 1. parses the version number from the branch name
@ -11,30 +11,22 @@
# triggering unnecessary pull requests
#
VERSION=`echo $1 | awk -F "/" '{print $NF}'`
VERSION=$(./scripts/eachdist.py version --mode stable)-$(./scripts/eachdist.py version --mode prerelease)
echo "Using version ${VERSION}"
# check the version matches expected versioning e.g
# 0.6, 0.6b, 0.6b0, 0.6.0
if [[ ! "${VERSION}" =~ ^([0-9])(\.*[0-9]{1,5}[a-b]*){1,3}$ ]]; then
echo "Version number invalid: $VERSION"
exit 1
fi
# create the release branch
git checkout -b release/${VERSION}
git push origin release/${VERSION}
# create a temporary branch to create a PR for updated version and changelogs
git checkout -b release/${VERSION}-auto
./scripts/eachdist.py release --version ${VERSION}
./scripts/eachdist.py update_versions --versions stable,prerelease
rc=$?
if [ $rc != 0 ]; then
echo "::set-output name=version_updated::0"
exit 0
fi
git add **/version.py **/setup.cfg **/CHANGELOG.md
git add .
git commit -m "updating changelogs and version to ${VERSION}"

View File

@ -38,7 +38,7 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-api == 1.2.0
[options.entry_points]
opentelemetry_propagator =

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"

View File

@ -38,8 +38,8 @@ package_dir=
=src
packages=find_namespace:
install_requires =
opentelemetry-api == 1.2.0.dev0
opentelemetry-instrumentation == 0.21.dev0
opentelemetry-api == 1.2.0
opentelemetry-instrumentation == 0.21b0
asgiref ~= 3.0
[options.extras_require]

View File

@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
__version__ = "0.21.dev0"
__version__ = "0.21b0"