From 32da45d943575e585c4a03b1d2b9039745c5c545 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 20 Apr 2024 14:19:42 +0900 Subject: [PATCH 1/3] python311Packages.opentelemetry-api: add updateScript --- .../python-modules/opentelemetry-api/default.nix | 15 +++++++++++++-- .../opentelemetry-instrumentation/default.nix | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 135518ce3f8c..ec4c9dc2204d 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -9,6 +9,7 @@ , setuptools , pytestCheckHook , pythonRelaxDepsHook +, writeScript }: let @@ -55,8 +56,18 @@ let doCheck = false; - # Enable tests via passthru to avoid cyclic dependency with opentelemetry-test-utils. - passthru.tests.${self.pname} = self.overridePythonAttrs { doCheck = true; }; + passthru = { + updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p nix-update + + set -eu -o pipefail + nix-update --version-regex 'v(.*)' python3Packages.opentelemetry-api + nix-update python3Packages.opentelemetry-instrumentation + ''; + # Enable tests via passthru to avoid cyclic dependency with opentelemetry-test-utils. + tests.${self.pname} = self.overridePythonAttrs { doCheck = true; }; + }; meta = with lib; { homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-api"; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 965276da78f1..68a32268ebbd 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -44,6 +44,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.instrumentation" ]; + passthru.updateScript = opentelemetry-api.updateScript; + meta = with lib; { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation"; description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python"; From a86f7b674f09a8f3d5e8e6ea0f69ab5d643762fc Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 20 Apr 2024 14:40:40 +0900 Subject: [PATCH 2/3] python311Packages.opentelemetry-api: 1.23.0 -> 1.24.0 Diff: https://github.com/open-telemetry/opentelemetry-python/compare/refs/tags/v1.23.0...v1.24.0 Changelog: https://github.com/open-telemetry/opentelemetry-python/releases/tag/refs/tags/v1.24.0 --- pkgs/development/python-modules/opentelemetry-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index ec4c9dc2204d..153400f30ace 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -15,7 +15,7 @@ let self = buildPythonPackage rec { pname = "opentelemetry-api"; - version = "1.23.0"; + version = "1.24.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ let owner = "open-telemetry"; repo = "opentelemetry-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Ge/DjVG7ajoS0nJLZxtfn4Mmx0SffAE/91dViA5qWAA="; + hash = "sha256-id5cwNl2idgZa1AFfolzEo5vzspv3V2c1Vtzg3EWDZs="; }; sourceRoot = "${src.name}/opentelemetry-api"; From 96bb1fe6abbb1f618acc99302d3195c2fd8ec5fa Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 20 Apr 2024 14:40:52 +0900 Subject: [PATCH 3/3] python311Packages.opentelemetry-instrumentation: 0.44b0 -> 0.45b0 Diff: https://github.com/open-telemetry/opentelemetry-python-contrib/compare/refs/tags/v0.44b0...v0.45b0 Changelog: https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/refs/tags/v0.45b0 --- .../python-modules/opentelemetry-instrumentation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 68a32268ebbd..38205814d047 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "opentelemetry-instrumentation"; - version = "0.44b0"; + version = "0.45b0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; rev = "refs/tags/v${version}"; - hash = "sha256-r+k/YdK7YqYme8nKoy3ig3krvZjxYRKgLBkcdEtFy3k="; + hash = "sha256-snpanTREdvfqpqPI8UWzm55pDK8Q77guqgT8kFULRKU="; }; sourceRoot = "${src.name}/opentelemetry-instrumentation";