diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index 24551340a0a8..f5edffd3e442 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -1,42 +1,61 @@ { lib +, aiomysql +, aiopg +, aiosqlite +, asyncmy +, asyncpg , buildPythonPackage , fetchFromGitHub -, sqlalchemy -, aiocontextvars -, aiopg -, pythonOlder , pytestCheckHook -, pymysql -, asyncpg -, aiomysql -, aiosqlite +, pythonOlder +, sqlalchemy }: buildPythonPackage rec { pname = "databases"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "encode"; repo = pname; - rev = version; - hash = "sha256-kHsA9XpolGmtuAGzRTj61igooLG9/LBQyv7TtuqiJ/A="; + rev = "refs/tags/${version}"; + hash = "sha256-3zgHfYGiO2xWualLa4h8A85qjC32ILadw/47Ul1GTmM="; }; propagatedBuildInputs = [ - aiopg - aiomysql - aiosqlite - asyncpg - pymysql sqlalchemy - ] ++ lib.optionals (pythonOlder "3.7") [ - aiocontextvars ]; + passthru.optional-dependencies = { + postgresql = [ + asyncpg + ]; + asyncpg = [ + asyncpg + ]; + aiopg = [ + aiopg + ]; + mysql = [ + aiomysql + ]; + aiomysql = [ + aiomysql + ]; + asyncmy = [ + asyncmy + ]; + sqlite = [ + aiosqlite + ]; + aiosqlite = [ + aiosqlite + ]; + }; + checkInputs = [ pytestCheckHook ]; @@ -56,6 +75,7 @@ buildPythonPackage rec { meta = with lib; { description = "Async database support for Python"; homepage = "https://github.com/encode/databases"; + changelog = "https://github.com/encode/databases/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index 8b697fe2442c..0d914ce6786e 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -24,11 +24,12 @@ , tornado , urllib3 , webob +, wrapt }: buildPythonPackage rec { pname = "elastic-apm"; - version = "6.12.0"; + version = "6.13.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -37,7 +38,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "refs/tags/v${version}"; - hash = "sha256-tAX96aOPuwtchLk5A1ANuZI5w5H9/yX3Zj9bRSyHv90="; + hash = "sha256-HbIra8Cxgn/2xOVEvtcc7rMtSLBmWMxxHlIM44Oy+8U="; }; propagatedBuildInputs = [ @@ -48,6 +49,7 @@ buildPythonPackage rec { starlette tornado urllib3 + wrapt ]; checkInputs = [ @@ -84,6 +86,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python agent for the Elastic APM"; homepage = "https://github.com/elastic/apm-agent-python"; + changelog = "https://github.com/elastic/apm-agent-python/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/json-logging/default.nix b/pkgs/development/python-modules/json-logging/default.nix index a596dbe902b6..35959520b35c 100644 --- a/pkgs/development/python-modules/json-logging/default.nix +++ b/pkgs/development/python-modules/json-logging/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bobbui"; repo = "json-logging-python"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-WOAEY1pONH+Gx1b8zHZDMNgJJSn7jvMO60LYTA8z/dE="; }; @@ -53,6 +53,7 @@ buildPythonPackage rec { infrastructure such as ELK, EFK, AWS Cloudwatch, GCP Stackdriver. ''; homepage = "https://github.com/bobbui/json-logging-python"; + changelog = "https://github.com/bobbui/json-logging-python/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ AluisioASG ]; }; diff --git a/pkgs/development/python-modules/sanic-routing/default.nix b/pkgs/development/python-modules/sanic-routing/default.nix index cb06b5d1f2b3..ea18d0c1b18c 100644 --- a/pkgs/development/python-modules/sanic-routing/default.nix +++ b/pkgs/development/python-modules/sanic-routing/default.nix @@ -3,25 +3,36 @@ , fetchFromGitHub , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "sanic-routing"; - version = "22.3.0"; + version = "22.8.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic-routing"; - rev = "v${version}"; - hash = "sha256-dX+uxrVjtPxX0ba3WUE/JKgj0PZzvFdKr/lXQgASN6Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-2T6WY0nzvr8Q9lBoStzmX7m7Ct35lcG53OSLcqxkEcY="; }; - checkInputs = [ pytestCheckHook pytest-asyncio ]; - pythonImportsCheck = [ "sanic_routing" ]; + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sanic_routing" + ]; meta = with lib; { description = "Core routing component for the Sanic web framework"; homepage = "https://github.com/sanic-org/sanic-routing"; + changelog = "https://github.com/sanic-org/sanic-routing/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ AluisioASG ]; }; diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index 120f80b57e22..907950abdfb0 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -1,21 +1,25 @@ { lib , buildPythonPackage +, callPackage , fetchFromGitHub , httpx +, pythonOlder , sanic , websockets -, callPackage }: buildPythonPackage rec { pname = "sanic-testing"; - version = "22.3.1"; + version = "22.9.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sanic-org"; repo = "sanic-testing"; rev = "refs/tags/v${version}"; - sha256 = "sha256-6aJyc5B9e65RPG3FwXAoQByVNdrLAWTEu2/Dqf9hf+g="; + hash = "sha256-o0uXeIw2wV9sxGkEH5jPrQvRj1W2CsUU2n+8R8Ta12Y="; }; outputs = [ @@ -23,10 +27,6 @@ buildPythonPackage rec { "testsout" ]; - postPatch = '' - sed -i 's/httpx>=.*"/httpx"/' setup.py - ''; - propagatedBuildInputs = [ httpx sanic @@ -38,8 +38,9 @@ buildPythonPackage rec { cp -R tests $testsout/tests ''; - # check in passthru.tests.pytest to escape infinite recursion with sanic + # Check in passthru.tests.pytest to escape infinite recursion with sanic doCheck = false; + doInstallCheck = false; passthru.tests = { @@ -49,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Core testing clients for the Sanic web framework"; homepage = "https://github.com/sanic-org/sanic-testing"; + changelog = "https://github.com/sanic-org/sanic-testing/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ AluisioASG ]; }; diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index e1559e1ec432..3302fa028ea9 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "sanic"; - version = "22.6.2"; + version = "22.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,8 +33,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sanic-org"; repo = pname; - rev = "v${version}"; - hash = "sha256-krEQd0ak9Uua+r+pYmLStlizgE4HmZBO8Q0I2/gWAwU="; + rev = "refs/tags/v${version}"; + hash = "sha256-KbcHnAdr59hk7W36BiTb/hD74ktj/DGzq1vcuZ/lGfQ="; }; propagatedBuildInputs = [ @@ -104,6 +104,13 @@ buildPythonPackage rec { "test_keep_alive_client_timeout" "test_keep_alive_server_timeout" "test_zero_downtime" + # TLS tests + "test_missing_sni" + "test_no_matching_cert" + "test_wildcards" + # They thtow execptions + "test_load_app_simple" + "worker/test_loader.py" # broke with ujson 5.4 upgrade # https://github.com/sanic-org/sanic/pull/2504 "test_json_response_json" @@ -129,6 +136,7 @@ buildPythonPackage rec { broken = stdenv.isDarwin; description = "Web server and web framework"; homepage = "https://github.com/sanic-org/sanic/"; + changelog = "https://github.com/sanic-org/sanic/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ costrouc AluisioASG ]; };