From 5ab66e0a24a38c327a2a5a6eb0a238644f2c3317 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Apr 2024 17:49:20 +0000 Subject: [PATCH 1/4] python312Packages.b2sdk: 1.33.0 -> 2.0.0 --- pkgs/development/python-modules/b2sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index d78a2b57a934..acf03d7fb1a8 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "1.33.0"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Backblaze"; repo = "b2-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-eMFgsjEb0DMTLqG+8IZru1dEAuKZW4dEszrznZxR+mc="; + hash = "sha256-0/UC4O19oO8SpboiPIhvkWBA8XHpc279fl377MooK54="; }; nativeBuildInputs = [ From 52a69d191fa5e2d5ea8ec4fa97874ecf0a321995 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 Apr 2024 18:03:23 +0200 Subject: [PATCH 2/4] backblaze-b2: 3.17.0 -> 3.18.0 Diff: https://github.com/Backblaze/B2_Command_Line_Tool/compare/refs/tags/v3.17.0...v3.18.0 Changelog: https://github.com/Backblaze/B2_Command_Line_Tool/blob/v3.18.0/CHANGELOG.md --- .../tools/backblaze-b2/default.nix | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 1fd6333a3d50..fadd6a2d4f76 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -10,23 +10,25 @@ python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "3.17.0"; - format = "pyproject"; + version = "3.18.0"; + pyproject = true; src = fetchFromGitHub { owner = "Backblaze"; repo = "B2_Command_Line_Tool"; - rev = "v${version}"; - hash = "sha256-Xj7RNe6XM2atijhVasILWRdTzu6xuKBzMllM1z1mFLY="; + rev = "refs/tags/v${version}"; + hash = "sha256-1UXByc3jjp8GN7+aI2GBohJ0DFxgp604QOsXp5GaL4Q="; }; nativeBuildInputs = [ installShellFiles - ] ++ (with python3Packages; [ - pdm-backend - ]); + ]; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ + pdm-backend + ]; + + dependencies = with python3Packages; [ argcomplete arrow b2sdk @@ -53,10 +55,9 @@ python3Packages.buildPythonApplication rec { ''; disabledTestPaths = [ - # requires network + # Test requires network "test/integration/test_b2_command_line.py" "test/integration/test_tqdm_closer.py" - # it's hard to make it work on nix "test/integration/test_autocomplete.py" "test/unit/test_console_tool.py" @@ -64,6 +65,13 @@ python3Packages.buildPythonApplication rec { "test/unit/_cli/test_autocomplete_cache.py" ]; + disabledTests = [ + # Autocomplete is not successful in a sandbox + "test_autocomplete_installer" + "test_help" + "test_install_autocomplete" + ]; + postInstall = lib.optionalString (execName != "b2") '' mv "$out/bin/b2" "$out/bin/${execName}" '' @@ -86,10 +94,10 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Command-line tool for accessing the Backblaze B2 storage service"; - mainProgram = "backblaze-b2"; 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 tomhoule ]; + mainProgram = "backblaze-b2"; }; } From 2c95edc35bd0c5e1848c119cdf2526c0ff482ab5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 Apr 2024 18:10:03 +0200 Subject: [PATCH 3/4] python312Packages.b2sdk: refactor --- .../python-modules/b2sdk/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index acf03d7fb1a8..d67e60ef517e 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -4,15 +4,15 @@ , fetchFromGitHub , glibcLocales , importlib-metadata -, packaging , logfury +, packaging +, pdm-backend , pyfakefs -, pytestCheckHook , pytest-lazy-fixture , pytest-mock +, pytestCheckHook , pythonOlder , pythonRelaxDepsHook -, pdm-backend , requests , tqdm , typing-extensions @@ -32,8 +32,11 @@ buildPythonPackage rec { hash = "sha256-0/UC4O19oO8SpboiPIhvkWBA8XHpc279fl377MooK54="; }; - nativeBuildInputs = [ + build-system = [ pdm-backend + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; @@ -41,11 +44,10 @@ buildPythonPackage rec { "setuptools" ]; - propagatedBuildInputs = [ + dependencies = [ packaging logfury requests - tqdm ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ] ++ lib.optionals (pythonOlder "3.12") [ @@ -53,10 +55,11 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook + pyfakefs pytest-lazy-fixture pytest-mock - pyfakefs + pytestCheckHook + tqdm ] ++ lib.optionals stdenv.isLinux [ glibcLocales ]; From 152d684fbf6ccc844675436b5624a98c8111a312 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 6 Apr 2024 18:10:40 +0200 Subject: [PATCH 4/4] python312Packages.b2sdk: format with nixfmt --- .../python-modules/b2sdk/default.nix | 74 ++++++++----------- 1 file changed, 32 insertions(+), 42 deletions(-) diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index d67e60ef517e..9c00f0c49cc9 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -1,21 +1,22 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchFromGitHub -, glibcLocales -, importlib-metadata -, logfury -, packaging -, pdm-backend -, pyfakefs -, pytest-lazy-fixture -, pytest-mock -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, requests -, tqdm -, typing-extensions +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + glibcLocales, + importlib-metadata, + logfury, + packaging, + pdm-backend, + pyfakefs, + pytest-lazy-fixture, + pytest-mock, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + requests, + tqdm, + typing-extensions, }: buildPythonPackage rec { @@ -32,27 +33,20 @@ buildPythonPackage rec { hash = "sha256-0/UC4O19oO8SpboiPIhvkWBA8XHpc279fl377MooK54="; }; - build-system = [ - pdm-backend - ]; + build-system = [ pdm-backend ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; - pythonRemoveDeps = [ - "setuptools" - ]; + pythonRemoveDeps = [ "setuptools" ]; - dependencies = [ - packaging - logfury - requests - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ] ++ lib.optionals (pythonOlder "3.12") [ - typing-extensions - ]; + dependencies = + [ + packaging + logfury + requests + ] + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ] + ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ]; nativeCheckInputs = [ pyfakefs @@ -60,9 +54,7 @@ buildPythonPackage rec { pytest-mock pytestCheckHook tqdm - ] ++ lib.optionals stdenv.isLinux [ - glibcLocales - ]; + ] ++ lib.optionals stdenv.isLinux [ glibcLocales ]; disabledTestPaths = [ # requires aws s3 auth @@ -78,9 +70,7 @@ buildPythonPackage rec { "test_file_info_b2_attributes" ]; - pythonImportsCheck = [ - "b2sdk" - ]; + pythonImportsCheck = [ "b2sdk" ]; meta = with lib; { description = "Client library and utilities for access to B2 Cloud Storage (backblaze)";