diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index 7dfce0d75c5..f807c035399 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "1.1.4"; + version = "1.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0g527qdda105r5g9yjh4lxzlmz34m2bdz8dydqqy09igdsmiyi9j"; + sha256 = "8e46ff9d47a9b90d8b9beab1969fcf4920300b02e20e6bf0745be04e09e8a6ff"; }; pythonImportsCheck = [ "b2sdk" ]; diff --git a/pkgs/development/python-modules/phx-class-registry/default.nix b/pkgs/development/python-modules/phx-class-registry/default.nix new file mode 100644 index 00000000000..db0359a1d4f --- /dev/null +++ b/pkgs/development/python-modules/phx-class-registry/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook }: + +buildPythonPackage rec { + pname = "phx-class-registry"; + version = "3.0.5"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "14iap8db2ldmnlf5kvxs52aps31rl98kpa5nq8wdm30a86n6457i"; + }; + + checkInputs = [ pytestCheckHook ]; + + disabledTests = [ + "test_branding" + "test_happy_path" + "test_len" + ]; + + meta = with stdenv.lib; { + description = "Registry pattern for Python classes, with setuptools entry points integration"; + homepage = "https://github.com/todofixthis/class-registry"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 32161a43798..446d54f90ca 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -1,34 +1,29 @@ -{ - fetchFromGitHub, - lib, - python3Packages, -}: +{ fetchFromGitHub, lib, python3Packages }: python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "Backblaze"; repo = "B2_Command_Line_Tool"; rev = "v${version}"; - sha256 = "00zs0a580vvfm2w4ja68mc46360p475wlgagjkq1hi4m8s4qwd75"; + sha256 = "1kkpvxqgh5pw4kr8lh5gy9d7960hv9zvajbjiqhj6xgykwbpbgmq"; }; propagatedBuildInputs = with python3Packages; [ b2sdk class-registry + phx-class-registry setuptools ]; - checkInputs = with python3Packages; [ - nose - ]; + checkInputs = with python3Packages; [ pytestCheckHook ]; - # doCheck = false; - checkPhase = '' - nosetests - ''; + disabledTests = [ + "test_files_headers" + "test_integration" + ]; postInstall = '' mv "$out/bin/b2" "$out/bin/backblaze-b2" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index be068a6c507..30c845e2efb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4548,6 +4548,8 @@ in { phpserialize = callPackage ../development/python-modules/phpserialize { }; + phx-class-registry = callPackage ../development/python-modules/phx-class-registry { }; + piccata = callPackage ../development/python-modules/piccata { }; pickleshare = callPackage ../development/python-modules/pickleshare { };