Merge pull request #127601 from tfmoraes/python3Package-dask-2021.06.1
This commit is contained in:
commit
2e5873367c
@ -2,7 +2,6 @@
|
||||
, stdenv
|
||||
, bokeh
|
||||
, buildPythonPackage
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, fsspec
|
||||
, pytestCheckHook
|
||||
@ -21,14 +20,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dask";
|
||||
version = "2021.03.0";
|
||||
version = "2021.06.1";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dask";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "LACv7lWpQULQknNGX/9vH9ckLsypbqKDGnsNBgKT1eI=";
|
||||
sha256 = "sha256-wrUqLSmlKhd0NSjWBwbow8aX53ZBTgl2n4lEmvxC3bs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -54,16 +53,6 @@ buildPythonPackage rec {
|
||||
|
||||
dontUseSetuptoolsCheck = true;
|
||||
|
||||
patches = [
|
||||
# dask dataframe cannot be imported in sandboxed builds
|
||||
# See https://github.com/dask/dask/pull/7601
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dask/dask/commit/9ce5b0d258cecb3ef38fd844135ad1f7ac3cea5f.patch";
|
||||
sha256 = "sha256-1EVRYwAdTSEEH9jp+UOnrijzezZN3iYR6q6ieYJM3kY=";
|
||||
name = "fix-dask-dataframe-imports-in-sandbox.patch";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# versioneer hack to set version of github package
|
||||
echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py
|
||||
@ -82,6 +71,12 @@ buildPythonPackage rec {
|
||||
# this test requires features of python3Packages.psutil that are
|
||||
# blocked in sandboxed-builds
|
||||
"test_auto_blocksize_csv"
|
||||
] ++ [
|
||||
# A deprecation warning from newer sqlalchemy versions makes these tests
|
||||
# to fail https://github.com/dask/dask/issues/7406
|
||||
"test_sql"
|
||||
# Test interrupt fails intermittently https://github.com/dask/dask/issues/2192
|
||||
"test_interrupt"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
@ -24,11 +24,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "datashader";
|
||||
version = "0.12.1";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a135612876dc3e4b16ccb9ddb70de50519825c8c1be251b49aefa550bcf8a39a";
|
||||
sha256 = "sha256-6JscHm1QjDmXOLLa83qhAvY/xwvlPM6duQ1lSxnCVV8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -20,13 +20,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "distributed";
|
||||
version = "2021.3.0";
|
||||
version = "2021.6.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
# get full repository need conftest.py to run tests
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Qn/n4Ee7rXQTxl1X5W+k1rHPkh/SBqPSyquUv5FTw9s=";
|
||||
sha256 = "sha256-Z79h/WAio5diX2myChx8HPAWe2RB4Ajw7Ybch4XUYFc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -73,6 +73,7 @@ buildPythonPackage rec {
|
||||
|
||||
# broken test
|
||||
"test_read_pattern"
|
||||
"test_remote_arr"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -1,4 +1,7 @@
|
||||
{ lib, buildPythonPackage, fetchPypi
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, confluent-kafka
|
||||
, distributed
|
||||
, flaky
|
||||
@ -22,6 +25,14 @@ buildPythonPackage rec {
|
||||
sha256 = "04446ece273c041506b1642bd3d8380367a8372196be4d6d6d03faafadc590b2";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix apply import from dask
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/python-streamz/streamz/pull/423.patch";
|
||||
sha256 = "sha256-CR+uRvzaFu9WQ633tbvX3gAnudhlVN6VvmxKiR37diw=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
networkx
|
||||
tornado
|
||||
@ -46,6 +57,7 @@ buildPythonPackage rec {
|
||||
checkPhase = ''
|
||||
pytest --deselect=streamz/tests/test_sources.py::test_tcp_async \
|
||||
--deselect=streamz/tests/test_sources.py::test_tcp \
|
||||
--deselect=streamz/tests/test_core.py::test_partition_timeout \
|
||||
--ignore=streamz/tests/test_kafka.py
|
||||
'';
|
||||
|
||||
|
@ -31,12 +31,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sunpy";
|
||||
version = "2.1.2";
|
||||
version = "3.0.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8bbc440e606a4f3fcbd1441150d81da6f0208adace9dc06f6afd2c9cb7c08908";
|
||||
sha256 = "sha256-N/DAvnO+S9E4tndEWpiG84P3FCFwxYNdGFxbxUVsTx8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -74,9 +74,12 @@ buildPythonPackage rec {
|
||||
|
||||
# darwin has write permission issues
|
||||
doCheck = stdenv.isLinux;
|
||||
|
||||
# ignore documentation tests
|
||||
checkPhase = ''
|
||||
PY_IGNORE_IMPORTMISMATCH=1 HOME=$(mktemp -d) pytest sunpy -k 'not rst'
|
||||
PY_IGNORE_IMPORTMISMATCH=1 HOME=$(mktemp -d) pytest sunpy -k 'not rst' \
|
||||
--deselect=sunpy/tests/tests/test_self_test.py::test_main_nonexisting_module \
|
||||
--deselect=sunpy/tests/tests/test_self_test.py::test_main_stdlib_module
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
Loading…
Reference in New Issue
Block a user