diff --git a/.gitignore b/.gitignore index 9cd87bb..7c7c022 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ /dask-2023.7.0.tar.gz /dask-2023.7.1.tar.gz /dask-2023.8.1.tar.gz +/dask-2023.11.0.tar.gz diff --git a/0001-Skip-test_encoding_gh601-on-big-endian-machines.patch b/0001-Skip-test_encoding_gh601-on-big-endian-machines.patch index d6bb022..eea3767 100644 --- a/0001-Skip-test_encoding_gh601-on-big-endian-machines.patch +++ b/0001-Skip-test_encoding_gh601-on-big-endian-machines.patch @@ -1,7 +1,7 @@ -From a5ea6c2f7fcaee8830aca6dca8102663976bae45 Mon Sep 17 00:00:00 2001 +From 108137a7dd964cfd46e134d523cc45dd4e5dab08 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 7 Mar 2021 04:07:32 -0500 -Subject: [PATCH 1/4] Skip test_encoding_gh601 on big-endian machines. +Subject: [PATCH 1/6] Skip test_encoding_gh601 on big-endian machines. Signed-off-by: Elliott Sales de Andrade --- @@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 2 insertions(+) diff --git a/dask/dataframe/io/tests/test_csv.py b/dask/dataframe/io/tests/test_csv.py -index 1e0dd41a..e922227b 100644 +index 1df7202f..54ff1dff 100644 --- a/dask/dataframe/io/tests/test_csv.py +++ b/dask/dataframe/io/tests/test_csv.py @@ -4,6 +4,7 @@ import gzip @@ -20,7 +20,7 @@ index 1e0dd41a..e922227b 100644 from unittest import mock import pytest -@@ -1149,6 +1150,7 @@ def test_read_csv_with_datetime_index_partitions_n(): +@@ -1155,6 +1156,7 @@ def test_read_csv_with_datetime_index_partitions_n(): xfail_pandas_100 = pytest.mark.xfail(reason="https://github.com/dask/dask/issues/5787") @@ -29,5 +29,5 @@ index 1e0dd41a..e922227b 100644 "encoding", [ -- -2.41.0 +2.42.0 diff --git a/0002-Skip-coverage-testing.patch b/0002-Skip-coverage-testing.patch index d999622..ae841b0 100644 --- a/0002-Skip-coverage-testing.patch +++ b/0002-Skip-coverage-testing.patch @@ -1,7 +1,7 @@ -From 6c04cdb761204853b2fde68c029aecc4c22db453 Mon Sep 17 00:00:00 2001 +From 743a70400f3fa4fca4e2524d9da5d449865c7300 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 7 May 2023 23:13:59 -0400 -Subject: [PATCH 2/4] Skip coverage testing +Subject: [PATCH 2/6] Skip coverage testing Signed-off-by: Elliott Sales de Andrade --- @@ -9,10 +9,10 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml -index 506df79a..68835e4d 100644 +index a91256d4..0bd83d31 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -122,7 +122,7 @@ markers = [ +@@ -127,7 +127,7 @@ markers = [ "skip_with_pyarrow_strings: Tests that should be skipped when pyarrow string conversion is turned on", "xfail_with_pyarrow_strings: Tests that should be xfailed when pyarrow string conversion is turned on", ] @@ -22,5 +22,5 @@ index 506df79a..68835e4d 100644 # From Cython-1753 "ignore:can't resolve:ImportWarning", -- -2.41.0 +2.42.0 diff --git a/0003-TST-Increase-maximum-for-sizeof-test-to-pass-32-bit.patch b/0003-TST-Increase-maximum-for-sizeof-test-to-pass-32-bit.patch index 90fcdea..72e4c5e 100644 --- a/0003-TST-Increase-maximum-for-sizeof-test-to-pass-32-bit.patch +++ b/0003-TST-Increase-maximum-for-sizeof-test-to-pass-32-bit.patch @@ -1,7 +1,7 @@ -From b013f58c1bf2a06a4dc4aaf9b92d8921f75a2345 Mon Sep 17 00:00:00 2001 +From 4d70d754eac43c1152bfae750ad2df319b508a1d Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 20 Jul 2023 00:05:48 -0400 -Subject: [PATCH 3/4] TST: Increase maximum for sizeof test to pass 32-bit +Subject: [PATCH 3/6] TST: Increase maximum for sizeof test to pass 32-bit In that case, the result is 1244, which is ~2.6 * `sys.sizeof` (476), slightly over the 2 used in the existing test. @@ -25,5 +25,5 @@ index 9b43a7ae..866d119b 100644 -- -2.41.0 +2.42.0 diff --git a/0004-Fix-test_pandas_timestamp_overflow_pyarrow-condition.patch b/0004-Fix-test_pandas_timestamp_overflow_pyarrow-condition.patch index 6f3bb89..98f42ec 100644 --- a/0004-Fix-test_pandas_timestamp_overflow_pyarrow-condition.patch +++ b/0004-Fix-test_pandas_timestamp_overflow_pyarrow-condition.patch @@ -1,7 +1,7 @@ -From 68ac2712572889ca0770d1ff5626bfa12c72e856 Mon Sep 17 00:00:00 2001 +From 65c859e60bb56326a22722dc92bea63d30735ace Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 19 Aug 2023 16:49:33 -0400 -Subject: [PATCH 4/4] Fix test_pandas_timestamp_overflow_pyarrow condition +Subject: [PATCH 4/6] Fix test_pandas_timestamp_overflow_pyarrow condition The new behavior in pyarrow only occurs with Pandas 2.0 as well. @@ -11,10 +11,10 @@ Signed-off-by: Elliott Sales de Andrade 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dask/dataframe/io/tests/test_parquet.py b/dask/dataframe/io/tests/test_parquet.py -index 6c53cd6c..21e39657 100644 +index 518145cc..38ac7c40 100644 --- a/dask/dataframe/io/tests/test_parquet.py +++ b/dask/dataframe/io/tests/test_parquet.py -@@ -3373,13 +3373,13 @@ def test_pandas_timestamp_overflow_pyarrow(tmpdir): +@@ -3381,13 +3381,13 @@ def test_pandas_timestamp_overflow_pyarrow(tmpdir): table, f"{tmpdir}/file.parquet", use_deprecated_int96_timestamps=False ) @@ -32,5 +32,5 @@ index 6c53cd6c..21e39657 100644 from dask.dataframe.io.parquet.arrow import ArrowDatasetEngine as ArrowEngine -- -2.41.0 +2.42.0 diff --git a/0005-Allow-older-versioneer.patch b/0005-Allow-older-versioneer.patch new file mode 100644 index 0000000..461c9a4 --- /dev/null +++ b/0005-Allow-older-versioneer.patch @@ -0,0 +1,24 @@ +From fe84b30ae6d72bac68972da3594897fe4de9eef4 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Sat, 25 Nov 2023 20:22:50 -0500 +Subject: [PATCH 5/6] Allow older versioneer + +Signed-off-by: Elliott Sales de Andrade +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 0bd83d31..1f820da4 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,5 +1,5 @@ + [build-system] +-requires = ["setuptools>=62.6", "versioneer[toml]==0.29"] ++requires = ["setuptools>=62.6", "versioneer[toml]>=0.28"] + build-backend = "setuptools.build_meta" + + [project] +-- +2.42.0 + diff --git a/0006-Skip-an-unsupported-test.patch b/0006-Skip-an-unsupported-test.patch new file mode 100644 index 0000000..9c39a8b --- /dev/null +++ b/0006-Skip-an-unsupported-test.patch @@ -0,0 +1,25 @@ +From 71c47a4501b9eca50776efc74bbfda5aeba89d90 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Sat, 25 Nov 2023 23:01:54 -0500 +Subject: [PATCH 6/6] Skip an unsupported test + +Signed-off-by: Elliott Sales de Andrade +--- + dask/dataframe/io/tests/test_parquet.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dask/dataframe/io/tests/test_parquet.py b/dask/dataframe/io/tests/test_parquet.py +index 38ac7c40..d5ad8b5f 100644 +--- a/dask/dataframe/io/tests/test_parquet.py ++++ b/dask/dataframe/io/tests/test_parquet.py +@@ -4741,6 +4741,7 @@ def test_pyarrow_filesystem_option(tmp_path, fs): + + + @PYARROW_MARK ++@pytest.mark.network + @pytest.mark.slow + def test_pyarrow_filesystem_option_real_data(): + # See: https://github.com/dask/dask/pull/10590 +-- +2.42.0 + diff --git a/python-dask.spec b/python-dask.spec index ad3a588..7f33275 100644 --- a/python-dask.spec +++ b/python-dask.spec @@ -10,8 +10,8 @@ %global debug_package %{nil} Name: python-%{srcname} -Version: 2023.8.1 -%global tag 2023.8.1 +Version: 2023.11.0 +%global tag 2023.11.0 Release: %autorelease Summary: Parallel PyData with Task Scheduling @@ -28,6 +28,8 @@ Patch: 0003-TST-Increase-maximum-for-sizeof-test-to-pass-32-bit.patch Patch: 0004-Fix-test_pandas_timestamp_overflow_pyarrow-condition.patch # https://github.com/dask/dask/issues/10423 Patch: https://salsa.debian.org/python-team/packages/dask/-/raw/08ffea1b7b53e9c71c9a926d5786288c2e6c1b5b/debian/patches/force-little-endian-random.patch +Patch: 0005-Allow-older-versioneer.patch +Patch: 0006-Skip-an-unsupported-test.patch %description Dask is a flexible parallel computing library for analytics. diff --git a/sources b/sources index a7a3dad..ae429b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dask-2023.8.1.tar.gz) = ec8be64bdeef51bcc3168aa83073c2884950290ceb41b7f4d56553e91c507a227862b3bc827c67ce8a0b9b761955f76897cb073f5d9f5fb91cb2a966c01c6084 +SHA512 (dask-2023.11.0.tar.gz) = 7dc435b419da8f69c0f86627238c343bef3ce8bc78f4e41625c26994b4ea52f3ce5a433e25e069b93740df5bb40193c8eb49c1c749278277819e7f0a02025d97