From 0d8a63d5ba75d055019da9fdc8ff107528ac7f9b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Feb 2024 17:30:02 +0100 Subject: [PATCH 1/4] python311Packages.fastparquet: 2023.7.0 -> 2024.2.0 Diff: https://github.com/dask/fastparquet/compare/refs/tags/2023.7.0...2024.2.0 --- .../python-modules/fastparquet/default.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 9105fbd40612..1ceeecafb638 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -20,18 +20,27 @@ buildPythonPackage rec { pname = "fastparquet"; - version = "2023.7.0"; - format = "pyproject"; + version = "2024.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dask"; - repo = pname; - rev = version; - hash = "sha256-pJ0zK0upEV7TyuNMIcozugkwBlYpK/Dg6BdB0kBpn9k="; + repo = "fastparquet"; + rev = "refs/tags/${version}"; + hash = "sha256-e0gnC/HMYdrYdEwy6qNOD1J52xgN2x81oCG03YNsYjg="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"pytest-runner"' "" + + sed -i \ + -e "/pytest-runner/d" \ + -e '/"git", "status"/d' setup.py + ''; + nativeBuildInputs = [ cython oldest-supported-numpy @@ -40,15 +49,6 @@ buildPythonPackage rec { wheel ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace '"pytest-runner"' "" - - sed -i \ - -e "/pytest-runner/d" \ - -e '/"git", "status"/d' setup.py - ''; - propagatedBuildInputs = [ cramjam fsspec @@ -85,7 +85,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A python implementation of the parquet format"; + description = "Implementation of the parquet format"; homepage = "https://github.com/dask/fastparquet"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ veprbl ]; From 41efe5f0d4b1cd42d6262e6cfc3a7ca72b094123 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Feb 2024 18:24:12 +0100 Subject: [PATCH 2/4] python311Packages.intake: disable failing tests --- .../python-modules/intake/default.nix | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index d4f9c66806ce..7bd61c505428 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , appdirs , bokeh , buildPythonPackage @@ -19,14 +20,14 @@ , pythonOlder , pyyaml , requests -, stdenv +, setuptools , tornado }: buildPythonPackage rec { pname = "intake"; version = "0.7.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -37,6 +38,10 @@ buildPythonPackage rec { hash = "sha256-LK4abwPViEFJZ10bbRofF2aw2Mj0dliKwX6dFy93RVQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ appdirs dask @@ -73,11 +78,6 @@ buildPythonPackage rec { ]; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner'" "" - ''; - __darwinAllowLocalNetworking = true; preCheck = '' @@ -120,6 +120,17 @@ buildPythonPackage rec { "test_columns" "test_df_transform" "test_pipeline_apply" + # GUI tests, AttributeError: 'MultiSelect' object has no attribute 'set_param' + "test_par_selector" + "test_gui_open_plot_panel" + "test_gui_open_search_panel" + "test_gui_close_and_open_cat" + "test_gui_close_and_open_source" + "test_gui_clone_plot" + "test_gui_rename_plot" + "test_gui_delete_plot" + "test_gui_edit_plot" + "test_gui_create_plot" ] ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ # Flaky with older low-res mtime on darwin < 10.13 (#143987) "test_second_load_timestamp" From 4114b7497ba33be17b08b9d6a01fec739533c587 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Feb 2024 18:32:36 +0100 Subject: [PATCH 3/4] python311Packages.intake: 0.7.0 -> 2.0.3 Changelog: https://github.com/intake/intake/blob/2.0.3/docs/source/changelog.rst --- .../python-modules/intake/default.nix | 48 ++++++++----------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 7bd61c505428..b15e90cda27f 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -21,12 +21,13 @@ , pyyaml , requests , setuptools +, setuptools-scm , tornado }: buildPythonPackage rec { pname = "intake"; - version = "0.7.0"; + version = "2.0.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,11 +36,12 @@ buildPythonPackage rec { owner = "intake"; repo = "intake"; rev = "refs/tags/${version}"; - hash = "sha256-LK4abwPViEFJZ10bbRofF2aw2Mj0dliKwX6dFy93RVQ="; + hash = "sha256-Fyv85HkoE9OPOoSHR1sgCG0iAFuSiQMT7cyZcQyLvv0="; }; nativeBuildInputs = [ setuptools + setuptools-scm ]; propagatedBuildInputs = [ @@ -85,6 +87,20 @@ buildPythonPackage rec { export PATH="$PATH:$out/bin"; ''; + disabledTestPaths = [ + # Missing plusins + "intake/catalog/tests/test_alias.py" + "intake/catalog/tests/test_gui.py" + "intake/catalog/tests/test_local.py" + "intake/catalog/tests/test_reload_integration.py" + "intake/source/tests/test_csv.py" + "intake/source/tests/test_derived.py" + "intake/source/tests/test_npy.py" + "intake/source/tests/test_text.py" + "intake/tests/test_config.py" + "intake/tests/test_top_level.py" + ]; + disabledTests = [ # Disable tests which touch network "http" @@ -103,34 +119,10 @@ buildPythonPackage rec { "test_remote_cat" "test_remote_env" # ValueError - "test_mlist_parameter" - # ImportError - "test_dataframe" - "test_ndarray" - "test_python" + "test_datasource_python_to_dask" + "test_catalog_passthrough" # Timing-based, flaky on darwin and possibly others "test_idle_timer" - # arrow-cpp-13 related - "test_read" - "test_pickle" - "test_read_dask" - "test_read_list" - "test_read_list_with_glob" - "test_to_dask" - "test_columns" - "test_df_transform" - "test_pipeline_apply" - # GUI tests, AttributeError: 'MultiSelect' object has no attribute 'set_param' - "test_par_selector" - "test_gui_open_plot_panel" - "test_gui_open_search_panel" - "test_gui_close_and_open_cat" - "test_gui_close_and_open_source" - "test_gui_clone_plot" - "test_gui_rename_plot" - "test_gui_delete_plot" - "test_gui_edit_plot" - "test_gui_create_plot" ] ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ # Flaky with older low-res mtime on darwin < 10.13 (#143987) "test_second_load_timestamp" From d8d9537046d24b76b29dd9feef0d6b9a3d43d2aa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Feb 2024 18:35:31 +0100 Subject: [PATCH 4/4] python311Packages.intake-parquet: refactor --- .../python-modules/intake-parquet/default.nix | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/intake-parquet/default.nix b/pkgs/development/python-modules/intake-parquet/default.nix index 9ef6affb5119..809d9efcc7ca 100644 --- a/pkgs/development/python-modules/intake-parquet/default.nix +++ b/pkgs/development/python-modules/intake-parquet/default.nix @@ -5,20 +5,34 @@ , dask , fastparquet , pyarrow +, setuptools +, pythonOlder }: buildPythonPackage rec { pname = "intake-parquet"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "intake"; - repo = pname; - rev = version; - sha256 = "sha256-zSwylXBKOM/tG5mwYtc0FmxwcKJ6j+lw1bxJqf57NY8="; + repo = "intake-parquet"; + rev = "refs/tags/${version}"; + hash = "sha256-zSwylXBKOM/tG5mwYtc0FmxwcKJ6j+lw1bxJqf57NY8="; }; + postPatch = '' + # Break circular dependency + substituteInPlace requirements.txt \ + --replace-fail "intake" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pandas dask @@ -26,12 +40,6 @@ buildPythonPackage rec { pyarrow ]; - postPatch = '' - # Break circular dependency - substituteInPlace requirements.txt \ - --replace "intake" "" - ''; - doCheck = false; #pythonImportsCheck = [ "intake_parquet" ];