From 8127657f4a475b25486a8cbf6db9ecbc59f5f3ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 09:01:59 +0200 Subject: [PATCH 1/2] python312Packages.snakemake-interface-common: refactor - enable tests --- .../snakemake-interface-common/default.nix | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/snakemake-interface-common/default.nix b/pkgs/development/python-modules/snakemake-interface-common/default.nix index 15f5d663579f..7856e541f8df 100644 --- a/pkgs/development/python-modules/snakemake-interface-common/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-common/default.nix @@ -1,37 +1,52 @@ { lib +, argparse-dataclass , buildPythonPackage +, configargparse , fetchFromGitHub , poetry-core -, argparse-dataclass -, configargparse +, pythonOlder +, pytestCheckHook }: buildPythonPackage rec { pname = "snakemake-interface-common"; version = "1.17.2"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "snakemake"; - repo = pname; + repo = "snakemake-interface-common"; rev = "refs/tags/v${version}"; hash = "sha256-N8mSS+gABAgXm01BcsMk89a3HsIsc3RHxCAi3GlxtRg="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ argparse-dataclass configargparse ]; - pythonImportsCheck = [ "snakemake_interface_common" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "snakemake_interface_common" + ]; + + pytestFlagsArray = [ + "tests/tests.py" + ]; meta = with lib; { description = "Common functions and classes for Snakemake and its plugins"; homepage = "https://github.com/snakemake/snakemake-interface-common"; + changelog = "https://github.com/snakemake/snakemake-interface-common/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ veprbl ]; }; From 3c96eb56e19600b19eabe074b7afe36d4ab79e11 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Apr 2024 09:02:43 +0200 Subject: [PATCH 2/2] python312Packages.snakemake-interface-common: format with nixfmt --- .../snakemake-interface-common/default.nix | 33 ++++++++----------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/snakemake-interface-common/default.nix b/pkgs/development/python-modules/snakemake-interface-common/default.nix index 7856e541f8df..2bc7a0672dba 100644 --- a/pkgs/development/python-modules/snakemake-interface-common/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-common/default.nix @@ -1,11 +1,12 @@ -{ lib -, argparse-dataclass -, buildPythonPackage -, configargparse -, fetchFromGitHub -, poetry-core -, pythonOlder -, pytestCheckHook +{ + lib, + argparse-dataclass, + buildPythonPackage, + configargparse, + fetchFromGitHub, + poetry-core, + pythonOlder, + pytestCheckHook, }: buildPythonPackage rec { @@ -22,26 +23,18 @@ buildPythonPackage rec { hash = "sha256-N8mSS+gABAgXm01BcsMk89a3HsIsc3RHxCAi3GlxtRg="; }; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; dependencies = [ argparse-dataclass configargparse ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "snakemake_interface_common" - ]; + pythonImportsCheck = [ "snakemake_interface_common" ]; - pytestFlagsArray = [ - "tests/tests.py" - ]; + pytestFlagsArray = [ "tests/tests.py" ]; meta = with lib; { description = "Common functions and classes for Snakemake and its plugins";