Skip to content

Commit a139670

Browse files
author
MarcoGorelli
committed
Merge remote-tracking branch 'upstream/main' into coercion
2 parents 62e3324 + 0986922 commit a139670

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

environment.yml

-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ dependencies:
1616
- pytest-xdist>=1.31
1717
- psutil
1818
- pytest-asyncio>=0.17
19-
- boto3
2019
- coverage
2120

2221
# required dependencies
@@ -28,7 +27,6 @@ dependencies:
2827
- beautifulsoup4
2928
- blosc
3029
- brotlipy
31-
- botocore
3230
- bottleneck
3331
- fastparquet
3432
- fsspec

pandas/tests/apply/test_frame_apply.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,8 @@ def test_with_dictlike_columns_with_datetime():
836836
df["author"] = ["X", "Y", "Z"]
837837
df["publisher"] = ["BBC", "NBC", "N24"]
838838
df["date"] = pd.to_datetime(
839-
["17-10-2010 07:15:30", "13-05-2011 08:20:35", "15-01-2013 09:09:09"]
839+
["17-10-2010 07:15:30", "13-05-2011 08:20:35", "15-01-2013 09:09:09"],
840+
dayfirst=True,
840841
)
841842
result = df.apply(lambda x: {}, axis=1)
842843
expected = Series([{}, {}, {}])

requirements-dev.txt

-2
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@ pytest-cov
99
pytest-xdist>=1.31
1010
psutil
1111
pytest-asyncio>=0.17
12-
boto3
1312
coverage
1413
python-dateutil
1514
numpy
1615
pytz
1716
beautifulsoup4
1817
blosc
1918
brotlipy
20-
botocore
2119
bottleneck
2220
fastparquet
2321
fsspec

0 commit comments

Comments
 (0)