Unverified Commit f5948adb authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #269058 from NixOS/backport-268651-to-release-23.11 

[Backport release-23.11] python311Packages.imageio: 2.32.0 -> 2.33.0
parents 1e70b57e 05d600c4

pkgs/development/python-modules/av/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
, buildPythonPackage

, fetchFromGitHub

, pythonOlder

, stdenv



# build

, cython
@@ -101,6 +102,10 @@ buildPythonPackage rec { 
    "--deselect=tests/test_subtitles.py::TestSubtitle::test_movtext"

    "--deselect=tests/test_subtitles.py::TestSubtitle::test_vobsub"

    "--deselect=tests/test_videoframe.py::TestVideoFrameImage::test_roundtrip"

  ] ++ lib.optionals (stdenv.isDarwin) [

    # Segmentation Faults

    "--deselect=tests/test_encode.py::TestBasicVideoEncoding::test_encoding_with_pts"

    "--deselect=tests/test_pyav.py::test_bayer_write"

  ];



  disabledTests = [

pkgs/development/python-modules/imageio/default.nix

+19 −15
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ 
, stdenv

, buildPythonPackage

, pythonOlder

, fetchPypi

, fetchpatch

, fetchFromGitHub

, isPyPy

, substituteAll
@@ -32,24 +31,19 @@ 


buildPythonPackage rec {

  pname = "imageio";

  version = "2.32.0";

  version = "2.33.0";

  pyproject = true;



  disabled = pythonOlder "3.7";

  disabled = pythonOlder "3.8";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-5CWtNsYFMI2eptk+2nsJh5JgWbi4YiDhQqWZp5dRKN0=";

  src = fetchFromGitHub {

    owner = "imageio";

    repo = "imageio";

    rev = "refs/tags/v${version}";

    hash = "sha256-WoCycrJxo0vyV9LiWnEag1wbld3EJWu8mks8TnYt2+A=";

  };



  patches = [

    # pillow 10.1.0 compat

    (fetchpatch {

      name = "imageio-pillow-10.1.0-compat.patch";

      url = "https://github.com/imageio/imageio/commit/f58379c1ae7fbd1da8689937b39e499e2d225740.patch";

      hash = "sha256-jPSl/EUe69Dizkv8CqWpnm+TDPtF3VX2DkHOCEuYTLA=";

    })

  ] ++ lib.optionals (!stdenv.isDarwin) [

  patches = lib.optionals (!stdenv.isDarwin) [

    (substituteAll {

      src = ./libgl-path.patch;

      libgl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}";
@@ -119,6 +113,16 @@ buildPythonPackage rec { 
    "tests/test_swf.py"

  ];



  disabledTests = lib.optionals stdenv.isDarwin [

    # Segmentation fault

    "test_bayer_write"

    # RuntimeError: No valid H.264 encoder was found with the ffmpeg installation

    "test_writer_file_properly_closed"

    "test_writer_pixelformat_size_verbose"

    "test_writer_ffmpeg_params"

    "test_reverse_read"

  ];



  meta = with lib; {

    description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats";

    homepage = "https://imageio.readthedocs.io";