Skip to content

Commit 3b37b30

Browse files
Backport PR #44822: CI: Troubleshoot CI (#44849)
1 parent 766ea00 commit 3b37b30

File tree

6 files changed

+5
-19
lines changed

6 files changed

+5
-19
lines changed

Diff for: .github/workflows/python-dev.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ jobs:
4848
shell: bash
4949
run: |
5050
python -m pip install --upgrade pip setuptools wheel
51-
# TODO: unpin
52-
pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple "numpy==1.23.0.dev0+101.ga81535a36"
51+
pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
5352
pip install git+https://github.com/nedbat/coveragepy.git
5453
pip install cython python-dateutil pytz hypothesis pytest>=6.2.5 pytest-xdist pytest-cov
5554
pip list

Diff for: ci/deps/actions-38-numpydev.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@ dependencies:
1818
- cython==0.29.24 # GH#34014
1919
- "--extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple"
2020
- "--pre"
21-
# TODO: Unpin
22-
- "numpy==1.23.0.dev0+101.ga81535a36"
21+
- "numpy"
2322
- "scipy"

Diff for: pandas/_libs/ops_dispatch.pyx

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ UFUNC_ALIASES = {
2626
"true_divide": "truediv",
2727
"power": "pow",
2828
"remainder": "mod",
29-
"divide": "div",
29+
"divide": "truediv",
3030
"equal": "eq",
3131
"not_equal": "ne",
3232
"less": "lt",

Diff for: pandas/tests/frame/constructors/test_from_records.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ def test_from_records_with_datetimes(self):
3434
arrdata = [np.array([datetime(2005, 3, 1, 0, 0), None])]
3535
dtypes = [("EXPIRY", "<M8[ns]")]
3636

37-
try:
38-
recarray = np.core.records.fromarrays(arrdata, dtype=dtypes)
39-
except (ValueError):
40-
pytest.skip("known failure of numpy rec array creation")
37+
recarray = np.core.records.fromarrays(arrdata, dtype=dtypes)
4138

4239
result = DataFrame.from_records(recarray)
4340
tm.assert_frame_equal(result, expected)

Diff for: pandas/tests/indexes/datetimes/test_indexing.py

-4
Original file line numberDiff line numberDiff line change
@@ -652,10 +652,6 @@ def test_get_indexer_mixed_dtypes(self, target):
652652
([date(9999, 1, 1), date(9999, 1, 1)], [-1, -1]),
653653
],
654654
)
655-
# FIXME: these warnings are flaky GH#36131
656-
@pytest.mark.filterwarnings(
657-
"ignore:Comparison of Timestamp with datetime.date:FutureWarning"
658-
)
659655
def test_get_indexer_out_of_bounds_date(self, target, positions):
660656
values = DatetimeIndex([Timestamp("2020-01-01"), Timestamp("2020-01-02")])
661657

Diff for: pandas/tests/plotting/test_datetimelike.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,7 @@ def check_format_of_first_point(ax, expected_string):
180180
first_line = ax.get_lines()[0]
181181
first_x = first_line.get_xdata()[0].ordinal
182182
first_y = first_line.get_ydata()[0]
183-
try:
184-
assert expected_string == ax.format_coord(first_x, first_y)
185-
except (ValueError):
186-
pytest.skip(
187-
"skipping test because issue forming test comparison GH7664"
188-
)
183+
assert expected_string == ax.format_coord(first_x, first_y)
189184

190185
annual = Series(1, index=date_range("2014-01-01", periods=3, freq="A-DEC"))
191186
_, ax = self.plt.subplots()

0 commit comments

Comments
 (0)