Unverified Commit 6d0ac786 authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

Revert "python312Packages.dask: 2024.12.1 -> 2025.1.0"

parent 9b484191
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@

buildPythonPackage rec {
  pname = "awkward-cpp";
  version = "44";
  version = "43";
  pyproject = true;

  src = fetchPypi {
    pname = "awkward_cpp";
    inherit version;
    hash = "sha256-jcSZKI1tFrLqILUaJ9UEflGiR7aqz8vLOzAsrW08h9g=";
    hash = "sha256-we11WW7IKvZm2ghLW/gF2bcsg1MtA10rZeB5WQXSXq0=";
  };

  build-system = [
+20 −31
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  buildPythonPackage,
  pythonOlder,
  fetchFromGitHub,

  # build-system
@@ -13,27 +13,29 @@
  fsspec,
  numpy,
  packaging,
  typing-extensions,
  importlib-metadata,

  # tests
  # checks
  numba,
  setuptools,
  numexpr,
  pandas,
  pyarrow,
  pytest-xdist,
  pytestCheckHook,
  setuptools,
}:

buildPythonPackage rec {
  pname = "awkward";
  version = "2.7.4";
  version = "2.7.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "scikit-hep";
    repo = "awkward";
    tag = "v${version}";
    hash = "sha256-OXSl+8sfrx+JlLu40wHf+98WVNNwm9uxvsnGXRDztDg=";
    hash = "sha256-nOKMwAQ5t8tc64bEKz0j8JxxoVQQu39Iu8Zr9cqSx7A=";
  };

  build-system = [
@@ -41,12 +43,15 @@ buildPythonPackage rec {
    hatchling
  ];

  dependencies = [
  dependencies =
    [
      awkward-cpp
      fsspec
      numpy
      packaging
  ];
    ]
    ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]
    ++ lib.optionals (pythonOlder "3.12") [ importlib-metadata ];

  dontUseCmakeConfigure = true;

@@ -55,33 +60,17 @@ buildPythonPackage rec {
  nativeCheckInputs = [
    fsspec
    numba
    setuptools
    numexpr
    pandas
    pyarrow
    pytest-xdist
    pytestCheckHook
    setuptools
  ];

  disabledTests = [
    # pyarrow.lib.ArrowInvalid
    "test_recordarray"
  ];

  disabledTestPaths =
    [
  disabledTestPaths = [
    # Need to be run on a GPU platform.
    "tests-cuda"
    ]
    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
      # Fatal Python error: Segmentation fault at:
      # numba/typed/typedlist.py", line 344 in append
      "tests/test_0118_numba_cpointers.py"
      "tests/test_0397_arrays_as_constants_in_numba.py"
      "tests/test_1677_array_builder_in_numba.py"
      "tests/test_2055_array_builder_check.py"
      "tests/test_2349_growablebuffer_in_numba.py"
      "tests/test_2408_layoutbuilder_in_numba.py"
  ];

  meta = {
+1 −6
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ buildPythonPackage rec {
    pname
    version
    src
    meta
    ;

  pyproject = true;

  sourceRoot = "${src.name}/catboost/python-package";
@@ -55,9 +55,4 @@ buildPythonPackage rec {
  doCheck = false;

  pythonImportsCheck = [ "catboost" ];

  meta = catboost.meta // {
    # Incompatible with numpy >= 2.0
    broken = true;
  };
}
+0 −8
Original line number Diff line number Diff line
@@ -57,10 +57,6 @@ buildPythonPackage rec {
    hatch-vcs
  ];

  pythonRelaxDeps = [
    "dask"
  ];

  dependencies = [
    aiohttp
    awkward
@@ -110,10 +106,6 @@ buildPythonPackage rec {
    # AssertionError: bug in Awkward Array: attempt to convert TypeTracerArray into a concrete array
    "test_apply_to_fileset"
    "test_lorentz_behavior"

    # ValueError: The array to mask was deleted before it could be masked.
    # If you want to construct this mask, you must either keep the array alive or use 'ak.mask' explicitly.
    "test_read_nanomc"
  ];

  __darwinAllowLocalNetworking = true;
+6 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@
  # optional-dependencies
  pyarrow,

  # tests
  # checks
  dask-histogram,
  distributed,
  hist,
@@ -27,14 +27,14 @@

buildPythonPackage rec {
  pname = "dask-awkward";
  version = "2025.2.0";
  version = "2024.12.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "dask-contrib";
    repo = "dask-awkward";
    tag = version;
    hash = "sha256-hhAY2cPUOYnP86FGsLvxlMeoEwY+sTrjPMKyuZrO0/M=";
    hash = "sha256-pL1LDW/q78V/c3Bha38k40018MFO+i8X6htYNdcsy7s=";
  };

  build-system = [
@@ -53,8 +53,8 @@ buildPythonPackage rec {
    io = [ pyarrow ];
  };

  nativeCheckInputs = [
    # dask-histogram (circular dependency)
  checkInputs = [
    dask-histogram
    distributed
    hist
    pandas
@@ -86,7 +86,7 @@ buildPythonPackage rec {
  meta = {
    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}";
    changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${src.tag}";
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [ veprbl ];
  };
Loading