From c6a8c743dbbf061702a16bd4555e741bcad5b1b2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 15 Sep 2023 14:06:39 +0200 Subject: python3Packages.pandas: 2.0.3 -> 2.1.0 https://pandas.pydata.org/pandas-docs/version/2.1.0/whatsnew/v2.1.0.html --- pkgs/development/python-modules/pandas/default.nix | 45 +++++++++++++++------- 1 file changed, 32 insertions(+), 13 deletions(-) (limited to 'pkgs/development/python-modules/pandas/default.nix') diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index e64f61e0dde..147366a2c51 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -1,13 +1,15 @@ { lib , stdenv , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder # build-system , cython +, meson-python +, meson , oldest-supported-numpy -, setuptools +, pkg-config , versioneer , wheel @@ -63,24 +65,42 @@ buildPythonPackage rec { pname = "pandas"; - version = "2.0.3"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-wC83Kojg0X820wk6ZExzz8F4jodqfEvLQCCndRLiBDw="; + src = fetchFromGitHub { + owner = "pandas-dev"; + repo = "pandas"; + rev = "refs/tags/v${version}"; + hash = "sha256-QwMW/qc1n51DaVhUnIaG0bdOvDitvvPh6ftoDawiYlc="; }; + patches = [ + # https://github.com/pandas-dev/pandas/issues/54888#issuecomment-1701186809 + ./installer-fix.patch + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "meson-python==0.13.1" "meson-python>=0.13.1" \ + --replace "meson==1.0.1" "meson>=1.0.1" + ''; + nativeBuildInputs = [ - setuptools cython + meson-python + meson numpy - oldest-supported-numpy + pkg-config versioneer wheel - ] ++ versioneer.optional-dependencies.toml; + ] + ++ versioneer.optional-dependencies.toml + ++ lib.optionals (pythonOlder "3.12") [ + oldest-supported-numpy + ]; enableParallelBuilding = true; @@ -193,10 +213,9 @@ buildPythonPackage rec { pytestFlagsArray = [ # https://github.com/pandas-dev/pandas/blob/main/test_fast.sh - "--skip-db" - "--skip-slow" - "--skip-network" - "-m" "'not single_cpu and not slow_arm'" + "-m" "'not single_cpu and not slow and not network and not db and not slow_arm'" + # https://github.com/pandas-dev/pandas/issues/54907 + "--no-strict-data-files" "--numprocesses" "4" ]; -- cgit 1.4.1 From fd09fc5776e73d0670b1790d23af97c14da11a9e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 22 Oct 2023 16:30:14 +0200 Subject: python311Packages.pandas: 2.1.0 -> 2.1.1 Changelog: https://pandas.pydata.org/pandas-docs/version/2.1.1/whatsnew/v2.1.1.html --- pkgs/development/python-modules/pandas/default.nix | 15 +++++-------- .../python-modules/pandas/installer-fix.patch | 25 ---------------------- 2 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 pkgs/development/python-modules/pandas/installer-fix.patch (limited to 'pkgs/development/python-modules/pandas/default.nix') diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 147366a2c51..5f3be77651a 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -65,27 +65,22 @@ buildPythonPackage rec { pname = "pandas"; - version = "2.1.0"; - format = "pyproject"; + version = "2.1.1"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pandas-dev"; repo = "pandas"; rev = "refs/tags/v${version}"; - hash = "sha256-QwMW/qc1n51DaVhUnIaG0bdOvDitvvPh6ftoDawiYlc="; + hash = "sha256-6SgW4BtO7EFnS8P8LL4AGk5EdPwOQ0+is0wXgqsm9w0="; }; - patches = [ - # https://github.com/pandas-dev/pandas/issues/54888#issuecomment-1701186809 - ./installer-fix.patch - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace "meson-python==0.13.1" "meson-python>=0.13.1" \ - --replace "meson==1.0.1" "meson>=1.0.1" + --replace "meson==1.2.1" "meson>=1.2.1" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pandas/installer-fix.patch b/pkgs/development/python-modules/pandas/installer-fix.patch deleted file mode 100644 index b1659c9dbb3..00000000000 --- a/pkgs/development/python-modules/pandas/installer-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/pandas/_libs/meson.build b/pandas/_libs/meson.build -index f302c649bc..ddce9ea2d6 100644 ---- a/pandas/_libs/meson.build -+++ b/pandas/_libs/meson.build -@@ -113,8 +113,4 @@ foreach ext_name, ext_dict : libs_sources - ) - endforeach - --py.install_sources('__init__.py', -- pure: false, -- subdir: 'pandas/_libs') -- - subdir('window') -diff --git a/pandas/_libs/tslibs/meson.build b/pandas/_libs/tslibs/meson.build -index 14d2eef46d..a862345c3a 100644 ---- a/pandas/_libs/tslibs/meson.build -+++ b/pandas/_libs/tslibs/meson.build -@@ -30,7 +30,3 @@ foreach ext_name, ext_dict : tslibs_sources - install: true - ) - endforeach -- --py.install_sources('__init__.py', -- pure: false, -- subdir: 'pandas/_libs/tslibs') -- cgit 1.4.1 From 2a3aff2620ec165364d93ae6341e0c067c90223d Mon Sep 17 00:00:00 2001 From: misuzu Date: Wed, 1 Nov 2023 14:57:46 +0200 Subject: python3Packages.pandas: fix build on 32-bit platforms --- pkgs/development/python-modules/pandas/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pkgs/development/python-modules/pandas/default.nix') diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 147366a2c51..d044c76ae8d 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -227,6 +227,9 @@ buildPythonPackage rec { "test_binops" # These tests are unreliable on aarch64-darwin. See https://github.com/pandas-dev/pandas/issues/38921. "test_rolling" + ] ++ lib.optional stdenv.is32bit [ + # https://github.com/pandas-dev/pandas/issues/37398 + "test_rolling_var_numerical_issues" ]; # Tests have relative paths, and need to reference compiled C extensions @@ -251,9 +254,8 @@ buildPythonPackage rec { ]; meta = with lib; { - # https://github.com/pandas-dev/pandas/issues/14866 - # pandas devs are no longer testing i686 so safer to assume it's broken - broken = stdenv.isi686; + # pandas devs no longer test i686, it's commonly broken + # broken = stdenv.isi686; changelog = "https://pandas.pydata.org/docs/whatsnew/index.html"; description = "Powerful data structures for data analysis, time series, and statistics"; downloadPage = "https://github.com/pandas-dev/pandas"; -- cgit 1.4.1