From facce1b815ad9415f35db4bfeacd10669eda163c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Apr 2024 18:46:20 +0000 Subject: [PATCH 1/3] python311Packages.awswrangler: 3.7.2 -> 3.7.3 --- pkgs/development/python-modules/awswrangler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index ad861143dcca..1925fe1e5735 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "awswrangler"; - version = "3.7.2"; + version = "3.7.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-sdk-pandas"; rev = "refs/tags/${version}"; - hash = "sha256-1eb2oTiRNxA2XTpkScA5WJutN5P6FX96jC4Ra9VdonI="; + hash = "sha256-gm6ieteW+NcY+AOLcMZLUPcSi2Z/Mo27rzd1i9imp5I="; }; build-system = [ From 31748b91a2c16d2404f14f893fe2d6bed8e73f8e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Apr 2024 08:40:01 +0200 Subject: [PATCH 2/3] python311Packages.awswrangler: format with nixfmt --- .../python-modules/awswrangler/default.nix | 61 +++++++++---------- 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index 1925fe1e5735..1b2f6a72aa38 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -1,27 +1,28 @@ -{ backoff -, sparqlwrapper -, boto3 -, buildPythonPackage -, fetchFromGitHub -, gremlinpython -, jsonpath-ng -, lib -, moto -, openpyxl -, opensearch-py -, pandas -, pg8000 -, poetry-core -, progressbar2 -, pyarrow -, pymysql -, pyodbc -, pyparsing -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, redshift-connector -, requests-aws4auth +{ + backoff, + sparqlwrapper, + boto3, + buildPythonPackage, + fetchFromGitHub, + gremlinpython, + jsonpath-ng, + lib, + moto, + openpyxl, + opensearch-py, + pandas, + pg8000, + poetry-core, + progressbar2, + pyarrow, + pymysql, + pyodbc, + pyparsing, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + redshift-connector, + requests-aws4auth, }: buildPythonPackage rec { @@ -43,9 +44,7 @@ buildPythonPackage rec { pythonRelaxDepsHook ]; - pythonRelaxDeps = [ - "packaging" - ]; + pythonRelaxDeps = [ "packaging" ]; dependencies = [ boto3 @@ -78,12 +77,8 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - sqlserver = [ - pyodbc - ]; - sparql = [ - sparqlwrapper - ]; + sqlserver = [ pyodbc ]; + sparql = [ sparqlwrapper ]; }; meta = with lib; { From f3d0985a0818d5f6df073c592944bf99008d9f1a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 23 Apr 2024 08:42:29 +0200 Subject: [PATCH 3/3] python312Packages.awswrangler: refactor --- .../python-modules/awswrangler/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index 1b2f6a72aa38..b222c5703cd4 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -39,12 +39,15 @@ buildPythonPackage rec { hash = "sha256-gm6ieteW+NcY+AOLcMZLUPcSi2Z/Mo27rzd1i9imp5I="; }; + pythonRelaxDeps = [ "packaging" ]; + build-system = [ poetry-core - pythonRelaxDepsHook ]; - pythonRelaxDeps = [ "packaging" ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; dependencies = [ boto3 @@ -61,12 +64,21 @@ buildPythonPackage rec { requests-aws4auth ]; + passthru.optional-dependencies = { + sqlserver = [ pyodbc ]; + sparql = [ sparqlwrapper ]; + }; + nativeCheckInputs = [ moto pyparsing pytestCheckHook ]; + pythonImportsCheck = [ + "awswrangler" + ]; + pytestFlagsArray = [ # Subset of tests that run in upstream CI (many others require credentials) # https://github.com/aws/aws-sdk-pandas/blob/20fec775515e9e256e8cee5aee12966516608840/.github/workflows/minimal-tests.yml#L36-L43 @@ -76,11 +88,6 @@ buildPythonPackage rec { "tests/unit/test_moto.py" ]; - passthru.optional-dependencies = { - sqlserver = [ pyodbc ]; - sparql = [ sparqlwrapper ]; - }; - meta = with lib; { description = "Pandas on AWS"; homepage = "https://github.com/aws/aws-sdk-pandas";