From a7cf52919d04aa26d83217293243c8eaabf7d5de Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 13 Aug 2023 21:18:25 +0100 Subject: [PATCH] 3p/nixpkgs: fixup influxdb after pandas bump --- third_party/nixpkgs/patches/series | 1 + .../development/python-modules/influxdb/default.nix | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/third_party/nixpkgs/patches/series b/third_party/nixpkgs/patches/series index ec475fc936..a8cc60d8f5 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1 +1,2 @@ poetry2nix-cryptography39.0.1.patch +influxdb-fix-after-Pandas-bump.patch diff --git a/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix index e2bacd5229..ce6bccdd40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix @@ -23,6 +23,13 @@ buildPythonPackage rec { sha256 = "0ymjv322mv6y424fmpd70f87152w55mbwwj6i7p3sjzf0ixmxy26"; }; + postPatch = '' + for f in influxdb/tests/dataframe_client_test.py influxdb/tests/influxdb08/dataframe_client_test.py; do + substituteInPlace "$f" \ + --replace "pandas.util.testing" "pandas.testing" + done + ''; + propagatedBuildInputs = [ requests python-dateutil @@ -51,6 +58,9 @@ buildPythonPackage rec { "test_write_points_from_dataframe_with_tags_and_nan_json" # Reponse is not empty but `s = '孝'` and the JSON decoder chokes on that "test_query_with_empty_result" + # Pandas API changes cause it to no longer infer datetimes in the expected manner + "test_multiquery_into_dataframe" + "test_multiquery_into_dataframe_dropna" ]; pythonImportsCheck = [ "influxdb" ];