From 1c3af67db3464ff2c7fc625bb0f280dc576be6ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Feb 2023 06:30:43 +0000 Subject: [PATCH 1/3] python310Packages.kbcstorage: 0.4.1 -> 0.5.0 --- pkgs/development/python-modules/kbcstorage/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/kbcstorage/default.nix b/pkgs/development/python-modules/kbcstorage/default.nix index 057f5f76a9f9..fa984230a96d 100644 --- a/pkgs/development/python-modules/kbcstorage/default.nix +++ b/pkgs/development/python-modules/kbcstorage/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sapi-python-client"; - version = "0.4.1"; + version = "0.5.0"; format = "setuptools"; src = fetchFromGitHub { owner = "keboola"; repo = pname; - rev = version; - sha256 = "189dzj06vzp7366h2qsfvbjmw9qgl7jbp8syhynn9yvrjqp4k8h3"; + rev = "refs/tags/${version}"; + sha256 = "sha256-79v9quhzeNRXcm6Z7BhD76lTZtw+Z0T1yK3zhrdreXw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From d25023bdc029e2cba8a5643df7e57602bf7b702d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Feb 2023 10:46:15 +0100 Subject: [PATCH 2/3] python310Packages.kbcstorage: add changelog to meta --- pkgs/development/python-modules/kbcstorage/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/kbcstorage/default.nix b/pkgs/development/python-modules/kbcstorage/default.nix index fa984230a96d..9fe883a6b50f 100644 --- a/pkgs/development/python-modules/kbcstorage/default.nix +++ b/pkgs/development/python-modules/kbcstorage/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "keboola"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-79v9quhzeNRXcm6Z7BhD76lTZtw+Z0T1yK3zhrdreXw="; + hash = "sha256-79v9quhzeNRXcm6Z7BhD76lTZtw+Z0T1yK3zhrdreXw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Keboola Connection Storage API client"; homepage = "https://github.com/keboola/sapi-python-client"; + changelog = "https://github.com/keboola/sapi-python-client/releases/tag/${version}"; maintainers = with maintainers; [ mrmebelman ]; license = licenses.mit; }; From ecb41a93702034db48deb1055dd09ec68e8aa852 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Feb 2023 10:54:20 +0100 Subject: [PATCH 3/3] python310Packages.kbcstorage: use nixpkgs-fmt - disable on unsupported Python releases --- .../python-modules/kbcstorage/default.nix | 80 ++++++++++--------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/pkgs/development/python-modules/kbcstorage/default.nix b/pkgs/development/python-modules/kbcstorage/default.nix index 9fe883a6b50f..199ab908efd7 100644 --- a/pkgs/development/python-modules/kbcstorage/default.nix +++ b/pkgs/development/python-modules/kbcstorage/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder # build , setuptools-scm @@ -14,52 +15,53 @@ , responses , unittestCheckHook }: - buildPythonPackage rec { - pname = "sapi-python-client"; - version = "0.5.0"; - format = "setuptools"; + pname = "sapi-python-client"; + version = "0.5.0"; + format = "setuptools"; - src = fetchFromGitHub { - owner = "keboola"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-79v9quhzeNRXcm6Z7BhD76lTZtw+Z0T1yK3zhrdreXw="; - }; + disabled = pythonOlder "3.7"; - SETUPTOOLS_SCM_PRETEND_VERSION = version; + src = fetchFromGitHub { + owner = "keboola"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-79v9quhzeNRXcm6Z7BhD76lTZtw+Z0T1yK3zhrdreXw="; + }; - nativeBuildInputs = [ - setuptools-scm - ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ - azure-storage-blob - boto3 - requests - ]; + nativeBuildInputs = [ + setuptools-scm + ]; - # requires API token and an active keboola bucket - # ValueError: Root URL is required. - doCheck = false; + propagatedBuildInputs = [ + azure-storage-blob + boto3 + requests + ]; - nativeCheckInputs = [ - unittestCheckHook - responses - ]; + # Requires API token and an active Keboola bucket + # ValueError: Root URL is required. + doCheck = false; - pythonImportsCheck = [ - "kbcstorage" - "kbcstorage.buckets" - "kbcstorage.client" - "kbcstorage.tables" - ]; + nativeCheckInputs = [ + unittestCheckHook + responses + ]; - meta = with lib; { - description = "Keboola Connection Storage API client"; - homepage = "https://github.com/keboola/sapi-python-client"; - changelog = "https://github.com/keboola/sapi-python-client/releases/tag/${version}"; - maintainers = with maintainers; [ mrmebelman ]; - license = licenses.mit; - }; + pythonImportsCheck = [ + "kbcstorage" + "kbcstorage.buckets" + "kbcstorage.client" + "kbcstorage.tables" + ]; + + meta = with lib; { + description = "Keboola Connection Storage API client"; + homepage = "https://github.com/keboola/sapi-python-client"; + changelog = "https://github.com/keboola/sapi-python-client/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ mrmebelman ]; + }; }