From 5cc869f235b8784775b4484fd835036eb35da9da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Apr 2024 11:06:46 +0200 Subject: [PATCH 1/3] python312Packages.aliyun-python-sdk-core: 2.15.0 -> 2.15.1 Changelog: https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-core/ChangeLog.txt --- .../python-modules/aliyun-python-sdk-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix index 1ead4ce1427c..bf68a7a77e71 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-core"; - version = "2.15.0"; + version = "2.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7cRVVIjYqfHGG9QZx74nsjl0sqBSlxtGFPzSKerus4I="; + hash = "sha256-UYVQ0H9TfNOvrDtsk7XJl840QOTQwFTjrL2qgmHpCt8="; }; nativeBuildInputs = [ From bb69c640bc445e0c6fdedaa826258fe5bbd4fcd4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Apr 2024 11:08:36 +0200 Subject: [PATCH 2/3] python312Packages.aliyun-python-sdk-core: refactor --- .../aliyun-python-sdk-core/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix index bf68a7a77e71..463782060885 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix @@ -5,12 +5,13 @@ , jmespath , pythonOlder , pythonRelaxDepsHook +, setuptools }: buildPythonPackage rec { pname = "aliyun-python-sdk-core"; version = "2.15.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,11 +20,17 @@ buildPythonPackage rec { hash = "sha256-UYVQ0H9TfNOvrDtsk7XJl840QOTQwFTjrL2qgmHpCt8="; }; + pythonRelaxDeps = true; + + build-system = [ + setuptools + ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ cryptography jmespath ]; @@ -31,8 +38,6 @@ buildPythonPackage rec { # All components are stored in a mono repo doCheck = false; - pythonRelaxDeps = true; - pythonImportsCheck = [ "aliyunsdkcore" ]; From 051a88a36aef9464eee8512c7dae4535c45aa6d8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Apr 2024 11:08:59 +0200 Subject: [PATCH 3/3] python312Packages.aliyun-python-sdk-core: format with nxfmt --- .../aliyun-python-sdk-core/default.nix | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix index 463782060885..57323e4b189d 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix @@ -1,11 +1,12 @@ -{ lib -, buildPythonPackage -, cryptography -, fetchPypi -, jmespath -, pythonOlder -, pythonRelaxDepsHook -, setuptools +{ + lib, + buildPythonPackage, + cryptography, + fetchPypi, + jmespath, + pythonOlder, + pythonRelaxDepsHook, + setuptools, }: buildPythonPackage rec { @@ -22,13 +23,9 @@ buildPythonPackage rec { pythonRelaxDeps = true; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ cryptography @@ -38,9 +35,7 @@ buildPythonPackage rec { # All components are stored in a mono repo doCheck = false; - pythonImportsCheck = [ - "aliyunsdkcore" - ]; + pythonImportsCheck = [ "aliyunsdkcore" ]; meta = with lib; { description = "Core module of Aliyun Python SDK";