Unverified Commit 967b3047 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #312515 from GaetanLepage/dask

python311Packages.dask: 2024.5.0 -> 2024.5.1
parents 38cd8da8 030bcbc7
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@

buildPythonPackage rec {
  pname = "dask-expr";
  version = "1.1.0";
  version = "1.1.1";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "dask";
    repo = "dask-expr";
    rev = "refs/tags/v${version}";
    hash = "sha256-yVwaOOjxHVxAhFlEENnjpX8LbJs9MW0OOmwAH5RhPgE=";
    hash = "sha256-ltsRKbb/p+qHeNiX0oeZUKbbjPoPxSM4uFnWUFqoqhc=";
  };

  postPatch = ''
@@ -32,13 +32,13 @@ buildPythonPackage rec {
      --replace-fail "versioneer[toml]==0.28" "versioneer[toml]"
  '';

  nativeBuildInputs = [
  build-system = [
    setuptools
    versioneer
    wheel
  ];

  propagatedBuildInputs = [
  dependencies = [
    dask
    pandas
    pyarrow
@@ -53,10 +53,10 @@ buildPythonPackage rec {

  __darwinAllowLocalNetworking = true;

  meta = with lib; {
    description = "";
  meta = {
    description = "A rewrite of Dask DataFrame that includes query optimization and generally improved organization";
    homepage = "https://github.com/dask/dask-expr";
    license = licenses.bsd3;
    maintainers = with maintainers; [ GaetanLepage ];
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [ GaetanLepage ];
  };
}
+24 −19
Original line number Diff line number Diff line
{ lib
, stdenv
, buildPythonPackage
, pythonOlder
, fetchFromGitHub
, setuptools
, setuptools-scm
, dask
, fetchPypi
, numpy
, scipy
, pandas
, pims
, pytestCheckHook
, pythonOlder
, scikit-image
, scipy
}:

buildPythonPackage rec {
  pname = "dask-image";
  version = "2023.8.1";
  format = "setuptools";
  version = "2024.5.1";
  pyproject = true;

  disabled = pythonOlder "3.7";
  disabled = pythonOlder "3.9";

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-XpqJhbBSehtZQsan50Tg5X0mTiIscFjwW664HDdNBLY=";
  src = fetchFromGitHub {
    owner = "dask";
    repo = "dask-image";
    rev = "refs/tags/v${version}";
    hash = "sha256-BNjftLs/hle2EWkLBOT8r2nSOxKZzPixAE4fOfNSFIs=";
  };

  propagatedBuildInputs = [
  build-system = [
    setuptools
    setuptools-scm
  ];

  dependencies = [
    dask
    numpy
    scipy
    pandas
    pims
  ];

@@ -35,19 +45,14 @@ buildPythonPackage rec {
    scikit-image
  ];

  postPatch = ''
    substituteInPlace setup.cfg \
      --replace "--flake8" ""
  '';

  pythonImportsCheck = [
    "dask_image"
  ];

  meta = with lib; {
  meta = {
    description = "Distributed image processing";
    homepage = "https://github.com/dask/dask-image";
    license = licenses.bsdOriginal;
    maintainers = with maintainers; [ ];
    license = lib.licenses.bsdOriginal;
    maintainers = with lib.maintainers; [ GaetanLepage ];
  };
}
+7 −7
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@

let self = buildPythonPackage rec {
  pname = "dask";
  version = "2024.5.0";
  version = "2024.5.1";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -48,15 +48,15 @@ let self = buildPythonPackage rec {
    owner = "dask";
    repo = "dask";
    rev = "refs/tags/${version}";
    hash = "sha256-2tkY02Inhpo8upTjhen//EvsZwd93roPCID215NOxwQ=";
    hash = "sha256-FzvzmQa9kJAZw67HY+d+3uC6Bd246vp5QsyXepGnKH8=";
  };

  nativeBuildInputs = [
  build-system = [
    setuptools
    wheel
  ];

  propagatedBuildInputs = [
  dependencies = [
    click
    cloudpickle
    fsspec
@@ -185,12 +185,12 @@ let self = buildPythonPackage rec {
  };


  meta = with lib; {
  meta = {
    description = "Minimal task scheduling abstraction";
    mainProgram = "dask";
    homepage = "https://dask.org/";
    changelog = "https://docs.dask.org/en/latest/changelog.html";
    license = licenses.bsd3;
    maintainers = with maintainers; [ GaetanLepage ];
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [ GaetanLepage ];
  };
}; in self