Merge pull request #267964 from GaetanLepage/awkward
python311Packages.awkward: 2.4.10 -> 2.5.0
This commit is contained in:
commit
49a0e28b31
8 changed files with 50 additions and 26 deletions
|
@ -11,14 +11,14 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "awkward-cpp";
|
pname = "awkward-cpp";
|
||||||
version = "26";
|
version = "27";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-o3wI+JEmtjfUczRUob8/KLGNn3lH0h3GuhIDfYg7HGY=";
|
hash = "sha256-PBllGL/M5wl2bWOHgEExekkUti+Ag+Gj4DtP1upvPI0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "awkward";
|
pname = "awkward";
|
||||||
version = "2.4.10";
|
version = "2.5.1";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||||
owner = "scikit-hep";
|
owner = "scikit-hep";
|
||||||
repo = "awkward";
|
repo = "awkward";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-D+bgKI6olK3smgnRdACvd0gYMWvS6ao6f7nQh3YExXw=";
|
hash = "sha256-lfeoWTmK/VNm3uFLHmIPO4r9aZPK3NhgDwio5WN4jqU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -31,20 +31,19 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "coffea";
|
pname = "coffea";
|
||||||
version = "2023.10.0.rc1";
|
version = "2023.12.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "CoffeaTeam";
|
owner = "CoffeaTeam";
|
||||||
repo = "coffea";
|
repo = "coffea";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-1mfTuZDfkD0NjcmSoXN3BLC5o+dWvw+r65ukZTZf8j4=";
|
hash = "sha256-Xlud3ibdI4UnoHe72NPc7WQojuWPpXtncENDinYgk4o=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace pyproject.toml \
|
substituteInPlace pyproject.toml \
|
||||||
--replace "numba>=0.58.0" "numba" \
|
--replace "numba>=0.58.1" "numba"
|
||||||
--replace "numpy>=1.22.0,<1.26" "numpy"
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "dask-awkward";
|
pname = "dask-awkward";
|
||||||
version = "2023.11.2";
|
version = "2023.12.2";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||||
owner = "dask-contrib";
|
owner = "dask-contrib";
|
||||||
repo = "dask-awkward";
|
repo = "dask-awkward";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-yx0B31x+BMS4alHro+hAPeVB6YK9B7Tg+3sSCMCYjKs=";
|
hash = "sha256-MfZ3mdCCShD/rcqHx7xyujXax5t96RQI1e2Ckyif9e4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
, dask
|
, dask
|
||||||
, distributed
|
, distributed
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, grpcio
|
, grpcio
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, pythonOlder
|
, pythonOlder
|
||||||
|
@ -19,11 +20,19 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dask";
|
owner = "dask";
|
||||||
repo = pname;
|
repo = "dask-yarn";
|
||||||
rev = version;
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-/BTsxQSiVQrihrCa9DE7pueyg3aPAdjd/Dt4dpUwdtM=";
|
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 = [
|
propagatedBuildInputs = [
|
||||||
distributed
|
distributed
|
||||||
dask
|
dask
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "dask";
|
pname = "dask";
|
||||||
version = "2023.10.1";
|
version = "2023.12.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
@ -47,7 +47,7 @@ buildPythonPackage rec {
|
||||||
owner = "dask";
|
owner = "dask";
|
||||||
repo = "dask";
|
repo = "dask";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-asD5oLd7XcZ8ZFSrsSCAKgZ3Gsqs6T77nb1qesamgUI=";
|
hash = "sha256-LMd55s8LT4m6Ym+LmXb4TKPnZ0jMkNBfcPJxmgruMDM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "distributed";
|
pname = "distributed";
|
||||||
version = "2023.10.0";
|
version = "2023.12.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.9";
|
disabled = pythonOlder "3.9";
|
||||||
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||||
owner = "dask";
|
owner = "dask";
|
||||||
repo = "distributed";
|
repo = "distributed";
|
||||||
rev = "refs/tags/${version}";
|
rev = "refs/tags/${version}";
|
||||||
hash = "sha256-V0L1qY9xtJgKxNEZ69z8CQuXsUs30cqu6xFrsjKWkbY=";
|
hash = "sha256-Zv31BTzY31eXkU7wqa+h33qGrH+OTzKEj6L7Ei/aizk=";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -5,10 +5,12 @@
|
||||||
, awkward
|
, awkward
|
||||||
, hatchling
|
, hatchling
|
||||||
, numpy
|
, numpy
|
||||||
|
, fsspec
|
||||||
, packaging
|
, packaging
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, lz4
|
, lz4
|
||||||
, pytest-timeout
|
, pytest-timeout
|
||||||
|
, rangehttpserver
|
||||||
, scikit-hep-testdata
|
, scikit-hep-testdata
|
||||||
, xxhash
|
, xxhash
|
||||||
, zstandard
|
, zstandard
|
||||||
|
@ -16,7 +18,7 @@
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "uproot";
|
pname = "uproot";
|
||||||
version = "5.1.2";
|
version = "5.2.0";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
|
||||||
disabled = pythonOlder "3.8";
|
disabled = pythonOlder "3.8";
|
||||||
|
@ -25,7 +27,7 @@ buildPythonPackage rec {
|
||||||
owner = "scikit-hep";
|
owner = "scikit-hep";
|
||||||
repo = "uproot5";
|
repo = "uproot5";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-TMa+j2jdFagJJhlyCx4rNLaxQhrJyq1HdpnA40xiyME=";
|
hash = "sha256-Oig66OvnmuqT56UkAecSG9qg+qxEQINX/DWS30yq46s=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -35,6 +37,7 @@ buildPythonPackage rec {
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
awkward
|
awkward
|
||||||
numpy
|
numpy
|
||||||
|
fsspec
|
||||||
packaging
|
packaging
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -42,6 +45,7 @@ buildPythonPackage rec {
|
||||||
pytestCheckHook
|
pytestCheckHook
|
||||||
lz4
|
lz4
|
||||||
pytest-timeout
|
pytest-timeout
|
||||||
|
rangehttpserver
|
||||||
scikit-hep-testdata
|
scikit-hep-testdata
|
||||||
xxhash
|
xxhash
|
||||||
zstandard
|
zstandard
|
||||||
|
@ -53,20 +57,32 @@ buildPythonPackage rec {
|
||||||
|
|
||||||
disabledTests = [
|
disabledTests = [
|
||||||
# Tests that try to download files
|
# Tests that try to download files
|
||||||
"test_http"
|
|
||||||
"test_no_multipart"
|
|
||||||
"test_fallback"
|
"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_pickle_roundtrip_http"
|
||||||
"test_open_fsspec_local"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
disabledTestPaths = [
|
disabledTestPaths = [
|
||||||
# Tests that try to download files
|
# Tests that try to download files
|
||||||
"tests/test_0066-fix-http-fallback-freeze.py"
|
"tests/test_0066_fix_http_fallback_freeze.py"
|
||||||
"tests/test_0088-read-with-http.py"
|
"tests/test_0088_read_with_http.py"
|
||||||
"tests/test_0220-contiguous-byte-ranges-in-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"
|
# FileNotFoundError: uproot-issue-1043.root
|
||||||
|
"tests/test_1043_const_std_string.py"
|
||||||
];
|
];
|
||||||
|
|
||||||
pythonImportsCheck = [
|
pythonImportsCheck = [
|
||||||
|
|
Loading…
Reference in a new issue