From fa436286e6704a99e37e17eef3987fb77c330f8f Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Tue, 21 Nov 2023 01:29:18 +0000 Subject: [PATCH 1/2] python311Packages.redshift-connector: remove 'test' from pytest args; fix build this change just no-ops the args added to pytest in setup.cfg to fix the unit tests. The python3.11 change https://github.com/NixOS/nixpkgs/commit/b5eaf5b39eb8610fe44b1a4f116c9a0cc2e27f89 updated 2.0.911 -> 2.0.914 which pulled in this commit that modified setup.cfg https://github.com/aws/amazon-redshift-python-driver/commit/2e782578f27f2ce2635011770b008186012b274a and broke the unit tests --- .../development/python-modules/redshift-connector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/redshift-connector/default.nix b/pkgs/development/python-modules/redshift-connector/default.nix index 7bf21823e7bb..4bd4b3c14619 100644 --- a/pkgs/development/python-modules/redshift-connector/default.nix +++ b/pkgs/development/python-modules/redshift-connector/default.nix @@ -27,9 +27,9 @@ buildPythonPackage rec { hash = "sha256-fGOo9FgVMI6ayyB3EMN6RGThwWciShcBZzWTZWtOt8E="; }; - # disable test coverage + # remove addops as they add test directory and coverage parameters to pytest postPatch = '' - sed -i "/--cov/d" setup.cfg + substituteInPlace setup.cfg --replace 'addopts =' 'no-opts =' ''; propagatedBuildInputs = [ From a8e066abd642485b0cbb670be8eda0f475bd35cb Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Tue, 21 Nov 2023 03:05:11 +0000 Subject: [PATCH 2/2] python311Packages.awswrangler: add pyparsing module for checkPhase --- pkgs/development/python-modules/awswrangler/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index 54ad818bb8a1..e8680180571e 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -16,6 +16,7 @@ , pyarrow , pymysql , pyodbc +, pyparsing , pytestCheckHook , pythonOlder , redshift-connector @@ -57,6 +58,7 @@ buildPythonPackage rec { nativeCheckInputs = [ moto + pyparsing pytestCheckHook ];