From 4a53238964cf56abc30585a6f4d5edf37a146d43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Oct 2022 05:37:34 +0000 Subject: [PATCH 1/2] python310Packages.psygnal: 0.3.5 -> 0.5.0 --- pkgs/development/python-modules/psygnal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index 00b3b9406617..21fe3aed846d 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { pname = "psygnal"; - version = "0.3.5"; + version = "0.5.0"; src = fetchFromGitHub { owner = "tlambert03"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-8X6d0KZ61Uy5B68zuxtaimwnDSldWsVrL19iROS4X78="; + sha256 = "sha256-Hh1HG4VVcNXo62M/4mU3ZcSQNHmalcIDprkwD6/WRf8="; }; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ typing-extensions ]; From c47002498ddafe450ac423109737161c1ef8469f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Oct 2022 09:47:39 +0200 Subject: [PATCH 2/2] python310Packages.psygnal: enable tests - add pythonImportsCheck - clean-up inputs - disable on older Python releases --- .../python-modules/psygnal/default.nix | 61 ++++++++++++++----- 1 file changed, 46 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index 21fe3aed846d..a62e90a80e71 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -1,33 +1,64 @@ { lib , buildPythonPackage , fetchFromGitHub -, wheel -, setuptools -, setuptools-scm -, pytestCheckHook +, importlib-metadata +, numpy +, pydantic , pytest-mypy-plugins -, pytest-cov -, pytest -, mypy +, pytestCheckHook +, pythonOlder +, setuptools-scm , typing-extensions -}: buildPythonPackage rec -{ +, wheel +, wrapt +}: + +buildPythonPackage rec { pname = "psygnal"; version = "0.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "tlambert03"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-Hh1HG4VVcNXo62M/4mU3ZcSQNHmalcIDprkwD6/WRf8="; + hash = "sha256-Hh1HG4VVcNXo62M/4mU3ZcSQNHmalcIDprkwD6/WRf8="; }; - buildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ typing-extensions ]; - checkInputs = [ pytestCheckHook pytest-cov pytest-mypy-plugins ]; - doCheck = false; # mypy checks are failing + SETUPTOOLS_SCM_PRETEND_VERSION = version; + buildInputs = [ + setuptools-scm + wheel + ]; + + propagatedBuildInputs = [ + typing-extensions + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + checkInputs = [ + numpy + pydantic + pytest-mypy-plugins + pytestCheckHook + wrapt + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=psygnal --cov-report=term-missing" "" + ''; + + pythonImportsCheck = [ + "psygnal" + ]; + meta = with lib; { - description = "Pure python implementation of Qt Signals"; + description = "Implementation of Qt Signals"; homepage = "https://github.com/tlambert03/psygnal"; license = licenses.bsd3; maintainers = with maintainers; [ SomeoneSerge ];