From 2749a6819bf7dcbe548782b53c1a243d18ab682e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Oct 2024 11:08:23 +0200 Subject: [PATCH] python312Packages.nox: refactor --- .../python-modules/nox/default.nix | 39 ++++++++++++------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix index b56c256ea526..2751d971c175 100644 --- a/pkgs/development/python-modules/nox/default.nix +++ b/pkgs/development/python-modules/nox/default.nix @@ -5,55 +5,64 @@ colorlog, fetchFromGitHub, hatchling, - importlib-metadata, jinja2, packaging, pytestCheckHook, pythonOlder, + tomli, tox, - typing-extensions, + uv, virtualenv, }: buildPythonPackage rec { pname = "nox"; version = "2024.10.09"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "wntrblm"; - repo = pname; + repo = "nox"; rev = "refs/tags/${version}"; hash = "sha256-GdNz34A8IKwPG/270sY5t3SoggGCZMWfDq/Wyhk0ez8="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = + dependencies = [ argcomplete colorlog packaging virtualenv ] - ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions - importlib-metadata + ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; - nativeCheckInputs = [ - jinja2 - tox - pytestCheckHook - ]; + optional-dependencies = { + tox_to_nox = [ + jinja2 + tox + ]; + uv = [ uv ]; + }; + + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); + + preCheck = '' + export HOME=$(mktemp -d) + ''; pythonImportsCheck = [ "nox" ]; disabledTests = [ # our conda is not available on 3.11 "test__create_venv_options" + # Assertion errors + "test_uv" ]; disabledTestPaths = [