From 060bb0f04d4cbd9e6a77fbeda137cffa87fe3bc9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 28 Jun 2026 17:35:56 +0200 Subject: [PATCH] python3Packages.opentelemetry-instrumentation: 0.61b0 -> 0.64b0 https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/vv0.64b0 --- .../default.nix | 19 ++++++++----------- .../opentelemetry-instrumentation/default.nix | 4 ++-- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-requests/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-requests/default.nix index 5adf35cc516f..f482bc846903 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-requests/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-requests/default.nix @@ -1,6 +1,5 @@ { buildPythonPackage, - fetchpatch, requests, hatchling, opentelemetry-api, @@ -8,7 +7,9 @@ opentelemetry-semantic-conventions, opentelemetry-util-http, httpretty, + mocket, opentelemetry-test-utils, + pytest-benchmark, pytestCheckHook, }: @@ -19,16 +20,6 @@ buildPythonPackage { sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-requests"; - patches = [ - # remove hardcoded requests version from fixtures - (fetchpatch { - url = "https://github.com/open-telemetry/opentelemetry-python-contrib/commit/69a94e0c3b25edfdc4abeb18a4d26f5b7532e7ba.patch"; - stripLen = 2; - includes = [ "tests/test_requests_integration.py" ]; - hash = "sha256-JGWJVHR6lAg8bG1fpfJ4BJbqipnVFRLV7i/bKwOmtPk="; - }) - ]; - build-system = [ hatchling ]; dependencies = [ @@ -41,10 +32,16 @@ buildPythonPackage { nativeCheckInputs = [ httpretty + mocket opentelemetry-test-utils + pytest-benchmark pytestCheckHook ]; + pytestFlags = [ + "--benchmark-disable" + ]; + pythonImportsCheck = [ "opentelemetry.instrumentation.requests" ]; meta = opentelemetry-instrumentation.meta // { diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 9bb8ba599c2e..83fd84b4be6f 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -12,7 +12,7 @@ buildPythonPackage (finalAttrs: { pname = "opentelemetry-instrumentation"; - version = "0.61b0"; + version = "0.64b0"; pyproject = true; # To avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta @@ -20,7 +20,7 @@ buildPythonPackage (finalAttrs: { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; tag = "v${finalAttrs.version}"; - hash = "sha256-DT13gcYPNYXBPnf622WsA16C+7sabJfOshDquHn06Ok="; + hash = "sha256-dOcDzJD1xxCN7+Zrn+2mF/gbZjy/XC6uAKDhpfYLf98="; }; sourceRoot = "${finalAttrs.src.name}/opentelemetry-instrumentation";