python3Packages.pandas: 1.2.2 -> 1.2.3

2 files changed, 41 insertions, 47 deletions

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 63244618f5b..7fd551e192c 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , buildPythonPackage
 , fetchPypi
 , python
@@ -8,37 +9,41 @@
 , cython
 , dateutil
 , html5lib
+, jinja2
 , lxml
 , numexpr
 , openpyxl
 , pytz
-, sqlalchemy
 , scipy
+, sqlalchemy
 , tables
 , xlrd
 , xlwt
-# Test Inputs
+# Test inputs
 , glibcLocales
 , hypothesis
 , pytestCheckHook
+, pytest-xdist
+, pytest-asyncio
+, XlsxWriter
 # Darwin inputs
 , runtimeShell
-, libcxx ? null
+, libcxx
 }:
 
 buildPythonPackage rec {
   pname = "pandas";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14ed84b463e9b84c8ff9308a79b04bf591ae3122a376ee0f62c68a1bd917a773";
+    sha256 = "078b4nncn6778ymmqn80j2q6n7fcs4d6bbaraar5nypgbaw10vyz";
   };
-  # See https://github.com/scipy/scipy/issues/13585 and https://github.com/pandas-dev/pandas/pull/40020
-  patches = [ ./fix-tests.patch ];
 
   nativeBuildInputs = [ cython ];
+
   buildInputs = lib.optional stdenv.isDarwin libcxx;
+
   propagatedBuildInputs = [
     beautifulsoup4
     bottleneck
@@ -55,58 +60,57 @@ buildPythonPackage rec {
     xlwt
   ];
 
-  checkInputs = [ pytestCheckHook glibcLocales hypothesis ];
+  checkInputs = [
+    glibcLocales
+    hypothesis
+    jinja2
+    pytest-asyncio
+    pytest-xdist
+    pytestCheckHook
+    XlsxWriter
+  ];
 
-  # doesn't work with -Werror,-Wunused-command-line-argument
+  # Doesn't work with -Werror,-Wunused-command-line-argument
   # https://github.com/NixOS/nixpkgs/issues/39687
   hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
 
-  # Parallel Cythonization is broken in Python 3.8 on Darwin. Fixed in the next
-  # release. https://github.com/pandas-dev/pandas/pull/30862
-  setupPyBuildFlags = lib.optionals (!(isPy38 && stdenv.isDarwin)) [
-    # As suggested by
-    # https://pandas.pydata.org/pandas-docs/stable/development/contributing.html#creating-a-python-environment
-    "--parallel=$NIX_BUILD_CORES"
-  ];
+  # For OSX, we need to add a dependency on libcxx, which provides
+  # `complex.h` and other libraries that pandas depends on to build.
+  postPatch = lib.optionalString stdenv.isDarwin ''
+    cpp_sdk="${libcxx}/include/c++/v1";
+    echo "Adding $cpp_sdk to the setup.py common_include variable"
+    substituteInPlace setup.py \
+      --replace "['pandas/src/klib', 'pandas/src']" \
+                "['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
+  '';
 
   doCheck = !stdenv.isAarch64; # upstream doesn't test this architecture
 
   pytestFlagsArray = [
     "--skip-slow"
     "--skip-network"
+    "--numprocesses" "0"
   ];
+
   disabledTests = [
-    # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat
-    # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case
-    "test_fallback_plural"
-    "test_ambiguous_flags"
-    "test_ambiguous_compat"
     # Locale-related
     "test_names"
     "test_dt_accessor_datetime_name_accessors"
     "test_datetime_name_accessors"
-    # Can't import from test folder
-    "test_oo_optimizable"
     # Disable IO related tests because IO data is no longer distributed
     "io"
-    # KeyError Timestamp
-    "test_to_excel"
-    # ordering logic has changed
-    "numpy_ufuncs_other"
-    "order_without_freq"
-    # tries to import from pandas.tests post install
+    # Tries to import from pandas.tests post install
     "util_in_top_level"
-    # Fails with 1.0.5
-    "test_constructor_list_frames"
-    "test_constructor_with_embedded_frames"
-    # tries to import compiled C extension locally
+    # Tries to import compiled C extension locally
     "test_missing_required_dependency"
+    # AssertionError with 1.2.3
+    "test_from_coo"
   ] ++ lib.optionals stdenv.isDarwin [
     "test_locale"
     "test_clipboard"
   ];
 
-  # tests have relative paths, and need to reference compiled C extensions
+  # Tests have relative paths, and need to reference compiled C extensions
   # so change directory where `import .test` is able to be resolved
   preCheck = ''
     cd $out/${python.sitePackages}/pandas
@@ -123,6 +127,8 @@ buildPythonPackage rec {
     export PATH=$(pwd):$PATH
   '';
 
+  pythonImportsCheck = [ "pandas" ];
+
   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
diff --git a/pkgs/development/python-modules/pandas/fix-tests.patch b/pkgs/development/python-modules/pandas/fix-tests.patch
deleted file mode 100644
index 8051cfec39a..00000000000
--- a/pkgs/development/python-modules/pandas/fix-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --color -ur a/pandas/tests/arrays/sparse/test_array.py b/pandas/tests/arrays/sparse/test_array.py
---- a/pandas/tests/arrays/sparse/test_array.py	2020-12-07 12:42:08.000000000 +0100
-+++ b/pandas/tests/arrays/sparse/test_array.py	2021-02-27 21:48:16.483903149 +0100
-@@ -1188,7 +1188,7 @@
-         row = [0, 3, 1, 0]
-         col = [0, 3, 1, 2]
-         data = [4, 5, 7, 9]
--        sp_array = scipy.sparse.coo_matrix((data, (row, col)))
-+        sp_array = scipy.sparse.coo_matrix((data, (row, col)), dtype="int")
-         result = pd.Series.sparse.from_coo(sp_array)
- 
-         index = pd.MultiIndex.from_arrays([[0, 0, 1, 3], [0, 2, 1, 3]])