diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index 2c3bd96fcf22..476888d1b1a0 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "26"; + version = "27"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-o3wI+JEmtjfUczRUob8/KLGNn3lH0h3GuhIDfYg7HGY="; + hash = "sha256-PBllGL/M5wl2bWOHgEExekkUti+Ag+Gj4DtP1upvPI0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index da217b4496bb..12a4593bbd2d 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.4.10"; + version = "2.5.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "awkward"; rev = "refs/tags/v${version}"; - hash = "sha256-D+bgKI6olK3smgnRdACvd0gYMWvS6ao6f7nQh3YExXw="; + hash = "sha256-lfeoWTmK/VNm3uFLHmIPO4r9aZPK3NhgDwio5WN4jqU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index 47f98327cb37..ab10055187d0 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -31,20 +31,19 @@ buildPythonPackage rec { pname = "coffea"; - version = "2023.10.0.rc1"; + version = "2023.12.0"; pyproject = true; src = fetchFromGitHub { owner = "CoffeaTeam"; repo = "coffea"; rev = "refs/tags/v${version}"; - hash = "sha256-1mfTuZDfkD0NjcmSoXN3BLC5o+dWvw+r65ukZTZf8j4="; + hash = "sha256-Xlud3ibdI4UnoHe72NPc7WQojuWPpXtncENDinYgk4o="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "numba>=0.58.0" "numba" \ - --replace "numpy>=1.22.0,<1.26" "numpy" + --replace "numba>=0.58.1" "numba" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index 39ae8e5ddcad..c07cd8d6db5a 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2023.11.2"; + version = "2023.12.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "dask-contrib"; repo = "dask-awkward"; rev = "refs/tags/${version}"; - hash = "sha256-yx0B31x+BMS4alHro+hAPeVB6YK9B7Tg+3sSCMCYjKs="; + hash = "sha256-MfZ3mdCCShD/rcqHx7xyujXax5t96RQI1e2Ckyif9e4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dask-yarn/default.nix b/pkgs/development/python-modules/dask-yarn/default.nix index b9204f0eb839..044c70f64f89 100644 --- a/pkgs/development/python-modules/dask-yarn/default.nix +++ b/pkgs/development/python-modules/dask-yarn/default.nix @@ -4,6 +4,7 @@ , dask , distributed , fetchFromGitHub +, fetchpatch , grpcio , pytestCheckHook , pythonOlder @@ -19,11 +20,19 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dask"; - repo = pname; - rev = version; + repo = "dask-yarn"; + rev = "refs/tags/${version}"; hash = "sha256-/BTsxQSiVQrihrCa9DE7pueyg3aPAdjd/Dt4dpUwdtM="; }; + patches = [ + (fetchpatch { # https://github.com/dask/dask-yarn/pull/150 + name = "address-deprecations-introduced-in-distributed-2021-07-0"; + url = "https://github.com/dask/dask-yarn/pull/150/commits/459848afcdc22568905ee98622c74e4071496423.patch"; + hash = "sha256-LS46QBdiAmsp4jQq4DdYdmmk1qzx5JZNTQUlRcRwY5k="; + }) + ]; + propagatedBuildInputs = [ distributed dask diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 63a13d779913..70b15822cb65 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2023.10.1"; + version = "2023.12.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-asD5oLd7XcZ8ZFSrsSCAKgZ3Gsqs6T77nb1qesamgUI="; + hash = "sha256-LMd55s8LT4m6Ym+LmXb4TKPnZ0jMkNBfcPJxmgruMDM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 55d5dabdd009..074a450a39e4 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "distributed"; - version = "2023.10.0"; + version = "2023.12.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "dask"; repo = "distributed"; rev = "refs/tags/${version}"; - hash = "sha256-V0L1qY9xtJgKxNEZ69z8CQuXsUs30cqu6xFrsjKWkbY="; + hash = "sha256-Zv31BTzY31eXkU7wqa+h33qGrH+OTzKEj6L7Ei/aizk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 837d16204473..1fd62b8eb2fc 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -5,10 +5,12 @@ , awkward , hatchling , numpy +, fsspec , packaging , pytestCheckHook , lz4 , pytest-timeout +, rangehttpserver , scikit-hep-testdata , xxhash , zstandard @@ -16,7 +18,7 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.1.2"; + version = "5.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +27,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-TMa+j2jdFagJJhlyCx4rNLaxQhrJyq1HdpnA40xiyME="; + hash = "sha256-Oig66OvnmuqT56UkAecSG9qg+qxEQINX/DWS30yq46s="; }; nativeBuildInputs = [ @@ -35,6 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ awkward numpy + fsspec packaging ]; @@ -42,6 +45,7 @@ buildPythonPackage rec { pytestCheckHook lz4 pytest-timeout + rangehttpserver scikit-hep-testdata xxhash zstandard @@ -53,20 +57,32 @@ buildPythonPackage rec { disabledTests = [ # Tests that try to download files - "test_http" - "test_no_multipart" "test_fallback" + "test_file" + "test_fsspec_chunks" + "test_fsspec_globbing_http" + "test_fsspec_writing_memory" + "test_http" + "test_http_fallback" + "test_http_multipart" + "test_http_port" + "test_http_size" + "test_http_size_port" + "test_issue_1054_filename_colons" + "test_no_multipart" + "test_open_fsspec_http" + "test_open_fsspec_github" "test_pickle_roundtrip_http" - "test_open_fsspec_local" ]; disabledTestPaths = [ # Tests that try to download files - "tests/test_0066-fix-http-fallback-freeze.py" - "tests/test_0088-read-with-http.py" - "tests/test_0220-contiguous-byte-ranges-in-http.py" - "tests/test_0916-read-from-s3.py" - "tests/test_0930-expressions-in-pandas.py" + "tests/test_0066_fix_http_fallback_freeze.py" + "tests/test_0088_read_with_http.py" + "tests/test_0220_contiguous_byte_ranges_in_http.py" + + # FileNotFoundError: uproot-issue-1043.root + "tests/test_1043_const_std_string.py" ]; pythonImportsCheck = [