Unverified Commit 3f1b4523 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #307316 from GaetanLepage/uproot 

python311Packages.uproot: 5.3.2 -> 5.3.6, python311Packages.coffea: 2024.4.1 -> 2024.5.0
parents 030938f1 573ea0e2

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

+14 −9
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
, fetchFromGitHub

, hatchling

, hatch-vcs

, aiohttp

, awkward

, cachetools

, cloudpickle
@@ -21,6 +22,7 @@ 
, packaging

, pandas

, pyarrow

, requests

, scipy

, toml

, tqdm
@@ -32,7 +34,7 @@ 


buildPythonPackage rec {

  pname = "coffea";

  version = "2024.4.1";

  version = "2024.5.0";

  pyproject = true;



  disabled = pythonOlder "3.8";
@@ -41,20 +43,16 @@ buildPythonPackage rec { 
    owner = "CoffeaTeam";

    repo = "coffea";

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

    hash = "sha256-Iu1GHnLUqdhYO7hoHaf+O/S6KO0P+dvl0wgfRA5vtGI=";

    hash = "sha256-FHE7/VL0mnf0eBPzCsrr8ISr7OmfFvI9xuV0CPa7JdU=";

  };



  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace-fail "numba>=0.58.1" "numba"

  '';



  nativeBuildInputs = [

  build-system = [

    hatchling

    hatch-vcs

  ];



  propagatedBuildInputs = [

  dependencies = [

    aiohttp

    awkward

    cachetools

    cloudpickle
@@ -72,6 +70,7 @@ buildPythonPackage rec { 
    packaging

    pandas

    pyarrow

    requests

    scipy

    toml

    tqdm
@@ -88,6 +87,12 @@ buildPythonPackage rec { 
    "coffea"

  ];



  disabledTests = [

    # Requires internet access

    # https://github.com/CoffeaTeam/coffea/issues/1094

    "test_lumimask"

  ];



  __darwinAllowLocalNetworking = true;



  meta = with lib; {

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

+6 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


buildPythonPackage rec {

  pname = "uproot";

  version = "5.3.2";

  version = "5.3.7";

  pyproject = true;



  disabled = pythonOlder "3.8";
@@ -28,15 +28,15 @@ buildPythonPackage rec { 
    owner = "scikit-hep";

    repo = "uproot5";

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

    hash = "sha256-dq362pevqgLx5KwZ19zQ6aOn5NCyiqynPCF7YdI6tkw=";

    hash = "sha256-ptfT31eUNSpVaZfXAyRcIc2T2p82rXmzUyySSVbI9lI=";

  };



  nativeBuildInputs = [

  build-system = [

    hatch-vcs

    hatchling

  ];



  propagatedBuildInputs = [

  dependencies = [

    awkward

    cramjam

    numpy
@@ -76,6 +76,7 @@ buildPythonPackage rec { 
    "test_http_size"

    "test_http_size_port"

    "test_issue_1054_filename_colons"

    "test_multiple_page_lists"

    "test_no_multipart"

    "test_open_fsspec_github"

    "test_open_fsspec_http"
@@ -83,6 +84,7 @@ buildPythonPackage rec { 
    "test_pickle_roundtrip_http"

    "test_split_ranges_if_large_file_in_http"

    # Cyclic dependency with dask-awkward

    "test_dask_duplicated_keys"

    "test_decompression_executor_for_dask"

  ];