From da33679726fcef7d3f224956113eeab47db3e285 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 03:11:00 +0000 Subject: [PATCH 1/5] python312Packages.aiohttp-retry: 2.8.3 -> 2.9.0 --- pkgs/development/python-modules/aiohttp-retry/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-retry/default.nix b/pkgs/development/python-modules/aiohttp-retry/default.nix index 940f5bd35a3d..a43f97378737 100644 --- a/pkgs/development/python-modules/aiohttp-retry/default.nix +++ b/pkgs/development/python-modules/aiohttp-retry/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiohttp-retry"; - version = "2.8.3"; + version = "2.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "inyutin"; repo = "aiohttp_retry"; - rev = "v${version}"; - hash = "sha256-Zr68gx8ZR9jKrogmqaFLvpBAIHE9ptHm0zZ/b49cCLw="; + rev = "refs/tags/v${version}"; + hash = "sha256-9riIGQDxC+Ee16itSWJWobPkmuy7Mkn2eyTkevIGse8="; }; propagatedBuildInputs = [ aiohttp ]; From 93f02acdb4df2f571e6d105374aeff4d0879f7a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Oct 2024 08:45:42 +0100 Subject: [PATCH 2/5] python312Packages.aiohttp-retry: refactor --- pkgs/development/python-modules/aiohttp-retry/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-retry/default.nix b/pkgs/development/python-modules/aiohttp-retry/default.nix index a43f97378737..c00c668ad1e1 100644 --- a/pkgs/development/python-modules/aiohttp-retry/default.nix +++ b/pkgs/development/python-modules/aiohttp-retry/default.nix @@ -6,12 +6,13 @@ pytestCheckHook, pytest-aiohttp, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "aiohttp-retry"; version = "2.9.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +23,9 @@ buildPythonPackage rec { hash = "sha256-9riIGQDxC+Ee16itSWJWobPkmuy7Mkn2eyTkevIGse8="; }; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; __darwinAllowLocalNetworking = true; @@ -38,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Retry client for aiohttp"; homepage = "https://github.com/inyutin/aiohttp_retry"; + changelog = "https://github.com/inyutin/aiohttp_retry/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 510f48f0b9280c33863c0a0c032a7df60405490f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 13:36:24 +0100 Subject: [PATCH 3/5] python311Packages.langchain-openai: disable failing test --- .../python-modules/langchain-openai/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix index e58b03a7d2cd..ee733d90523c 100644 --- a/pkgs/development/python-modules/langchain-openai/default.nix +++ b/pkgs/development/python-modules/langchain-openai/default.nix @@ -72,17 +72,18 @@ buildPythonPackage rec { disabledTests = [ # These tests require network access + "test__convert_dict_to_message_tool_call" "test__get_encoding_model" - "test_get_token_ids" - "test_azure_openai_secrets" "test_azure_openai_api_key_is_secret_string" - "test_get_num_tokens_from_messages" "test_azure_openai_api_key_masked_when_passed_from_env" "test_azure_openai_api_key_masked_when_passed_via_constructor" + "test_azure_openai_secrets" "test_azure_openai_uses_actual_secret_value_from_secretstr" "test_azure_serialized_secrets" - "test_openai_get_num_tokens" "test_chat_openai_get_num_tokens" + "test_get_num_tokens_from_messages" + "test_get_token_ids" + "test_openai_get_num_tokens" ]; pythonImportsCheck = [ "langchain_openai" ]; From 2d6343f7b79246493151caaad2c439d6a5de6abf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 3 Nov 2024 12:11:07 +0100 Subject: [PATCH 4/5] python312Packages.twilio: aiounittest is not supported oyn Python 3.12 --- .../python-modules/twilio/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 7faf26909ea9..dce798f73b2a 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -1,7 +1,7 @@ { lib, - aiohttp, aiohttp-retry, + aiohttp, aiounittest, buildPythonPackage, cryptography, @@ -9,9 +9,10 @@ fetchFromGitHub, mock, multidict, - pyngrok, pyjwt, + pyngrok, pytestCheckHook, + pythonAtLeast, pythonOlder, pytz, requests, @@ -43,9 +44,6 @@ buildPythonPackage rec { requests ]; - # aiounittest is not supported on 3.12 - doCheck = pythonOlder "3.12"; - nativeCheckInputs = [ aiounittest cryptography @@ -61,11 +59,16 @@ buildPythonPackage rec { "test_set_user_agent_extensions" ]; - disabledTestPaths = [ - # Tests require API token - "tests/cluster/test_webhook.py" - "tests/cluster/test_cluster.py" - ]; + disabledTestPaths = + [ + # Tests require API token + "tests/cluster/test_webhook.py" + "tests/cluster/test_cluster.py" + ] + ++ lib.optionals (pythonAtLeast "3.11") [ + # aiounittest is not supported on Python 3.12 + "tests/unit/http/test_async_http_client.py" + ]; pythonImportsCheck = [ "twilio" ]; From 73d9296e98f3542f693aa7f3fcea87302320a411 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 3 Nov 2024 11:58:24 +0100 Subject: [PATCH 5/5] python312Packages.sagemaker: relax attrs --- pkgs/development/python-modules/sagemaker/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 6903f1261079..6f437dd9f219 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -53,6 +53,7 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ + "attrs" "boto3" "cloudpickle" "importlib-metadata"