Unverified Commit 80fd99f1 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #229254 from fabaff/dask-bump

python310Packages.dask: 2023.2.1 -> 2023.4.1 
parents d385ced5 d15f5daf
Loading
Loading
Loading
Loading
+19 −12
Original line number Diff line number Diff line
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, awkward
, buildPythonPackage
, dask
, fetchFromGitHub
, hatch-vcs
, hatchling
, pyarrow
, pytestCheckHook
, pythonOlder
, pythonRelaxDepsHook
}:

buildPythonPackage rec {
  pname = "dask-awkward";
  version = "2023.1.0";
  version = "2023.4.2";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@@ -20,13 +21,20 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "dask-contrib";
    repo = pname;
    rev = version;
    hash = "sha256-q0mBd4yelnNL7rMWfilituo9h/xmLLLndSCBdY2egEQ=";
    rev = "refs/tags/${version}";
    hash = "sha256-c3NnARost/406cALQDKmeUsl2kFSQHAswAEwgreFXPc=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;

  pythonRelaxDeps = [
    "awkward"
  ];

  nativeBuildInputs = [
    hatch-vcs
    hatchling
    pythonRelaxDepsHook
  ];

  propagatedBuildInputs = [
@@ -34,8 +42,6 @@ buildPythonPackage rec {
    dask
  ];

  SETUPTOOLS_SCM_PRETEND_VERSION = version;

  checkInputs = [
    pytestCheckHook
    pyarrow
@@ -45,15 +51,16 @@ buildPythonPackage rec {
    "dask_awkward"
  ];

  pytestFlagsArray = [
    # require internet
    "--deselect=tests/test_parquet.py::test_remote_double"
    "--deselect=tests/test_parquet.py::test_remote_single"
  disabledTests = [
    # Tests require network access
    "test_remote_double"
    "test_remote_single"
  ];

  meta = with lib; {
    description = "Native Dask collection for awkward arrays, and the library to use it";
    homepage = "https://github.com/dask-contrib/dask-awkward";
    changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${version}";
    license = licenses.bsd3;
    maintainers = with maintainers; [ veprbl ];
  };
+22 −5
Original line number Diff line number Diff line
@@ -5,23 +5,25 @@
, cryptography
, fetchFromGitHub
, go
, pykerberos
, pythonOlder
, skein
, sqlalchemy
, traitlets
}:

buildPythonPackage rec {
  pname = "dask-gateway-server";
  # update dask-gateway-server lock step with dask-gateway
  version = "2022.4.0";
  version = "2022.10.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "dask";
    repo = "dask-gateway";
    rev = version;
    hash = "sha256-Grjp7gt3Pos4cQSGV/Rynz6W/zebRI0OqDiWT4cTh8I=";
    hash = "sha256-8yyako49F3rK8oZFmpYOiLVg9K3YF76/XerapQx3uhc=";
  };

  sourceRoot = "${src.name}/${pname}";
@@ -37,9 +39,24 @@ buildPythonPackage rec {
    traitlets
  ];

  passthru.optional-dependencies = {
    kerberos = [
      pykerberos
    ];
    jobqueue = [
      sqlalchemy
    ];
    local = [
      sqlalchemy
    ];
    yarn = [
      skein
      sqlalchemy
    ];
  };

  preBuild = ''
    export HOME=$(mktemp -d)
    export GO111MODULE=off
  '';

  # Tests requires cluster for testing
+2 −2
Original line number Diff line number Diff line
@@ -17,14 +17,14 @@

buildPythonPackage rec {
  pname = "dask-ml";
  version = "2022.5.27";
  version = "2023.3.24";
  format = "setuptools";

  disabled = pythonOlder "3.6";

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-Y2nTk0GSvMGSP87oTD+4+8zsoQITeQEHC6Px2eOGzOQ=";
    hash = "sha256-lsCQ220yg2U24/Ccpk3rWZ6GRYeqjj1NLGtK9YhzMwc=";
  };

  nativeBuildInputs = [
+14 −4
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@
, fetchFromGitHub
, fetchpatch
, fsspec
, importlib-metadata
, jinja2
, numpy
, packaging
@@ -22,13 +23,15 @@
, pythonOlder
, pyyaml
, scipy
, setuptools
, toolz
, versioneer
, zarr
}:

buildPythonPackage rec {
  pname = "dask";
  version = "2023.2.1";
  version = "2023.4.1";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@@ -36,10 +39,15 @@ buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "dask";
    repo = pname;
    rev = version;
    hash = "sha256-7cuTxJ5SxOEf0v+SvSiaz7x8YYTx/qIS+KktbtubiDU=";
    rev = "refs/tags/${version}";
    hash = "sha256-PkEFXF6OFZU+EMFBUopv84WniQghr5Q6757Qx6D5MyE=";
  };

  nativeBuildInputs = [
    setuptools
    versioneer
  ];

  propagatedBuildInputs = [
    click
    cloudpickle
@@ -47,6 +55,7 @@ buildPythonPackage rec {
    packaging
    partd
    pyyaml
    importlib-metadata
    toolz
  ];

@@ -91,8 +100,9 @@ buildPythonPackage rec {
      --replace "version=versioneer.get_version()," "version='${version}'," \
      --replace "cmdclass=versioneer.get_cmdclass()," ""

    substituteInPlace setup.cfg \
    substituteInPlace pyproject.toml \
      --replace " --durations=10" "" \
      --replace " --cov-config=pyproject.toml" "" \
      --replace " -v" ""
  '';

+22 −9
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
, click
, cloudpickle
, dask
, fetchPypi
, fetchFromGitHub
, jinja2
, locket
, msgpack
@@ -11,31 +11,43 @@
, psutil
, pythonOlder
, pyyaml
, setuptools
, setuptools-scm
, sortedcontainers
, tblib
, toolz
, tornado
, urllib3
, versioneer
, wheel
, zict
}:

buildPythonPackage rec {
  pname = "distributed";
  version = "2023.2.1";
  format = "setuptools";
  version = "2023.4.1";
  format = "pyproject";

  disabled = pythonOlder "3.7";
  disabled = pythonOlder "3.8";

  src = fetchPypi {
    inherit pname version;
    hash = "sha256-E0eks6HlJzZy/XqHRxQJ4brEcLS9tniMkYMT1FoikRs=";
  src = fetchFromGitHub {
    owner = "dask";
    repo = pname;
    rev = "refs/tags/${version}";
    hash = "sha256-KCgftu3i8N0WSelHiqWqa1vLN5gUtleftSUx1Zu4nZg=";
  };

  postPatch = ''
    substituteInPlace requirements.txt \
      --replace "tornado >= 6.0.3, <6.2" "tornado >= 6.0.3"
    substituteInPlace pyproject.toml \
      --replace 'dynamic = ["version"]' 'version = "${version}"'
  '';

  nativeBuildInputs = [
    setuptools
    setuptools-scm
    versioneer
  ];

  propagatedBuildInputs = [
    click
    cloudpickle
@@ -64,6 +76,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Distributed computation in Python";
    homepage = "https://distributed.readthedocs.io/";
    changelog = "https://github.com/dask/distributed/blob/${version}/docs/source/changelog.rst";
    license = licenses.bsd3;
    maintainers = with maintainers; [ teh costrouc ];
  };
Loading