diff --git a/pkgs/by-name/lu/luigi/package.nix b/pkgs/by-name/lu/luigi/package.nix index ff1ba281badb..1ba48b5bb157 100644 --- a/pkgs/by-name/lu/luigi/package.nix +++ b/pkgs/by-name/lu/luigi/package.nix @@ -1,51 +1,5 @@ { - lib, python3Packages, - fetchPypi, }: -python3Packages.python.pkgs.buildPythonApplication (finalAttrs: { - pname = "luigi"; - version = "3.8.1"; - pyproject = true; - - src = fetchPypi { - pname = "luigi"; - inherit (finalAttrs) version; - hash = "sha256-L6XrXTR05JXeCb2WT1ApNsCPix624PPKPIppEWw40MM="; - }; - - build-system = with python3Packages; [ - hatchling - hatch-fancy-pypi-readme - ]; - - pythonRelaxDeps = [ "tenacity" ]; - - dependencies = with python3Packages; [ - python-dateutil - tornado - python-daemon - tenacity - typing-extensions - ]; - - pythonImportsCheck = [ "luigi" ]; - - # Requires tox, hadoop, and google cloud - doCheck = false; - - # This enables accessing modules stored in cwd - makeWrapperArgs = [ "--prefix PYTHONPATH . :" ]; - - meta = { - description = "Python package that helps you build complex pipelines of batch jobs"; - longDescription = '' - Luigi handles dependency resolution, workflow management, visualization, - handling failures, command line integration, and much more. - ''; - homepage = "https://github.com/spotify/luigi"; - changelog = "https://github.com/spotify/luigi/releases/tag/${finalAttrs.version}"; - license = [ lib.licenses.asl20 ]; - }; -}) +python3Packages.toPythonApplication python3Packages.luigi diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index 05a90a9f6624..3b71f3a8a428 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -23,17 +23,15 @@ buildPythonPackage (finalAttrs: { pname = "kafka-python"; - version = "2.3.2"; + version = "3.0.0"; pyproject = true; __structuredAttrs = true; - disabled = pythonAtLeast "3.14"; - src = fetchFromGitHub { owner = "dpkp"; repo = "kafka-python"; tag = finalAttrs.version; - hash = "sha256-FC5ntcRy2iF2sqYVxWg11EcGA5ncpuUuQHOkBG0paog="; + hash = "sha256-eQGQWLXCtj9A5Gb7inyKPdVD+1Pxh8yPFdNEBkkk58c="; }; build-system = [ setuptools ]; @@ -54,11 +52,11 @@ buildPythonPackage (finalAttrs: { "kafka.consumer" "kafka.coordinator" "kafka.metrics" + "kafka.net" "kafka.partitioner" "kafka.producer" "kafka.protocol" "kafka.record" - "kafka.sasl" "kafka.serializer" "kafka.vendor" ]; diff --git a/pkgs/development/python-modules/luigi/default.nix b/pkgs/development/python-modules/luigi/default.nix new file mode 100644 index 000000000000..eee8fc8b6f73 --- /dev/null +++ b/pkgs/development/python-modules/luigi/default.nix @@ -0,0 +1,58 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatch-fancy-pypi-readme, + hatchling, + python-daemon, + python-dateutil, + tenacity, + tornado, + typing-extensions, +}: + +buildPythonPackage (finalAttrs: { + pname = "luigi"; + version = "3.8.1"; + pyproject = true; + + src = fetchPypi { + pname = "luigi"; + inherit (finalAttrs) version; + hash = "sha256-L6XrXTR05JXeCb2WT1ApNsCPix624PPKPIppEWw40MM="; + }; + + build-system = [ + hatchling + hatch-fancy-pypi-readme + ]; + + pythonRelaxDeps = [ "tenacity" ]; + + dependencies = [ + python-dateutil + tornado + python-daemon + tenacity + typing-extensions + ]; + + pythonImportsCheck = [ "luigi" ]; + + # Requires tox, hadoop, and google cloud + doCheck = false; + + # This enables accessing modules stored in cwd + makeWrapperArgs = [ "--prefix PYTHONPATH . :" ]; + + meta = { + description = "Python package that helps you build complex pipelines of batch jobs"; + longDescription = '' + Luigi handles dependency resolution, workflow management, visualization, + handling failures, command line integration, and much more. + ''; + homepage = "https://github.com/spotify/luigi"; + changelog = "https://github.com/spotify/luigi/releases/tag/${finalAttrs.version}"; + license = [ lib.licenses.asl20 ]; + }; +}) diff --git a/pkgs/development/python-modules/pytest-kafka/default.nix b/pkgs/development/python-modules/pytest-kafka/default.nix deleted file mode 100644 index af77b53c8186..000000000000 --- a/pkgs/development/python-modules/pytest-kafka/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - buildPythonPackage, - fetchFromGitLab, - lib, - - # build system - setuptools, - - # dependencies - kafka-python, - port-for, - pytest, -}: - -buildPythonPackage rec { - pname = "pytest-kafka"; - version = "0.8.1"; - pyproject = true; - - src = fetchFromGitLab { - owner = "karolinepauls"; - repo = "pytest-kafka"; - tag = "v${version}"; - hash = "sha256-OR8SpNswbPOVtAcFuZgrZJR5K6wPb1TS5leybKWr3zY="; - }; - - build-system = [ setuptools ]; - - dependencies = [ - kafka-python - port-for - pytest - ]; - - pythonImportsCheck = [ "pytest_kafka" ]; - - # Tests depends on a kafka server running - doCheck = false; - - meta = { - description = "Pytest fixture factories for Zookeeper, Kafka server and Kafka consumer"; - homepage = "https://gitlab.com/karolinepauls/pytest-kafka"; - license = lib.licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/swh-export/default.nix b/pkgs/development/python-modules/swh-export/default.nix index 0b6890e4447f..398394752106 100644 --- a/pkgs/development/python-modules/swh-export/default.nix +++ b/pkgs/development/python-modules/swh-export/default.nix @@ -18,7 +18,6 @@ swh-storage, pytestCheckHook, pytest-click, - pytest-kafka, pytest-mock, tzdata, pkgs, @@ -67,7 +66,6 @@ buildPythonPackage (finalAttrs: { nativeCheckInputs = [ pytestCheckHook pytest-click - pytest-kafka pytest-mock pkgs.zstd pkgs.pv diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index bfb8f85412b0..39c48cbcf876 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -487,6 +487,7 @@ mapAliases { pysuez = throw "'pysuez' has been renamed to/replaced by 'pysuezv2'"; # Converted to throw 2025-10-29 pytado = throw "'pytado' has been renamed to/replaced by 'python-tado'"; # Converted to throw 2025-10-29 pytedee-async = aiotedee; # added 2025-07-06 + pytest-kafka = throw "'pytest-kafka' was removed because it is no longer used"; # added 2026-06-17 pytest-pep8 = throw "'pytest-pep8' has been renamed to/replaced by 'pytestpep8'"; # Converted to throw 2025-10-29 pytest-subtests = throw "'pytest-subtests' has been integrated into pytest 9."; # Added 2026-01-21 pytest_6 = throw "'pytest_6' has been renamed to/replaced by 'pytest'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 723d60529351..b46df1489f11 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9530,6 +9530,8 @@ self: super: with self; { luhn = callPackage ../development/python-modules/luhn { }; + luigi = callPackage ../development/python-modules/luigi { }; + luma-core = callPackage ../development/python-modules/luma-core { }; luna-soc = callPackage ../development/python-modules/luna-soc { }; @@ -15677,8 +15679,6 @@ self: super: with self; { pytest-jupyter = callPackage ../development/python-modules/pytest-jupyter { }; - pytest-kafka = callPackage ../development/python-modules/pytest-kafka { }; - pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { }; pytest-lazy-fixtures = callPackage ../development/python-modules/pytest-lazy-fixtures { };