Skip to content

Commit da1c1ed

Browse files
committed
Merge remote-tracking branch 'upstream' into read-csv-from-directory
2 parents b14c470 + 8cf2e43 commit da1c1ed

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ jobs:
160160
run: echo "sdist_name=$(cd ./dist && ls -d */)" >> "$GITHUB_ENV"
161161

162162
- name: Build wheels
163-
uses: pypa/cibuildwheel@v3.1.3
163+
uses: pypa/cibuildwheel@v3.1.4
164164
with:
165165
package-dir: ./dist/${{ startsWith(matrix.buildplat[1], 'macosx') && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
166166
env:

pandas/tests/copy_view/test_methods.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
)
1717
import pandas._testing as tm
1818
from pandas.tests.copy_view.util import get_array
19+
from pandas.util.version import Version
1920

2021

2122
def test_copy():
@@ -917,8 +918,9 @@ def test_round(decimals):
917918

918919
assert tm.shares_memory(get_array(df2, "b"), get_array(df, "b"))
919920
# TODO: Make inplace by using out parameter of ndarray.round?
920-
if decimals >= 0:
921+
if decimals >= 0 and Version(np.__version__) < Version("2.4.0.dev0"):
921922
# Ensure lazy copy if no-op
923+
# TODO: Cannot rely on Numpy returning view after version 2.3
922924
assert np.shares_memory(get_array(df2, "a"), get_array(df, "a"))
923925
else:
924926
assert not np.shares_memory(get_array(df2, "a"), get_array(df, "a"))

0 commit comments

Comments
 (0)