From 3b37b307eec6962e4736920acd764ee6e72b8a1c Mon Sep 17 00:00:00 2001 From: MeeseeksMachine <39504233+meeseeksmachine@users.noreply.github.com> Date: Fri, 10 Dec 2021 18:28:06 -0800 Subject: [PATCH] Backport PR #44822: CI: Troubleshoot CI (#44849) --- .github/workflows/python-dev.yml | 3 +-- ci/deps/actions-38-numpydev.yaml | 3 +-- pandas/_libs/ops_dispatch.pyx | 2 +- pandas/tests/frame/constructors/test_from_records.py | 5 +---- pandas/tests/indexes/datetimes/test_indexing.py | 4 ---- pandas/tests/plotting/test_datetimelike.py | 7 +------ 6 files changed, 5 insertions(+), 19 deletions(-) diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml index d6b5901a5d196..4fe58ad4d60e9 100644 --- a/.github/workflows/python-dev.yml +++ b/.github/workflows/python-dev.yml @@ -48,8 +48,7 @@ jobs: shell: bash run: | python -m pip install --upgrade pip setuptools wheel - # TODO: unpin - pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple "numpy==1.23.0.dev0+101.ga81535a36" + pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy pip install git+https://github.com/nedbat/coveragepy.git pip install cython python-dateutil pytz hypothesis pytest>=6.2.5 pytest-xdist pytest-cov pip list diff --git a/ci/deps/actions-38-numpydev.yaml b/ci/deps/actions-38-numpydev.yaml index 3ce399b050eeb..ad2bd88177650 100644 --- a/ci/deps/actions-38-numpydev.yaml +++ b/ci/deps/actions-38-numpydev.yaml @@ -18,6 +18,5 @@ dependencies: - cython==0.29.24 # GH#34014 - "--extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple" - "--pre" - # TODO: Unpin - - "numpy==1.23.0.dev0+101.ga81535a36" + - "numpy" - "scipy" diff --git a/pandas/_libs/ops_dispatch.pyx b/pandas/_libs/ops_dispatch.pyx index f6ecef2038cf3..4273473b00eb1 100644 --- a/pandas/_libs/ops_dispatch.pyx +++ b/pandas/_libs/ops_dispatch.pyx @@ -26,7 +26,7 @@ UFUNC_ALIASES = { "true_divide": "truediv", "power": "pow", "remainder": "mod", - "divide": "div", + "divide": "truediv", "equal": "eq", "not_equal": "ne", "less": "lt", diff --git a/pandas/tests/frame/constructors/test_from_records.py b/pandas/tests/frame/constructors/test_from_records.py index 2322d5f995964..784551f685119 100644 --- a/pandas/tests/frame/constructors/test_from_records.py +++ b/pandas/tests/frame/constructors/test_from_records.py @@ -34,10 +34,7 @@ def test_from_records_with_datetimes(self): arrdata = [np.array([datetime(2005, 3, 1, 0, 0), None])] dtypes = [("EXPIRY", "