From 8730ee441abaed5e505002951094f8289ddd341f Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 4 Sep 2023 00:27:14 +0900 Subject: [PATCH 1/4] python310Packages.b2sdk: add changelog to meta --- pkgs/development/python-modules/b2sdk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index 4dac7ecf5b83..66981147a7be 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -73,6 +73,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client library and utilities for access to B2 Cloud Storage (backblaze)"; homepage = "https://github.com/Backblaze/b2-sdk-python"; + changelog = "https://github.com/Backblaze/b2-sdk-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; }; From 674e95592a60f09c2f05fd2471538d5889ce386c Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 4 Sep 2023 00:27:47 +0900 Subject: [PATCH 2/4] python310Packages.b2sdk: 1.19.0 -> 1.24.0 Changelog: https://github.com/Backblaze/b2-sdk-python/blob/v1.24.0/CHANGELOG.md --- pkgs/development/python-modules/b2sdk/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index 66981147a7be..c577a7888a94 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -1,7 +1,8 @@ { lib -, arrow +, stdenv , buildPythonPackage , fetchPypi +, glibcLocales , importlib-metadata , logfury , pyfakefs @@ -12,18 +13,19 @@ , requests , setuptools-scm , tqdm +, typing-extensions }: buildPythonPackage rec { pname = "b2sdk"; - version = "1.19.0"; + version = "1.24.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aJpSt+dXjw4S33dBiMkaR6wxzwLru+jseuPKFj2R36Y="; + hash = "sha256-6zSjCt+J6530f1GMc/omP1zXKQKU1SDLLvslMWoqMcU="; }; nativeBuildInputs = [ @@ -31,12 +33,13 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - arrow logfury requests tqdm ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata + ] ++ lib.optionals (pythonOlder "3.12") [ + typing-extensions ]; nativeCheckInputs = [ @@ -44,13 +47,13 @@ buildPythonPackage rec { pytest-lazy-fixture pytest-mock pyfakefs + ] ++ lib.optionals stdenv.isLinux [ + glibcLocales ]; postPatch = '' substituteInPlace setup.py \ --replace 'setuptools_scm<6.0' 'setuptools_scm' - substituteInPlace requirements.txt \ - --replace 'arrow>=0.8.0,<1.0.0' 'arrow' ''; disabledTestPaths = [ From 53ffac981fe3a12b69d93476374fee098e444a03 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 5 Sep 2023 00:02:27 +0900 Subject: [PATCH 3/4] backblaze-b2: add changelog to meta --- pkgs/development/tools/backblaze-b2/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 353fda20ce19..0857ca2563b0 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -65,6 +65,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Command-line tool for accessing the Backblaze B2 storage service"; homepage = "https://github.com/Backblaze/B2_Command_Line_Tool"; + changelog = "https://github.com/Backblaze/B2_Command_Line_Tool/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ hrdinka kevincox tomhoule ]; }; From e6be272cf86f0e96fc92db0600ed8c02acbcbbe0 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 5 Sep 2023 00:02:53 +0900 Subject: [PATCH 4/4] backblaze-b2: 3.7.0 -> 3.9.0 Changelog: https://github.com/Backblaze/B2_Command_Line_Tool/blob/v3.9.0/CHANGELOG.md --- .../tools/backblaze-b2/default.nix | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 0857ca2563b0..3bab2e7bba2f 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -1,13 +1,14 @@ -{ lib, python3Packages, fetchPypi }: +{ lib, python3Packages, fetchPypi, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "3.7.0"; + version = "3.9.0"; + format = "setuptools"; src = fetchPypi { inherit version; pname = "b2"; - sha256 = "sha256-sW6gaZWUh3WX+0+qHRlQ4gZzKU4bL8ePPNKWo9rdF84="; + hash = "sha256-Z9LQapWl0zblcAyMOfKhn5/O1H6+tmgiPQfAB241jqU="; }; postPatch = '' @@ -19,22 +20,27 @@ python3Packages.buildPythonApplication rec { --replace 'setuptools_scm<6.0' 'setuptools_scm' ''; - nativeBuildInputs = with python3Packages; [ - setuptools-scm + nativeBuildInputs = [ + installShellFiles + python3Packages.setuptools-scm ]; propagatedBuildInputs = with python3Packages; [ + argcomplete + arrow b2sdk phx-class-registry setuptools docutils rst2ansi tabulate + tqdm ]; nativeCheckInputs = with python3Packages; [ backoff more-itertools + pexpect pytestCheckHook ]; @@ -46,20 +52,25 @@ python3Packages.buildPythonApplication rec { # require network "test_files_headers" "test_integration" + + # fixed by https://github.com/Backblaze/B2_Command_Line_Tool/pull/915 + "TestRmConsoleTool" ]; disabledTestPaths = [ # requires network "test/integration/test_b2_command_line.py" + + # it's hard to make it work on nix + "test/integration/test_autocomplete.py" ]; postInstall = '' mv "$out/bin/b2" "$out/bin/backblaze-b2" - sed 's/b2/backblaze-b2/' -i contrib/bash_completion/b2 - - mkdir -p "$out/share/bash-completion/completions" - cp contrib/bash_completion/b2 "$out/share/bash-completion/completions/backblaze-b2" + installShellCompletion --cmd backblaze-b2 \ + --bash <(${python3Packages.argcomplete}/bin/register-python-argcomplete backblaze-b2) \ + --zsh <(${python3Packages.argcomplete}/bin/register-python-argcomplete backblaze-b2) ''; meta = with lib; {