From b8b706b0708e7c61b7dd715f0fab9bd7b9e627c7 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 29 Mar 2023 23:27:37 +0800 Subject: [PATCH] python3Packages.uamqp: use github source, unpin openssl_1_1, enable tests --- .../python-modules/uamqp/default.nix | 37 +++++++++++-------- pkgs/top-level/python-packages.nix | 1 - 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index e60d55094786..24d2b7b34630 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -1,27 +1,28 @@ { lib , stdenv , buildPythonPackage +, fetchFromGitHub +, cython , certifi , CFNetwork , cmake , CoreFoundation -, enum34 -, fetchpatch -, fetchPypi -, isPy3k , libcxxabi , openssl , Security -, six +, pytestCheckHook +, pytest-asyncio }: buildPythonPackage rec { pname = "uamqp"; version = "1.6.4"; - src = fetchPypi { - inherit pname version; - hash = "sha256-IYMzJDXveIL60ick4/L2PT/VpRx/DGNdY0h5SLAuN0k="; + src = fetchFromGitHub { + owner = "Azure"; + repo = "azure-uamqp-python"; + rev = "refs/tags/v.${version}"; + hash = "sha256-OjZTroaBuUB/dakl5gAYigJkim9EFiCwUEBo7z35vhQ="; }; patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ @@ -43,9 +44,12 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake + cython ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation CFNetwork Security @@ -53,10 +57,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ certifi - openssl - six - ] ++ lib.optionals (!isPy3k) [ - enum34 ]; LDFLAGS = lib.optionals stdenv.isDarwin [ @@ -65,8 +65,15 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - # Project has no tests - doCheck = false; + preCheck = '' + # remove src module, so tests use the installed module instead + rm -r uamqp + ''; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "uamqp" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8a784017465c..ad3822ea8aca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12204,7 +12204,6 @@ self: super: with self; { rustworkx = callPackage ../development/python-modules/rustworkx { }; uamqp = callPackage ../development/python-modules/uamqp { - openssl = pkgs.openssl_1_1; inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork CoreFoundation Security; };