From 7210ec95891a85de06f5f1e7f324994580eb5141 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Apr 2024 20:32:27 +0000 Subject: [PATCH 1/3] python311Packages.influxdb: 5.3.1 -> 5.3.2 --- pkgs/development/python-modules/influxdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index ca962f4e4792..a799e22a0466 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "influxdb"; - version = "5.3.1"; + version = "5.3.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "0ymjv322mv6y424fmpd70f87152w55mbwwj6i7p3sjzf0ixmxy26"; + sha256 = "sha256-WMZH9gQ3Et2G6a7hLrTM+7tUFUZ7yZEKSKqMdMEQiXA="; }; postPatch = '' From 9626227bb84f0ccfcd21c439efb97cb22fb2acb2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Apr 2024 08:47:11 +0200 Subject: [PATCH 2/3] python312Packages.influxdb: refactor --- .../python-modules/influxdb/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index a799e22a0466..a6ab709e3d67 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -1,26 +1,27 @@ { lib , buildPythonPackage -, python-dateutil , fetchPypi , mock , msgpack -, pynose , pandas +, pynose , pytestCheckHook +, python-dateutil , pytz , requests , requests-mock +, setuptools , six }: buildPythonPackage rec { pname = "influxdb"; version = "5.3.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-WMZH9gQ3Et2G6a7hLrTM+7tUFUZ7yZEKSKqMdMEQiXA="; + hash = "sha256-WMZH9gQ3Et2G6a7hLrTM+7tUFUZ7yZEKSKqMdMEQiXA="; }; postPatch = '' @@ -35,25 +36,30 @@ buildPythonPackage rec { done ''; - propagatedBuildInputs = [ - requests + build-system = [ + setuptools + ]; + + dependencies = [ + msgpack python-dateutil pytz + requests six - msgpack ]; __darwinAllowLocalNetworking = true; nativeCheckInputs = [ + mock + pandas + pynose pytestCheckHook requests-mock - mock - pynose - pandas ]; disabledTests = [ + "socket" # Tests cause FutureWarning due to use of 'record' instead of 'records' in pandas. # https://github.com/influxdata/influxdb-python/pull/845 # Also type mismatches in assertEqual on DataFrame: @@ -78,6 +84,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for InfluxDB"; homepage = "https://github.com/influxdb/influxdb-python"; + changelog = "https://github.com/influxdata/influxdb-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From ad26d5df1acd9b75e4857637509a3c43644dc43f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Apr 2024 08:47:33 +0200 Subject: [PATCH 3/3] python312Packages.influxdb: format with nixfmt --- .../python-modules/influxdb/default.nix | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index a6ab709e3d67..1f7e7c017501 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, fetchPypi -, mock -, msgpack -, pandas -, pynose -, pytestCheckHook -, python-dateutil -, pytz -, requests -, requests-mock -, setuptools -, six +{ + lib, + buildPythonPackage, + fetchPypi, + mock, + msgpack, + pandas, + pynose, + pytestCheckHook, + python-dateutil, + pytz, + requests, + requests-mock, + setuptools, + six, }: buildPythonPackage rec { @@ -36,9 +37,7 @@ buildPythonPackage rec { done ''; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ msgpack