From fa38944194faae3d34cb98be82c6663319740ff7 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Thu, 24 Aug 2023 20:45:41 +0100 Subject: [PATCH] 3p/nixpkgs: drop influxdb patch, now upstream --- .../influxdb-fix-after-Pandas-bump.patch | 46 ------------------- third_party/nixpkgs/patches/series | 1 - 2 files changed, 47 deletions(-) delete mode 100644 third_party/nixpkgs/patches/influxdb-fix-after-Pandas-bump.patch diff --git a/third_party/nixpkgs/patches/influxdb-fix-after-Pandas-bump.patch b/third_party/nixpkgs/patches/influxdb-fix-after-Pandas-bump.patch deleted file mode 100644 index f56f6f0da3..0000000000 --- a/third_party/nixpkgs/patches/influxdb-fix-after-Pandas-bump.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d5dabf12baf21fc037c6a465bfd810ced66b6741 Mon Sep 17 00:00:00 2001 -From: Luke Granger-Brown -Date: Sun, 13 Aug 2023 20:47:40 +0100 -Subject: [PATCH] python3.pkgs.influxdb: fix after Pandas bump - -Pandas has removed the deprecated pandas.util.testing package, and there -are also some other behaviour changes with parsing date times. Patch -the former, and skip the tests affected by the latter. - -Note that upstream is no longer supporting this package and it has been -archived on GitHub. ---- - pkgs/development/python-modules/influxdb/default.nix | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix -index e2bacd522922..ce6bccdd409f 100644 ---- a/pkgs/development/python-modules/influxdb/default.nix -+++ b/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" ]; --- -2.41.0 - diff --git a/third_party/nixpkgs/patches/series b/third_party/nixpkgs/patches/series index a8cc60d8f5..ec475fc936 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1,2 +1 @@ poetry2nix-cryptography39.0.1.patch -influxdb-fix-after-Pandas-bump.patch