From 7f4853ac798547fd78ead4eaa33fab591996011b Mon Sep 17 00:00:00 2001 From: Severin Neumann Date: Mon, 22 Apr 2024 20:23:38 +0200 Subject: [PATCH 1/3] fix: revert modifications to Apache license (#2429) * fix: revert modifications to Apache license See open-telemetry/community#2056 for background * path all LICENSE files Signed-off-by: svrnm * Fix missing LICENSE files --------- Signed-off-by: svrnm Co-authored-by: Diego Hurtado --- LICENSE | 2 +- LICENSE.Apache | 5 +++-- .../opentelemetry-instrumentation-aio-pika/LICENSE | 2 +- .../opentelemetry-instrumentation-aiohttp-client/LICENSE | 2 +- instrumentation/opentelemetry-instrumentation-aiopg/LICENSE | 2 +- instrumentation/opentelemetry-instrumentation-asgi/LICENSE | 2 +- .../opentelemetry-instrumentation-asyncio/LICENSE | 2 +- .../opentelemetry-instrumentation-asyncpg/LICENSE | 2 +- .../opentelemetry-instrumentation-aws-lambda/LICENSE | 2 +- instrumentation/opentelemetry-instrumentation-boto/LICENSE | 2 +- .../opentelemetry-instrumentation-boto3sqs/LICENSE | 2 +- .../opentelemetry-instrumentation-botocore/LICENSE | 2 +- .../opentelemetry-instrumentation-cassandra/LICENSE | 2 +- instrumentation/opentelemetry-instrumentation-celery/LICENSE | 2 +- .../opentelemetry-instrumentation-confluent-kafka/LICENSE | 2 +- instrumentation/opentelemetry-instrumentation-dbapi/LICENSE | 2 +- instrumentation/opentelemetry-instrumentation-django/LICENSE | 2 +- .../opentelemetry-instrumentation-elasticsearch/LICENSE | 2 +- instrumentation/opentelemetry-instrumentation-falcon/LICENSE | 2 +- .../opentelemetry-instrumentation-fastapi/LICENSE | 2 +- instrumentation/opentelemetry-instrumentation-flask/LICENSE | 2 +- instrumentation/opentelemetry-instrumentation-grpc/LICENSE | 2 +- instrumentation/opentelemetry-instrumentation-httpx/LICENSE | 2 +- instrumentation/opentelemetry-instrumentation-jinja2/LICENSE | 2 +- .../opentelemetry-instrumentation-kafka-python/LICENSE | 2 +- .../opentelemetry-instrumentation-logging/LICENSE | 2 +- instrumentation/opentelemetry-instrumentation-mysql/LICENSE | 2 +- .../opentelemetry-instrumentation-mysqlclient/LICENSE | 2 +- instrumentation/opentelemetry-instrumentation-pika/LICENSE | 2 +- .../opentelemetry-instrumentation-psycopg/LICENSE | 2 +- .../opentelemetry-instrumentation-psycopg2/LICENSE | 2 +- .../opentelemetry-instrumentation-pymemcache/LICENSE | 2 +- .../opentelemetry-instrumentation-pymongo/LICENSE | 2 +- .../opentelemetry-instrumentation-pymysql/LICENSE | 2 +- .../opentelemetry-instrumentation-pyramid/LICENSE | 2 +- instrumentation/opentelemetry-instrumentation-redis/LICENSE | 2 +- .../opentelemetry-instrumentation-remoulade/LICENSE | 2 +- .../opentelemetry-instrumentation-requests/LICENSE | 2 +- .../opentelemetry-instrumentation-sklearn/LICENSE | 2 +- .../opentelemetry-instrumentation-sqlalchemy/LICENSE | 2 +- .../opentelemetry-instrumentation-sqlite3/LICENSE | 2 +- .../opentelemetry-instrumentation-starlette/LICENSE | 2 +- .../opentelemetry-instrumentation-threading/LICENSE | 2 +- .../opentelemetry-instrumentation-tornado/LICENSE | 2 +- .../opentelemetry-instrumentation-tortoiseorm/LICENSE | 2 +- instrumentation/opentelemetry-instrumentation-urllib/LICENSE | 2 +- .../opentelemetry-instrumentation-urllib3/LICENSE | 2 +- instrumentation/opentelemetry-instrumentation-wsgi/LICENSE | 2 +- opentelemetry-contrib-instrumentations/LICENSE | 2 +- opentelemetry-instrumentation/LICENSE | 2 +- propagator/opentelemetry-propagator-aws-xray/LICENSE | 2 +- resource/opentelemetry-resource-detector-azure/LICENSE | 2 +- resource/opentelemetry-resource-detector-container/LICENSE | 2 +- sdk-extension/opentelemetry-sdk-extension-aws/LICENSE | 2 +- 54 files changed, 56 insertions(+), 55 deletions(-) diff --git a/LICENSE b/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/LICENSE.Apache b/LICENSE.Apache index bff56b5431..261eeb9e9f 100644 --- a/LICENSE.Apache +++ b/LICENSE.Apache @@ -178,7 +178,7 @@ APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" + boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a @@ -186,7 +186,8 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2016 Datadog, Inc. + Copyright [yyyy] [name of copyright owner] + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/LICENSE b/instrumentation/opentelemetry-instrumentation-aio-pika/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-aio-pika/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-aio-pika/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/LICENSE b/instrumentation/opentelemetry-instrumentation-aiohttp-client/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-aiohttp-client/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-aiohttp-client/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/LICENSE b/instrumentation/opentelemetry-instrumentation-aiopg/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-aiopg/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-aiopg/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-asgi/LICENSE b/instrumentation/opentelemetry-instrumentation-asgi/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-asgi/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-asgi/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-asyncio/LICENSE b/instrumentation/opentelemetry-instrumentation-asyncio/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-asyncio/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-asyncio/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/LICENSE b/instrumentation/opentelemetry-instrumentation-asyncpg/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-asyncpg/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-asyncpg/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/LICENSE b/instrumentation/opentelemetry-instrumentation-aws-lambda/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-aws-lambda/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-boto/LICENSE b/instrumentation/opentelemetry-instrumentation-boto/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-boto/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-boto/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-boto3sqs/LICENSE b/instrumentation/opentelemetry-instrumentation-boto3sqs/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-boto3sqs/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-boto3sqs/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-botocore/LICENSE b/instrumentation/opentelemetry-instrumentation-botocore/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-botocore/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-botocore/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-cassandra/LICENSE b/instrumentation/opentelemetry-instrumentation-cassandra/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-cassandra/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-cassandra/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-celery/LICENSE b/instrumentation/opentelemetry-instrumentation-celery/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-celery/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-celery/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-confluent-kafka/LICENSE b/instrumentation/opentelemetry-instrumentation-confluent-kafka/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-confluent-kafka/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-confluent-kafka/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/LICENSE b/instrumentation/opentelemetry-instrumentation-dbapi/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-dbapi/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-dbapi/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-django/LICENSE b/instrumentation/opentelemetry-instrumentation-django/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-django/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-django/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/LICENSE b/instrumentation/opentelemetry-instrumentation-elasticsearch/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-elasticsearch/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-falcon/LICENSE b/instrumentation/opentelemetry-instrumentation-falcon/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-falcon/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-falcon/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-fastapi/LICENSE b/instrumentation/opentelemetry-instrumentation-fastapi/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-fastapi/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-fastapi/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-flask/LICENSE b/instrumentation/opentelemetry-instrumentation-flask/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-flask/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-flask/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-grpc/LICENSE b/instrumentation/opentelemetry-instrumentation-grpc/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-grpc/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-grpc/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-httpx/LICENSE b/instrumentation/opentelemetry-instrumentation-httpx/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-httpx/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-httpx/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-jinja2/LICENSE b/instrumentation/opentelemetry-instrumentation-jinja2/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-jinja2/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-jinja2/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-kafka-python/LICENSE b/instrumentation/opentelemetry-instrumentation-kafka-python/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-kafka-python/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-kafka-python/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-logging/LICENSE b/instrumentation/opentelemetry-instrumentation-logging/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-logging/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-logging/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-mysql/LICENSE b/instrumentation/opentelemetry-instrumentation-mysql/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-mysql/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-mysql/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-mysqlclient/LICENSE b/instrumentation/opentelemetry-instrumentation-mysqlclient/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-mysqlclient/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-mysqlclient/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-pika/LICENSE b/instrumentation/opentelemetry-instrumentation-pika/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-pika/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-pika/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-psycopg/LICENSE b/instrumentation/opentelemetry-instrumentation-psycopg/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-psycopg/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-psycopg/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/LICENSE b/instrumentation/opentelemetry-instrumentation-psycopg2/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-psycopg2/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-psycopg2/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-pymemcache/LICENSE b/instrumentation/opentelemetry-instrumentation-pymemcache/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-pymemcache/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-pymemcache/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/LICENSE b/instrumentation/opentelemetry-instrumentation-pymongo/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-pymongo/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-pymongo/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/LICENSE b/instrumentation/opentelemetry-instrumentation-pymysql/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-pymysql/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-pymysql/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-pyramid/LICENSE b/instrumentation/opentelemetry-instrumentation-pyramid/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-pyramid/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-pyramid/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-redis/LICENSE b/instrumentation/opentelemetry-instrumentation-redis/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-redis/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-redis/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-remoulade/LICENSE b/instrumentation/opentelemetry-instrumentation-remoulade/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-remoulade/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-remoulade/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-requests/LICENSE b/instrumentation/opentelemetry-instrumentation-requests/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-requests/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-requests/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-sklearn/LICENSE b/instrumentation/opentelemetry-instrumentation-sklearn/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-sklearn/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-sklearn/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-sqlalchemy/LICENSE b/instrumentation/opentelemetry-instrumentation-sqlalchemy/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlalchemy/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-sqlalchemy/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-sqlite3/LICENSE b/instrumentation/opentelemetry-instrumentation-sqlite3/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlite3/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-sqlite3/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-starlette/LICENSE b/instrumentation/opentelemetry-instrumentation-starlette/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-starlette/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-starlette/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-threading/LICENSE b/instrumentation/opentelemetry-instrumentation-threading/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-threading/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-threading/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-tornado/LICENSE b/instrumentation/opentelemetry-instrumentation-tornado/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-tornado/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-tornado/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-tortoiseorm/LICENSE b/instrumentation/opentelemetry-instrumentation-tortoiseorm/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-tortoiseorm/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-tortoiseorm/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-urllib/LICENSE b/instrumentation/opentelemetry-instrumentation-urllib/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-urllib/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-urllib3/LICENSE b/instrumentation/opentelemetry-instrumentation-urllib3/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib3/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-urllib3/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/instrumentation/opentelemetry-instrumentation-wsgi/LICENSE b/instrumentation/opentelemetry-instrumentation-wsgi/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/instrumentation/opentelemetry-instrumentation-wsgi/LICENSE +++ b/instrumentation/opentelemetry-instrumentation-wsgi/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/opentelemetry-contrib-instrumentations/LICENSE b/opentelemetry-contrib-instrumentations/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/opentelemetry-contrib-instrumentations/LICENSE +++ b/opentelemetry-contrib-instrumentations/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/opentelemetry-instrumentation/LICENSE b/opentelemetry-instrumentation/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/opentelemetry-instrumentation/LICENSE +++ b/opentelemetry-instrumentation/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/propagator/opentelemetry-propagator-aws-xray/LICENSE b/propagator/opentelemetry-propagator-aws-xray/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/propagator/opentelemetry-propagator-aws-xray/LICENSE +++ b/propagator/opentelemetry-propagator-aws-xray/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/resource/opentelemetry-resource-detector-azure/LICENSE b/resource/opentelemetry-resource-detector-azure/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/resource/opentelemetry-resource-detector-azure/LICENSE +++ b/resource/opentelemetry-resource-detector-azure/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/resource/opentelemetry-resource-detector-container/LICENSE b/resource/opentelemetry-resource-detector-container/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/resource/opentelemetry-resource-detector-container/LICENSE +++ b/resource/opentelemetry-resource-detector-container/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/LICENSE b/sdk-extension/opentelemetry-sdk-extension-aws/LICENSE index 1ef7dad2c5..261eeb9e9f 100644 --- a/sdk-extension/opentelemetry-sdk-extension-aws/LICENSE +++ b/sdk-extension/opentelemetry-sdk-extension-aws/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright The OpenTelemetry Authors + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 2718ffc7a734bb1f74be5ee89add5ab15bfc29b7 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Mon, 22 Apr 2024 13:48:51 -0500 Subject: [PATCH 2/3] Fix elasticsearch test requirements file name (#2443) Fixes #2442 Co-authored-by: Leighton Chen --- ...{test-requirements-6.txt => test-requirements.txt} | 0 tox.ini | 11 ++++------- 2 files changed, 4 insertions(+), 7 deletions(-) rename instrumentation/opentelemetry-instrumentation-elasticsearch/{test-requirements-6.txt => test-requirements.txt} (100%) diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-6.txt b/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements.txt similarity index 100% rename from instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-6.txt rename to instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements.txt diff --git a/tox.ini b/tox.ini index bee544cb70..e48cc7bfe2 100644 --- a/tox.ini +++ b/tox.ini @@ -76,11 +76,8 @@ envlist = ; opentelemetry-instrumentation-elasticsearch ; FIXME: Elasticsearch >=7 causes CI workflow tests to hang, see open-telemetry/opentelemetry-python-contrib#620 - ; The numbers at the end of the environment names - ; below mean these dependencies are being used: - ; 6: elasticsearch-dsl>=6.0,<7.0 elasticsearch>=6.0,<7.0 - py3{8,9,10,11}-test-instrumentation-elasticsearch-6 - pypy3-test-instrumentation-elasticsearch-6 + py3{8,9,10,11}-test-instrumentation-elasticsearch + pypy3-test-instrumentation-elasticsearch ; opentelemetry-instrumentation-falcon ; py310 does not work with falcon 1 @@ -448,7 +445,7 @@ commands_pre = sqlalchemy-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-0.txt sqlalchemy-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt - elasticsearch-6: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-6.txt + elasticsearch: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements.txt asyncio: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt @@ -611,7 +608,7 @@ commands_pre = # prerequisite: follow the instructions here https://github.com/PyMySQL/mysqlclient#install # for your OS to install the required dependencies pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-6.txt + pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo/test-requirements.txt From 4e90498bf394f3c4f6646122cf624304ac8ebc45 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Mon, 22 Apr 2024 15:34:27 -0500 Subject: [PATCH 3/3] Update action versions (#2441) Fixes #2440 Co-authored-by: Leighton Chen --- .github/workflows/backport.yml | 4 ++-- .github/workflows/changelog.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 8 ++++---- .github/workflows/instrumentations_0.yml | 6 +++--- .github/workflows/instrumentations_1.yml | 6 +++--- .github/workflows/prepare-patch-release.yml | 6 +++--- .github/workflows/prepare-release-branch.yml | 12 ++++++------ .github/workflows/publish-a-package-from-tag.yml | 4 ++-- .github/workflows/release.yml | 10 +++++----- .github/workflows/test.yml | 6 +++--- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index f308c5757b..26789093f2 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -16,7 +16,7 @@ jobs: exit 1 fi - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # history is needed to run git cherry-pick below fetch-depth: 0 @@ -40,4 +40,4 @@ jobs: gh pr create --title "[$GITHUB_REF_NAME] $title" \ --body "Clean cherry-pick of #$NUMBER to the \`$GITHUB_REF_NAME\` branch." \ --head $branch \ - --base $GITHUB_REF_NAME \ No newline at end of file + --base $GITHUB_REF_NAME diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 5238e01c4b..491ddd27fa 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -18,7 +18,7 @@ jobs: && github.actor != 'opentelemetrybot' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Check for CHANGELOG changes run: | @@ -33,4 +33,4 @@ jobs: echo "No CHANGELOG was modified." echo "Please add a CHANGELOG entry, or add the \"Skip Changelog\" label if not required." false - fi \ No newline at end of file + fi diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b979a3121b..8ef01d21cb 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -20,16 +20,16 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v3 with: languages: python - name: Autobuild - uses: github/codeql-action/autobuild@v1 + uses: github/codeql-action/autobuild@v3 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 \ No newline at end of file + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/instrumentations_0.yml b/.github/workflows/instrumentations_0.yml index 256d160640..a138621633 100644 --- a/.github/workflows/instrumentations_0.yml +++ b/.github/workflows/instrumentations_0.yml @@ -104,16 +104,16 @@ jobs: package: "grpc" steps: - name: Checkout Contrib Repo @ SHA - ${{ github.sha }} - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up Python ${{ env[matrix.python-version] }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ env[matrix.python-version] }} - name: Install tox run: pip install tox - name: Cache tox environment # Preserves .tox directory between runs for faster installs - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: | .tox diff --git a/.github/workflows/instrumentations_1.yml b/.github/workflows/instrumentations_1.yml index 59db21529a..904f2ee999 100644 --- a/.github/workflows/instrumentations_1.yml +++ b/.github/workflows/instrumentations_1.yml @@ -43,16 +43,16 @@ jobs: package: "prometheus-remote-write" steps: - name: Checkout Contrib Repo @ SHA - ${{ github.sha }} - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up Python ${{ env[matrix.python-version] }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ env[matrix.python-version] }} - name: Install tox run: pip install tox - name: Cache tox environment # Preserves .tox directory between runs for faster installs - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: | .tox diff --git a/.github/workflows/prepare-patch-release.yml b/.github/workflows/prepare-patch-release.yml index 49b9c89560..7c854d436d 100644 --- a/.github/workflows/prepare-patch-release.yml +++ b/.github/workflows/prepare-patch-release.yml @@ -6,7 +6,7 @@ jobs: prepare-patch-release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: | if [[ ! $GITHUB_REF_NAME =~ ^release/v[0-9]+\.[0-9]+\.x-0\.[0-9]+bx$ ]]; then @@ -50,7 +50,7 @@ jobs: run: .github/scripts/update-version.sh $STABLE_VERSION $UNSTABLE_VERSION - name: Set up Python 3.9 - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: 3.9 - name: Install tox @@ -79,4 +79,4 @@ jobs: gh pr create --title "[$GITHUB_REF_NAME] $message" \ --body "$message." \ --head $branch \ - --base $GITHUB_REF_NAME \ No newline at end of file + --base $GITHUB_REF_NAME diff --git a/.github/workflows/prepare-release-branch.yml b/.github/workflows/prepare-release-branch.yml index a4caf86ebe..6818772acf 100644 --- a/.github/workflows/prepare-release-branch.yml +++ b/.github/workflows/prepare-release-branch.yml @@ -10,7 +10,7 @@ jobs: prereqs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Verify prerequisites env: @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest needs: prereqs steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Create release branch env: @@ -77,7 +77,7 @@ jobs: run: .github/scripts/update-version.sh $STABLE_VERSION $UNSTABLE_VERSION - name: Set up Python 3.9 - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: 3.9 - name: Install tox @@ -112,7 +112,7 @@ jobs: runs-on: ubuntu-latest needs: prereqs steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set environment variables env: @@ -161,7 +161,7 @@ jobs: run: .github/scripts/update-version.sh $STABLE_NEXT_VERSION $UNSTABLE_NEXT_VERSION - name: Set up Python 3.9 - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: 3.9 - name: Install tox @@ -192,4 +192,4 @@ jobs: gh pr create --title "$message" \ --body "$body" \ --head $branch \ - --base main \ No newline at end of file + --base main diff --git a/.github/workflows/publish-a-package-from-tag.yml b/.github/workflows/publish-a-package-from-tag.yml index 2c07bf5d7a..a64f5fcf15 100644 --- a/.github/workflows/publish-a-package-from-tag.yml +++ b/.github/workflows/publish-a-package-from-tag.yml @@ -10,8 +10,8 @@ jobs: name: Publish package from tag runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - uses: actions/setup-python@v1 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: '3.9' - name: Log tag that triggered publish workflow diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f6c267003a..b60ebc7599 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: exit 1 fi - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set environment variables run: | @@ -56,15 +56,15 @@ jobs: # check out main branch to verify there won't be problems with merging the change log # at the end of this workflow - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: main # back to the release branch - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # next few steps publish to pypi - - uses: actions/setup-python@v1 + - uses: actions/setup-python@v5 with: python-version: '3.8' @@ -127,7 +127,7 @@ jobs: --discussion-category announcements \ v$UNSTABLE_VERSION - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # the step below is creating a pull request against main ref: main diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 10c648e517..529f70e565 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,9 +18,9 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout Contrib Repo @ SHA - ${{ github.sha }} - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up Python 3.10 - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: "3.10" - name: Install tox @@ -30,7 +30,7 @@ jobs: run: sudo apt-get install -y libsnappy-dev - name: Cache tox environment # Preserves .tox directory between runs for faster installs - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: | .tox