Skip to content

Commit 8bdae53

Browse files
committed
Modify patches since the original ones doesn't apply.
1 parent 3c73513 commit 8bdae53

File tree

3 files changed

+4
-39
lines changed

3 files changed

+4
-39
lines changed

debian/patches/series

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ deb_skip_sequencelike_on_armel
1010
up_print_versions
1111
up_network_seaborn
1212
up_tst_dont_assert_that_a_bug_exists_in_numpy
13-
up_tst_np_argsort_comparison1
1413
up_tst_np_argsort_comparison2
1514
dateutil-2.6.1-fixed-ambiguous-tz-dst-be.patch
1615
mark_tests_working_on_intel.patch

debian/patches/up_tst_np_argsort_comparison1

-22
This file was deleted.

debian/patches/up_tst_np_argsort_comparison2

+4-16
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,11 @@ Subject: [PATCH] # Issue 17046 # # modified:
77
message in # TestMixedIntIndex.test_argsort and #
88
TestMixedIntIndex.test_numpy_argsort
99

10-
---
11-
doc/source/whatsnew/v0.21.0.txt | 1 +
12-
pandas/tests/indexes/test_base.py | 4 ++--
13-
2 files changed, 3 insertions(+), 2 deletions(-)
10+
Modified: Mo Zhou <[email protected]>
11+
Modification Note: Part of the original patch doesn't apply.
12+
Removed modification to doc/source/whatsnew/v0.21.0.txt from the original
13+
patch.
1414

15-
diff --git a/doc/source/whatsnew/v0.21.0.txt b/doc/source/whatsnew/v0.21.0.txt
16-
index 91d3e9e7b93..e4c50ec93f9 100644
17-
--- a/doc/source/whatsnew/v0.21.0.txt
18-
+++ b/doc/source/whatsnew/v0.21.0.txt
19-
@@ -259,6 +259,7 @@ Indexing
20-
- Fixes bug where indexing with ``np.inf`` caused an ``OverflowError`` to be raised (:issue:`16957`)
21-
- Bug in reindexing on an empty ``CategoricalIndex`` (:issue:`16770`)
22-
- Fixes ``DataFrame.loc`` for setting with alignment and tz-aware ``DatetimeIndex`` (:issue:`16889`)
23-
+- Fixes ``test_argsort``, ``test_numpy_argsort`` to cover both `>` and `<` in the error message (:issue:`17046`)
24-
25-
I/O
26-
^^^
2715
diff --git a/pandas/tests/indexes/test_base.py b/pandas/tests/indexes/test_base.py
2816
index 692cdd49579..842e8fea0df 100644
2917
--- a/pandas/tests/indexes/test_base.py

0 commit comments

Comments
 (0)