From c104826f0cf99260d51cd597af52c17222050e43 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 22 Nov 2024 10:18:48 +0100 Subject: [PATCH 1/2] python312Packages.slack-sdk: 3.33.3 -> 3.33.4 Diff: https://github.com/slackapi/python-slack-sdk/compare/refs/tags/v3.33.3...v3.33.4 Changelog: https://github.com/slackapi/python-slack-sdk/releases/tag/v3.33.4 --- .../python-modules/slack-sdk/default.nix | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 9273bb331b80..b68f415276c9 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -8,7 +8,6 @@ flake8, flask-sockets, moto, - pythonOlder, psutil, pytest-asyncio, pytestCheckHook, @@ -20,16 +19,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.33.3"; + version = "3.33.4"; pyproject = true; - disabled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-ewNEo8kcxdrd6mVze/UbKdnTIIf59s7OnMP42St1www="; + hash = "sha256-WIUhkIFWbIcxjTjzZ2C3VNFhGftBmyYO3iaHpz6d+Sc="; }; postPatch = '' @@ -48,6 +45,8 @@ buildPythonPackage rec { websockets ]; + pythonImportsCheck = [ "slack_sdk" ]; + nativeCheckInputs = [ flake8 flask-sockets @@ -61,26 +60,20 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - disabledTestPaths = [ - # Exclude tests that requires network features - "integration_tests" - ]; - disabledTests = [ - # Requires network features + # Requires internet access (to slack API) "test_start_raises_an_error_if_rtm_ws_url_is_not_returned" - "test_org_installation" - "test_interactions" - "test_issue_690_oauth_access" + # Requires network access: [Errno 111] Connection refused + "test_send_message_while_disconnection" ]; - pythonImportsCheck = [ "slack_sdk" ]; + __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Slack Developer Kit for Python"; homepage = "https://slack.dev/python-slack-sdk/"; changelog = "https://github.com/slackapi/python-slack-sdk/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } From 12e66587fe43802818e7ab2b1e146e6b6dee30cf Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 22 Nov 2024 11:57:42 +0100 Subject: [PATCH 2/2] python312Packages.slack-bolt: fix on darwin; clean --- .../python-modules/slack-bolt/default.nix | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/slack-bolt/default.nix b/pkgs/development/python-modules/slack-bolt/default.nix index 55b844655944..62ee94e72ba4 100644 --- a/pkgs/development/python-modules/slack-bolt/default.nix +++ b/pkgs/development/python-modules/slack-bolt/default.nix @@ -1,33 +1,42 @@ { lib, - aiohttp, - bottle, buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + slack-sdk, + + # optional-dependencies + # - async + aiohttp, + websockets, + # - adapter + bottle, chalice, cherrypy, django, - docker, falcon, fastapi, - fetchFromGitHub, flask, flask-sockets, gunicorn, moto, pyramid, - pytest-asyncio, - pytestCheckHook, - pythonOlder, sanic, - setuptools, sanic-testing, - slack-sdk, starlette, tornado, uvicorn, websocket-client, - websockets, werkzeug, + + # tests + docker, + pytest-asyncio, + pytestCheckHook, }: buildPythonPackage rec { @@ -35,8 +44,6 @@ buildPythonPackage rec { version = "1.21.2"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "slackapi"; repo = "bolt-python"; @@ -80,6 +87,8 @@ buildPythonPackage rec { ]; }; + pythonImportsCheck = [ "slack_bolt" ]; + nativeCheckInputs = [ docker pytest-asyncio @@ -90,30 +99,23 @@ buildPythonPackage rec { export HOME="$(mktemp -d)" ''; + __darwinAllowLocalNetworking = true; + disabledTestPaths = [ # boddle is not packaged as of 2023-07-15 "tests/adapter_tests/bottle/" - # Tests are blocking at some point. Blocking could be performance-related. - "tests/scenario_tests_async/" - "tests/slack_bolt_async/" ]; disabledTests = [ # Require network access - "test_events" - "test_interactions" - "test_lazy_listener_calls" - "test_lazy_listeners" "test_failure" ]; - pythonImportsCheck = [ "slack_bolt" ]; - - meta = with lib; { + meta = { description = "Framework to build Slack apps using Python"; homepage = "https://github.com/slackapi/bolt-python"; changelog = "https://github.com/slackapi/bolt-python/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ samuela ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ samuela ]; }; }