diff --git a/pkgs/development/python-modules/ariadne/default.nix b/pkgs/development/python-modules/ariadne/default.nix index acec77ed30a0..6fff47cb42dd 100644 --- a/pkgs/development/python-modules/ariadne/default.nix +++ b/pkgs/development/python-modules/ariadne/default.nix @@ -6,6 +6,7 @@ graphql-core, hatchling, httpx, + opentelemetry-api, pytest-asyncio, pytest-mock, pytestCheckHook, @@ -18,20 +19,16 @@ buildPythonPackage (finalAttrs: { pname = "ariadne"; - version = "0.29.0"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "mirumee"; repo = "ariadne"; tag = finalAttrs.version; - hash = "sha256-u6iKgugj30OxIEQ3P0+e05IC/Mh0hvKfTohTc/7pkUk="; + hash = "sha256-V5/4kLdb3Apnnq91HQ3eApl1R2+pqeWhWi5Y0ULqJrI="; }; - patches = [ ./remove-opentracing.patch ]; - - pythonRelaxDeps = [ "graphql-core" ]; - build-system = [ hatchling ]; dependencies = [ @@ -43,6 +40,7 @@ buildPythonPackage (finalAttrs: { nativeCheckInputs = [ freezegun httpx + opentelemetry-api pytest-asyncio pytest-mock pytestCheckHook @@ -53,29 +51,10 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "ariadne" ]; - pytestFlags = [ "--snapshot-update" ]; - - disabledTests = [ - # TypeError: TestClient.request() got an unexpected keyword argument 'content' - "test_attempt_parse_request_missing_content_type_raises_bad_request_error" - "test_attempt_parse_non_json_request_raises_bad_request_error" - "test_attempt_parse_non_json_request_body_raises_bad_request_error" - # 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 = [ # missing graphql-sync-dataloader test dep "tests/test_dataloaders.py" "tests/wsgi/test_configuration.py" - # both include opentracing module, which has been removed from nixpkgs - "tests/tracing/test_opentracing.py" - "tests/tracing/test_opentelemetry.py" ]; meta = { diff --git a/pkgs/development/python-modules/ariadne/remove-opentracing.patch b/pkgs/development/python-modules/ariadne/remove-opentracing.patch deleted file mode 100644 index eecbfafea9b9..000000000000 --- a/pkgs/development/python-modules/ariadne/remove-opentracing.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tests/asgi/conftest.py b/tests/asgi/conftest.py -index a703466..223586e 100644 ---- a/tests/asgi/conftest.py -+++ b/tests/asgi/conftest.py -@@ -8,7 +8,6 @@ from ariadne.asgi.handlers import ( - GraphQLTransportWSHandler, - GraphQLWSHandler, - ) --from ariadne.contrib.tracing.opentracing import opentracing_extension - - - @pytest.fixture