From 778bd17b0ce346282fad24b44a980dc111ac3a25 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 15:01:15 +0200 Subject: [PATCH 1/3] python311Packages.webexteamssdk: refactor --- .../python-modules/webexteamssdk/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix index 1e81e90af9a6..5c2f63323c8d 100644 --- a/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/pkgs/development/python-modules/webexteamssdk/default.nix @@ -6,23 +6,28 @@ , pythonOlder , requests , requests-toolbelt +, setuptools }: buildPythonPackage rec { pname = "webexteamssdk"; version = "1.6.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CiscoDevNet"; - repo = pname; - rev = "v${version}"; + repo = "webexteamssdk"; + rev = "refs/tags/v${version}"; hash = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ future pyjwt requests @@ -39,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for Webex Teams APIs"; homepage = "https://github.com/CiscoDevNet/webexteamssdk"; + changelog = "https://github.com/WebexCommunity/WebexPythonSDK/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 5c2bf25ecc5c043f8024347609e51de60cff7cfd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 15:02:38 +0200 Subject: [PATCH 2/3] python312Packages.webexteamssdk: remove vendorized versioneer --- pkgs/development/python-modules/webexteamssdk/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix index 5c2f63323c8d..2322303e2e6e 100644 --- a/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/pkgs/development/python-modules/webexteamssdk/default.nix @@ -7,6 +7,7 @@ , requests , requests-toolbelt , setuptools +, versioneer }: buildPythonPackage rec { @@ -23,8 +24,14 @@ buildPythonPackage rec { hash = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo="; }; + postPatch = '' + # Remove vendorized versioneer + rm versioneer.py + ''; + build-system = [ setuptools + versioneer ]; dependencies = [ From 3d380959903bb99b1f769c5f46bc34074a162c10 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 15:03:00 +0200 Subject: [PATCH 3/3] python312Packages.webexteamssdk: format with nixfmt --- .../python-modules/webexteamssdk/default.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix index 2322303e2e6e..30eeb64d83a1 100644 --- a/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/pkgs/development/python-modules/webexteamssdk/default.nix @@ -1,13 +1,14 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, future -, pyjwt -, pythonOlder -, requests -, requests-toolbelt -, setuptools -, versioneer +{ + lib, + buildPythonPackage, + fetchFromGitHub, + future, + pyjwt, + pythonOlder, + requests, + requests-toolbelt, + setuptools, + versioneer, }: buildPythonPackage rec { @@ -44,9 +45,7 @@ buildPythonPackage rec { # Tests require a Webex Teams test domain doCheck = false; - pythonImportsCheck = [ - "webexteamssdk" - ]; + pythonImportsCheck = [ "webexteamssdk" ]; meta = with lib; { description = "Python module for Webex Teams APIs";