diff --git a/pkgs/by-name/ir/irrd/package.nix b/pkgs/by-name/ir/irrd/package.nix index aa2c1522b5eb..b9d5343b0031 100644 --- a/pkgs/by-name/ir/irrd/package.nix +++ b/pkgs/by-name/ir/irrd/package.nix @@ -42,7 +42,7 @@ in py.pkgs.buildPythonPackage rec { pname = "irrd"; version = "4.5.0b1"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "irrdnet"; @@ -55,11 +55,10 @@ py.pkgs.buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace-fail py-radix py-radix-sr ''; + pythonRelaxDeps = true; - nativeBuildInputs = with python3.pkgs; [ - poetry-core - ]; + build-system = with python3.pkgs; [ poetry-core ]; nativeCheckInputs = [ git @@ -69,14 +68,14 @@ py.pkgs.buildPythonPackage rec { postgresqlTestHook ] ++ (with py.pkgs; [ - pytest-asyncio + pytest-asyncio_0 pytest-freezegun pytestCheckHook smtpdfix httpx ]); - propagatedBuildInputs = + dependencies = with py.pkgs; [ python-gnupg @@ -142,12 +141,17 @@ py.pkgs.buildPythonPackage rec { kill $REDIS_PID ''; - # skip tests that require internet access disabledTests = [ + # Skip tests that require internet access "test_020_dash_o_noop" "test_050_non_json_response" ]; + disabledTestPaths = [ + # Doesn't work with later pytest releases + "irrd/server/whois/tests/test_query_response.py" + ]; + meta = { changelog = "https://irrd.readthedocs.io/en/v${version}/releases/"; description = "Internet Routing Registry database server, processing IRR objects in the RPSL format"; diff --git a/pkgs/development/python-modules/ariadne/default.nix b/pkgs/development/python-modules/ariadne/default.nix index 2a8365960e73..b279311510ae 100644 --- a/pkgs/development/python-modules/ariadne/default.nix +++ b/pkgs/development/python-modules/ariadne/default.nix @@ -9,7 +9,6 @@ pytest-asyncio, pytest-mock, pytestCheckHook, - pythonOlder, python-multipart, starlette, syrupy, @@ -22,8 +21,6 @@ buildPythonPackage rec { version = "0.26.2"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "mirumee"; repo = "ariadne"; @@ -33,9 +30,11 @@ buildPythonPackage rec { patches = [ ./remove-opentracing.patch ]; - nativeBuildInputs = [ hatchling ]; + pythonRelaxDeps = [ "graphql-core" ]; - propagatedBuildInputs = [ + build-system = [ hatchling ]; + + dependencies = [ graphql-core starlette typing-extensions @@ -64,6 +63,10 @@ buildPythonPackage rec { # opentracing "test_query_is_executed_for_multipart_form_request_with_file" "test_query_is_executed_for_multipart_request_with_large_file_with_tracing" + # AssertionError: assert not [GraphQLError(... + "test_enum_with_int_values_from_dict" + "test_enum_with_int_enum_values" + "test_enum_with_str_enum_values" ]; disabledTestPaths = [