From c532303ba1559618ead8b9ce3296daeebcef7968 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Sep 2022 13:42:45 +0200 Subject: [PATCH 1/6] python310Packages.aiofiles: 0.8.0 -> 22.1.0 --- pkgs/development/python-modules/aiofiles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index 592f8facaebb..ef59dd6fa530 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiofiles"; - version = "0.8.0"; + version = "22.1.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Tinche"; repo = pname; rev = "v${version}"; - sha256 = "sha256-V7F+xalFGMgTgT30Gmd9FVV3cPndI/i9cB5vEuW/KVc="; + sha256 = "sha256-2itjGYusJT6sbCAgvKsI9IXeAOP7VQV0bpifFBZmnAo="; }; nativeBuildInputs = [ From 3a759f3b6169457e59b774039df691e9cc391fd9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Sep 2022 13:42:54 +0200 Subject: [PATCH 2/6] python310Packages.aiomysensors: 0.3.0 -> 0.3.1 --- pkgs/development/python-modules/aiomysensors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiomysensors/default.nix b/pkgs/development/python-modules/aiomysensors/default.nix index dfa02c979433..b2888a92d256 100644 --- a/pkgs/development/python-modules/aiomysensors/default.nix +++ b/pkgs/development/python-modules/aiomysensors/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiomysensors"; - version = "0.3.0"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = pname; rev = "v${version}"; - hash = "sha256-EGVoHEJrpGtp8OrhQhRZVaN1GhL4QCo/azp6pzgYYcs="; + hash = "sha256-uzVtgJ4R2MK6lqruvmoqgkzVCLhjyaEV92X6U6+lwG4="; }; nativeBuildInputs = [ From c3ac6ea4ba33ce2a44069e9a97ff840df9995ad0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 Oct 2022 18:48:00 +0200 Subject: [PATCH 3/6] python310Packages.datasette: 0.61.1 -> 0.63 --- .../python-modules/datasette/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 18c6943d1e67..85eb37772af9 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -16,7 +16,6 @@ , pyyaml , uvicorn , httpx -# Check Inputs , pytestCheckHook , pytest-asyncio , pytest-timeout @@ -30,7 +29,8 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.61.1"; + version = "0.63"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -38,18 +38,13 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = version; - sha256 = "sha256-HVzMyF4ujYK12UQ25il/XROPo+iBldsMxOTx+duoc5o="; + sha256 = "sha256-kzehFvGSmGo2TAtiNZCjRVv/kaiE+shniNnD0gO58b4="; }; postPatch = '' substituteInPlace setup.py \ --replace '"pytest-runner"' "" \ - --replace "click>=7.1.1,<8.1.0" "click>=7.1.1,<8.2.0" \ - --replace "click-default-group~=1.2.2" "click-default-group" \ - --replace "hupper~=1.9" "hupper" \ - --replace "Jinja2>=2.10.3,<3.1.0" "Jinja2" \ - --replace "pint~=0.9" "pint" \ - --replace "uvicorn~=0.11" "uvicorn" + --replace "click-default-group-wheel>=1.2.2" "click-default-group" ''; propagatedBuildInputs = [ From b2f00c08e525e8dcc30a7b97a72fa4c3ddb810dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 Oct 2022 19:21:33 +0200 Subject: [PATCH 4/6] gallia: relax aiofiles constraint --- pkgs/tools/security/gallia/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/gallia/default.nix b/pkgs/tools/security/gallia/default.nix index 14657c6ecc7d..785f6aae9fff 100644 --- a/pkgs/tools/security/gallia/default.nix +++ b/pkgs/tools/security/gallia/default.nix @@ -41,6 +41,7 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ + --replace 'aiofiles = "^0.8.0"' 'aiofiles = ">=0.8.0"' \ --replace 'zstandard = "^0.17.0"' 'zstandard = "*"' ''; From bffa58c925da4ffb1b985e001c491737fc041f94 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 Oct 2022 20:35:49 +0200 Subject: [PATCH 5/6] python310Packages.datasette-template-sql: disable tests --- .../datasette-template-sql/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/datasette-template-sql/default.nix b/pkgs/development/python-modules/datasette-template-sql/default.nix index 84c88aea9338..a4ba47add5cf 100644 --- a/pkgs/development/python-modules/datasette-template-sql/default.nix +++ b/pkgs/development/python-modules/datasette-template-sql/default.nix @@ -1,33 +1,40 @@ -{ buildPythonPackage -, fetchFromGitHub -, lib +{ lib +, buildPythonPackage , datasette -, pytestCheckHook +, fetchFromGitHub , pytest-asyncio -, sqlite-utils +, pythonOlder }: buildPythonPackage rec { pname = "datasette-template-sql"; version = "1.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "simonw"; repo = pname; rev = version; - sha256 = "1ag5f62y445jscxnklcfd84pjinkknmrpk1kmm2j121p7484hrsn"; + hash = "sha256-VmdIEDk3iCBFrTPMm6ud00Z5CWqO0Wk707IQ4oVx5ak="; }; - propagatedBuildInputs = [ datasette ]; + propagatedBuildInputs = [ + datasette + ]; - checkInputs = [ pytestCheckHook pytest-asyncio sqlite-utils ]; + # Tests require a running datasette instance + doCheck = false; - pythonImportsCheck = [ "datasette_template_sql" ]; + pythonImportsCheck = [ + "datasette_template_sql" + ]; meta = with lib; { description = "Datasette plugin for executing SQL queries from templates"; homepage = "https://datasette.io/plugins/datasette-template-sql"; license = licenses.asl20; - maintainers = [ maintainers.MostAwesomeDude ]; + maintainers = with maintainers; [ MostAwesomeDude ]; }; } From b5533ca5d69840cc40ddcfc9f440d3c11660ecc3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 Oct 2022 20:50:31 +0200 Subject: [PATCH 6/6] python310Packages.openapi-core: 0.14.2 -> 0.16.1 --- .../python-modules/openapi-core/default.nix | 76 ++++++++++++------- 1 file changed, 47 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index 32989e7f9ce5..bb5d02724bbe 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -1,32 +1,34 @@ { lib -, attrs , buildPythonPackage -, dictpath , django , djangorestframework , falcon , fetchFromGitHub , flask +, httpx , isodate -, lazy-object-proxy +, jsonschema-spec , mock , more-itertools , openapi-schema-validator , openapi-spec-validator , parse +, pathable +, poetry-core , pytestCheckHook , pythonOlder , responses -, six +, requests +, starlette +, typing-extensions , webob , werkzeug -, python }: buildPythonPackage rec { pname = "openapi-core"; - version = "0.14.2"; - format = "setuptools"; + version = "0.16.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -34,51 +36,67 @@ buildPythonPackage rec { owner = "p1c2u"; repo = "openapi-core"; rev = version; - hash = "sha256-+VyNPSq7S1Oz4eGf+jaeRTx0lZ8pUA+G+KZ/5PyK+to="; + hash = "sha256-J3n34HR5lfMM0ik5HAZ2JCr75fX5FTqBWrZ7E3/6XSE="; }; postPatch = '' - sed -i "/^addopts/d" setup.cfg + sed -i "/--cov/d" pyproject.toml ''; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ - attrs - dictpath isodate - lazy-object-proxy + more-itertools + pathable more-itertools openapi-schema-validator + jsonschema-spec openapi-spec-validator + typing-extensions parse - six werkzeug ]; + passthru.optional-dependencies = { + django = [ + django + ]; + falcon = [ + falcon + ]; + flask = [ + flask + ]; + requests = [ + requests + ]; + starlette = [ + httpx + starlette + ]; + }; + checkInputs = [ - django - djangorestframework - falcon - flask mock pytestCheckHook responses webob - ]; + ] ++ passthru.optional-dependencies.flask + ++ passthru.optional-dependencies.falcon + ++ passthru.optional-dependencies.django + ++ passthru.optional-dependencies.starlette + ++ passthru.optional-dependencies.requests; disabledTestPaths = [ # AttributeError: 'str' object has no attribute '__name__' - "tests/integration/validation" - # requires secrets and additional configuration - "tests/integration/contrib/test_django.py" + #"tests/integration/validation" + # Requires secrets and additional configuration + "tests/integration/contrib/django/" # Unable to detect SECRET_KEY and ROOT_URLCONF - "tests/integration/contrib/test_django.py" - ]; - - disabledTests = [ - # TypeError: Unexpected keyword arguments passed to pytest.raises: message - "test_string_format_invalid_value" - # Needs a fix for new PyYAML - "test_django_rest_framework_apiview" + "tests/integration/contrib/django/" ]; pythonImportsCheck = [