Unverified Commit d5a1b992 authored by Dmitry Kalinkin's avatar Dmitry Kalinkin Committed by GitHub
Browse files

Merge pull request #256140 from GaetanLepage/distributed 

Update python310Packages.{dask, distributed, awkward, awkward-cpp, dask-awkward, dask-gateway-server}
parents d51139ce b9b49e5e

pkgs/development/python-modules/awkward-cpp/default.nix

+5 −6
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchPypi

, pythonOlder

, fetchPypi

, cmake

, ninja

, numpy

, pybind11

, scikit-build-core

, typing-extensions

, numpy

}:



buildPythonPackage rec {

  pname = "awkward-cpp";

  version = "23";

  format = "pyproject";

  version = "24";

  pyproject = true;



  disabled = pythonOlder "3.8";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-c+Rg8+CMIvuDaeuME6ERyfMqeaLMfQHklnXdXQiSNt4=";

    hash = "sha256-KJE/zw9+5NaZNXQsED+kIu1R+Ng7ZOywy+mebmY/SwY=";

  };



  nativeBuildInputs = [

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

+28 −15
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchPypi

, pythonOlder

, awkward-cpp

, cupy

, fetchPypi

, hatch-fancy-pypi-readme

, hatchling

, awkward-cpp

, importlib-metadata

, numba

, numpy

, packaging

, setuptools

, typing-extensions

, fsspec

, jax

, jaxlib

, numba

, setuptools

, numexpr

, pandas

, pyarrow

, pytest-xdist

, pytestCheckHook

}:



buildPythonPackage rec {

  pname = "awkward";

  version = "2.4.2";

  format = "pyproject";

  version = "2.4.6";

  pyproject = true;



  disabled = pythonOlder "3.7";

  disabled = pythonOlder "3.8";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-soMmJ2JXhoR7rmCjtb+5388WfwnDrEbILyMvJqdymro=";

    hash = "sha256-MRnrPChX3a26JELh4oH5nefwoQurpvpprZXeNnz1Cwo=";

  };



  nativeBuildInputs = [
@@ -34,6 +40,7 @@ buildPythonPackage rec { 


  propagatedBuildInputs = [

    awkward-cpp

    importlib-metadata

    numpy

    packaging

  ] ++ lib.optionals (pythonOlder "3.11") [
@@ -44,19 +51,25 @@ buildPythonPackage rec { 


  dontUseCmakeConfigure = true;



  pythonImportsCheck = [ "awkward" ];



  nativeCheckInputs = [

    cupy

    pytestCheckHook

    fsspec

    jax

    jaxlib

    numba

    setuptools

    numexpr

    pandas

    pyarrow

    pytest-xdist

    pytestCheckHook

  ];



  # The following tests have been disabled because they need to be run on a GPU platform.

  disabledTestPaths = [

    "tests-cuda"

  ];



  pythonImportsCheck = [

    "awkward"

    "tests-cuda-kernels"

  ];



  meta = with lib; {

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

+4 −4
Original line number Diff line number Diff line
@@ -31,20 +31,20 @@ 


buildPythonPackage rec {

  pname = "coffea";

  version = "2023.7.0.rc0";

  version = "2023.10.0.rc1";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "CoffeaTeam";

    repo = "coffea";

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

    hash = "sha256-WIJw5NLVN6TrG/0mySqtlqvoNVinmpcWZchSqiNjQ9Q=";

    hash = "sha256-1mfTuZDfkD0NjcmSoXN3BLC5o+dWvw+r65ukZTZf8j4=";

  };



  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace "numba>=0.57.0" "numba" \

      --replace "numpy>=1.22.0,<1.25" "numpy"

      --replace "numba>=0.58.0" "numba" \

      --replace "numpy>=1.22.0,<1.26" "numpy"

  '';



  nativeBuildInputs = [

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

+4 −17
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchpatch

, fetchPypi

, cmake

, numpy
@@ -10,8 +9,9 @@ 
, wheel

, pybind11

, pydantic

, pytestCheckHook

, rich

, awkward

, pytestCheckHook

, scipy

, zlib

}:
@@ -19,27 +19,13 @@ 
buildPythonPackage rec {

  pname = "correctionlib";

  version = "2.3.3";

  format = "pyproject";

  pyproject = true;



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-4WXY7XfZVYaJD63y7fPB6tCsc+wGAsgnFlgtFbX5IK0=";

  };



  patches = [

    (fetchpatch {

      name = "ci-maintenance.patch";

      url = "https://github.com/cms-nanoAOD/correctionlib/commit/924031637b040f6e8e4930c46a9f7560c59db23d.patch";

      hash = "sha256-jq3ojMsO2Ex9om8tVpEY9uwwelXPzgQ+KCPN0bgda8w=";

      includes = [ "pyproject.toml" ];

    })

    (fetchpatch {

      name = "clean-up-build-dependencies.patch";

      url = "https://github.com/cms-nanoAOD/correctionlib/commit/c4fd64ca0e5ce806890e8f0ae8e792dcc4537d38.patch";

      hash = "sha256-8ID2jEnmfYmPxWMtRviBc3t1W4p3Y+lAzijFtYBEtyk=";

    })

  ];



  nativeBuildInputs = [

    cmake

    numpy
@@ -64,6 +50,7 @@ buildPythonPackage rec { 
  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;



  nativeCheckInputs = [

    awkward

    pytestCheckHook

    scipy

  ];

pkgs/development/python-modules/dask-awkward/default.nix

+3 −11
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
, buildPythonPackage

, dask

, fetchFromGitHub

, fetchpatch

, hatch-vcs

, hatchling

, pyarrow
@@ -14,7 +13,7 @@ 


buildPythonPackage rec {

  pname = "dask-awkward";

  version = "2023.9.1";

  version = "2023.10.0";

  format = "pyproject";



  disabled = pythonOlder "3.8";
@@ -23,17 +22,9 @@ buildPythonPackage rec { 
    owner = "dask-contrib";

    repo = pname;

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

    hash = "sha256-eGdOFI2KCpheMQcUH1jokyBO96dqyUlcl98jcgdRkYA=";

    hash = "sha256-02TOUET8frAg8puUmZfB1fRV0s85+Gl/GVgFvGvtBYQ=";

  };



  patches = [

    (fetchpatch {

      name = "dask-awkward-pyarrow13-test-fixes.patch";

      url = "https://github.com/dask-contrib/dask-awkward/commit/abe7f4504b4f926232e4d0dfa5c601d265773d85.patch";

      hash = "sha256-IYlKTV6YasuKIJutB4cCmHeglGWUwBcvFgx1MZw4hjU=";

    })

  ];



  SETUPTOOLS_SCM_PRETEND_VERSION = version;



  pythonRelaxDeps = [
@@ -64,6 +55,7 @@ buildPythonPackage rec { 
    # Tests require network access

    "test_remote_double"

    "test_remote_single"

    "test_from_text"

  ];



  meta = with lib; {