diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index f4740c7d9d23..3e05dd0c025e 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "591"; + version = "595"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-JhCnSNmCOEJdM5aEPpYWLpKy/EQ9BoN1A/aUAaILWtQ="; + hash = "sha256-bIUtFpAMCIeLAyGXi4Rgn8FmijN5NwbkC31JoVyjNdg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index b789d8dabeeb..403d5ea16051 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -2,29 +2,35 @@ lib, stdenv, buildPythonPackage, - fetchpatch, fetchPypi, + python, + pythonOlder, + + # build-system setuptools, setuptools-scm, cython, - numpy, - msgpack, py-cpuinfo, + + # dependencies + numpy, + + # tests + msgpack, pytestCheckHook, - python, - pythonOlder, + importlib-metadata, }: buildPythonPackage rec { pname = "numcodecs"; - version = "0.13.0"; + version = "0.13.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-uk+scDbqWgeMev4dTf/rloUIDULxnJwWsS2thmcDqi4="; + hash = "sha256-o883iB3wiY86nA1Ed9+IEz/oUYW//le6MbzC+iB3Cbw="; }; build-system = [ @@ -41,37 +47,23 @@ buildPythonPackage rec { # zfpy = [ zfpy ]; }; - preBuild = - if (stdenv.hostPlatform.isx86 && !stdenv.hostPlatform.avx2Support) then - '' - export DISABLE_NUMCODECS_AVX2= - '' - else - null; + preBuild = lib.optionalString (stdenv.hostPlatform.isx86 && !stdenv.hostPlatform.avx2Support) '' + export DISABLE_NUMCODECS_AVX2=1 + ''; nativeCheckInputs = [ pytestCheckHook msgpack + importlib-metadata ]; + # https://github.com/NixOS/nixpkgs/issues/255262 pytestFlagsArray = [ "$out/${python.sitePackages}/numcodecs" ]; - disabledTests = [ - "test_backwards_compatibility" - - "test_encode_decode" - "test_legacy_codec_broken" - "test_bytes" - - # ValueError: setting an array element with a sequence. The requested array has an inhomogeneous shape after 1 dimensions. The detected shape was (3,) + inhomogeneous part. - # with numpy 1.24 - "test_non_numpy_inputs" - ]; - - meta = with lib; { + meta = { homepage = "https://github.com/zarr-developers/numcodecs"; - license = licenses.mit; + license = lib.licenses.mit; description = "Buffer compression and transformation codecs for use in data storage and communication applications"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 00a1a5699495..cc38c78b3c48 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -1,15 +1,20 @@ { lib, - asciitree, buildPythonPackage, - fasteners, fetchPypi, - numcodecs, - msgpack, - numpy, - pytestCheckHook, pythonOlder, + + # build-system setuptools-scm, + + # dependencies + asciitree, + numpy, + fasteners, + numcodecs, + + # tests + pytestCheckHook, }: buildPythonPackage rec { @@ -24,24 +29,28 @@ buildPythonPackage rec { hash = "sha256-JYDYy23YRiF3GhDTHE13fcqKJ3BqGomyn0LS034t9c4="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ asciitree numpy fasteners numcodecs ] ++ numcodecs.optional-dependencies.msgpack; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "zarr" ]; - meta = with lib; { + meta = { description = "Implementation of chunked, compressed, N-dimensional arrays for Python"; homepage = "https://github.com/zarr-developers/zarr"; changelog = "https://github.com/zarr-developers/zarr-python/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; }; }