From 31ccd139ff0c7c18b98eccd5d331d15e0e63fadf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Jun 2023 23:03:14 +0000 Subject: [PATCH 1/5] python310Packages.confluent-kafka: 2.0.2 -> 2.1.1 --- pkgs/development/python-modules/confluent-kafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 17f33d8b7fc9..60fd01575af4 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro ? null, futures ? null, enum34 ? null }: buildPythonPackage rec { - version = "2.0.2"; + version = "2.1.1"; pname = "confluent-kafka"; src = fetchPypi { inherit pname version; - hash = "sha256-OzQupCJu0QXKi8A1sId+TcLxFf/adOOjUPNjaDNWUVs="; + hash = "sha256-pmXnQDCoXF9CA1OM/nfkARM6hJxLkgUqYCJbJgUqfp0="; }; buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ; From fde8c87705acbd2423015f93013674edf429e079 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Jun 2023 22:48:40 +0200 Subject: [PATCH 2/5] python310Packages.confluent-kafka: add changelog to meta --- pkgs/development/python-modules/confluent-kafka/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 60fd01575af4..0a0433741bd5 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -17,6 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Confluent's Apache Kafka client for Python"; homepage = "https://github.com/confluentinc/confluent-kafka-python"; + changelog = "https://github.com/confluentinc/confluent-kafka-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ mlieberman85 ]; }; From e7b0e2111b1d69965cf4f3e01ebf952746024d2f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Jun 2023 23:12:13 +0200 Subject: [PATCH 3/5] python311Packages.avro: add changelog to meta --- pkgs/development/python-modules/avro/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index 0f01045a6f14..368776c4aa19 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python serialization and RPC framework"; homepage = "https://github.com/apache/avro"; + changelog = "https://github.com/apache/avro/releases/tag/release-${version}"; license = licenses.asl20; maintainers = with maintainers; [ zimbatm ]; }; From 2dee09084f74732ab328b1ad4dbd29498bd4ac27 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Jun 2023 23:13:27 +0200 Subject: [PATCH 4/5] python311Packages.avro: disable failing test --- pkgs/development/python-modules/avro/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index 368776c4aa19..cbddeafd2365 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { disabledTests = [ # Requires network access "test_server_with_path" + # AssertionError: 'reader type: null not compatible with writer type: int' + "test_schema_compatibility_type_mismatch" ]; pythonImportsCheck = [ From 12ef4ebea7c13c668981e526297b3b6ca58ff068 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Jun 2023 23:16:03 +0200 Subject: [PATCH 5/5] python310Packages.confluent-kafka: add optional-dependencies - enable tests - add pythonImportsCheck - add format - disable on unsupported Python releases --- .../confluent-kafka/default.nix | 66 ++++++++++++++++--- 1 file changed, 58 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 0a0433741bd5..03cdb826786c 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,18 +1,68 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro ? null, futures ? null, enum34 ? null }: +{ lib +, avro +, buildPythonPackage +, fastavro +, fetchFromGitHub +, jsonschema +, protobuf +, pyflakes +, pyrsistent +, pytestCheckHook +, pythonOlder +, rdkafka +, requests +, requests-mock +}: buildPythonPackage rec { - version = "2.1.1"; pname = "confluent-kafka"; + version = "2.1.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - hash = "sha256-pmXnQDCoXF9CA1OM/nfkARM6hJxLkgUqYCJbJgUqfp0="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "confluentinc"; + repo = "confluent-kafka-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-xnbovQRvbhaYYXnssV0Jy+U9L6BUddIagbup2jdTugY="; }; - buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ; + buildInputs = [ + rdkafka + ]; - # No tests in PyPi Tarball - doCheck = false; + propagatedBuildInputs = [ + requests + ]; + + passthru.optional-dependencies = { + avro = [ + avro + fastavro + ]; + json = [ + jsonschema + pyrsistent + ]; + protobuf = [ + protobuf + ]; + }; + + nativeCheckInputs = [ + pyflakes + pytestCheckHook + requests-mock + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "confluent_kafka" + ]; + + disabledTestPaths = [ + "tests/integration/" + ]; meta = with lib; { description = "Confluent's Apache Kafka client for Python";