From e971750c2466440366730f1330ae321278f27d85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 13:57:00 +0200 Subject: [PATCH 1/6] python312Packages.crownstone-sse: 2.0.4 -> 2.0.5 --- .../python-modules/crownstone-sse/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/crownstone-sse/default.nix b/pkgs/development/python-modules/crownstone-sse/default.nix index ca2cd4e0d154..f801547d48b8 100644 --- a/pkgs/development/python-modules/crownstone-sse/default.nix +++ b/pkgs/development/python-modules/crownstone-sse/default.nix @@ -2,25 +2,24 @@ , aiohttp , buildPythonPackage , certifi -, fetchFromGitHub +, fetchPypi , pythonOlder }: buildPythonPackage rec { pname = "crownstone-sse"; - version = "2.0.4"; + version = "2.0.5"; format = "setuptools"; disabled = pythonOlder "3.8"; - src = fetchFromGitHub { - owner = "crownstone"; - repo = "crownstone-lib-python-sse"; - rev = version; - hash = "sha256-z/z8MmydHkHubwuX02gGbOcOEZ+FHX4i82vAK5gAl+c="; + src = fetchPypi { + pname = "crownstone_sse"; + inherit version; + hash = "sha256-RUqo68UAVGV+JmauKsGlp7dG8FzixHBDnr3eho/IQdY="; }; - propagatedBuildInputs = [ + dependencies = [ aiohttp certifi ]; @@ -34,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for listening to Crownstone SSE events"; - homepage = "https://github.com/crownstone/crownstone-lib-python-sse"; + homepage = "https://github.com/Crownstone-Community/crownstone-lib-python-sse"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From ee6abbad3bab49f7adcc00fe57ae07156d3cfe3f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 13:59:16 +0200 Subject: [PATCH 2/6] python312Packages.crownstone-sse: refactor --- pkgs/development/python-modules/crownstone-sse/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/crownstone-sse/default.nix b/pkgs/development/python-modules/crownstone-sse/default.nix index f801547d48b8..3a7947458986 100644 --- a/pkgs/development/python-modules/crownstone-sse/default.nix +++ b/pkgs/development/python-modules/crownstone-sse/default.nix @@ -4,12 +4,13 @@ , certifi , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "crownstone-sse"; version = "2.0.5"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-RUqo68UAVGV+JmauKsGlp7dG8FzixHBDnr3eho/IQdY="; }; + build-system = [ + setuptools + ]; + dependencies = [ aiohttp certifi From f0f3609dd58796ec100b8d2f0228ddb98a5c7c29 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 13:59:33 +0200 Subject: [PATCH 3/6] python312Packages.crownstone-sse: format with nixfmt --- .../python-modules/crownstone-sse/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/crownstone-sse/default.nix b/pkgs/development/python-modules/crownstone-sse/default.nix index 3a7947458986..82f106d8f9ec 100644 --- a/pkgs/development/python-modules/crownstone-sse/default.nix +++ b/pkgs/development/python-modules/crownstone-sse/default.nix @@ -1,10 +1,11 @@ -{ lib -, aiohttp -, buildPythonPackage -, certifi -, fetchPypi -, pythonOlder -, setuptools +{ + lib, + aiohttp, + buildPythonPackage, + certifi, + fetchPypi, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -20,9 +21,7 @@ buildPythonPackage rec { hash = "sha256-RUqo68UAVGV+JmauKsGlp7dG8FzixHBDnr3eho/IQdY="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ aiohttp @@ -32,9 +31,7 @@ buildPythonPackage rec { # Tests are only providing coverage doCheck = false; - pythonImportsCheck = [ - "crownstone_sse" - ]; + pythonImportsCheck = [ "crownstone_sse" ]; meta = with lib; { description = "Python module for listening to Crownstone SSE events"; From a854d724c4618b27872171e62db17353769f1ee7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 14:03:27 +0200 Subject: [PATCH 4/6] python312Packages.crownstone-cloud: 1.4.9 -> 1.4.11 --- .../crownstone-cloud/default.nix | 25 ++++++------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/crownstone-cloud/default.nix b/pkgs/development/python-modules/crownstone-cloud/default.nix index d8ee18a090d4..9ceabd797ec7 100644 --- a/pkgs/development/python-modules/crownstone-cloud/default.nix +++ b/pkgs/development/python-modules/crownstone-cloud/default.nix @@ -1,8 +1,7 @@ { lib , aiohttp , buildPythonPackage -, fetchFromGitHub -, fetchpatch +, fetchPypi , certifi , pythonOlder , pytestCheckHook @@ -10,27 +9,17 @@ buildPythonPackage rec { pname = "crownstone-cloud"; - version = "1.4.9"; + version = "1.4.11"; format = "setuptools"; disabled = pythonOlder "3.8"; - src = fetchFromGitHub { - owner = "crownstone"; - repo = "crownstone-lib-python-cloud"; - rev = "refs/tags/${version}"; - hash = "sha256-CS1zeQiWPnsGCWixCsN9sz08mPORW5sVqIpSFPh0Qt0="; + src = fetchPypi { + pname = "crownstone_cloud"; + inherit version; + hash = "sha256-s84pK52uMupxQfdMldV14V3nj+yVku1Vw13CRX4o08U="; }; - patches = [ - # Remove asynctest, https://github.com/crownstone/crownstone-lib-python-cloud/pull/4 - (fetchpatch { - name = "remove-asynctest.patch"; - url = "https://github.com/crownstone/crownstone-lib-python-cloud/commit/7f22c9b284bf8d7f6f43e205816787dd3bb37e78.patch"; - hash = "sha256-LS1O9LVB14WyBXfuHf/bs1juJ59zWhJ8pL4aGtVrTG8="; - }) - ]; - propagatedBuildInputs = [ aiohttp certifi @@ -50,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for communicating with Crownstone Cloud and devices"; - homepage = "https://github.com/crownstone/crownstone-lib-python-cloud"; + homepage = "https://github.com/Crownstone-Community/crownstone-lib-python-cloud"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From baeeded2c6de36a9d47615455d583ffb3eeda1ef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 14:06:55 +0200 Subject: [PATCH 5/6] python312Packages.crownstone-cloud: refactor --- .../python-modules/crownstone-cloud/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/crownstone-cloud/default.nix b/pkgs/development/python-modules/crownstone-cloud/default.nix index 9ceabd797ec7..851cbdb39613 100644 --- a/pkgs/development/python-modules/crownstone-cloud/default.nix +++ b/pkgs/development/python-modules/crownstone-cloud/default.nix @@ -5,12 +5,13 @@ , certifi , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "crownstone-cloud"; version = "1.4.11"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +21,11 @@ buildPythonPackage rec { hash = "sha256-s84pK52uMupxQfdMldV14V3nj+yVku1Vw13CRX4o08U="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aiohttp certifi ]; @@ -29,10 +34,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - sed -i '/codecov/d' requirements.txt - ''; - pythonImportsCheck = [ "crownstone_cloud" ]; @@ -40,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for communicating with Crownstone Cloud and devices"; homepage = "https://github.com/Crownstone-Community/crownstone-lib-python-cloud"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From a1f4cd3113870138d1a9632580b1ffbb90255e00 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 21 May 2024 14:07:35 +0200 Subject: [PATCH 6/6] python312Packages.crownstone-cloud: format with nixfmt --- .../crownstone-cloud/default.nix | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/crownstone-cloud/default.nix b/pkgs/development/python-modules/crownstone-cloud/default.nix index 851cbdb39613..089d60fceb6f 100644 --- a/pkgs/development/python-modules/crownstone-cloud/default.nix +++ b/pkgs/development/python-modules/crownstone-cloud/default.nix @@ -1,11 +1,12 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchPypi -, certifi -, pythonOlder -, pytestCheckHook -, setuptools +{ + lib, + aiohttp, + buildPythonPackage, + fetchPypi, + certifi, + pythonOlder, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { @@ -21,22 +22,16 @@ buildPythonPackage rec { hash = "sha256-s84pK52uMupxQfdMldV14V3nj+yVku1Vw13CRX4o08U="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ aiohttp certifi ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "crownstone_cloud" - ]; + pythonImportsCheck = [ "crownstone_cloud" ]; meta = with lib; { description = "Python module for communicating with Crownstone Cloud and devices";