Skip to content

Commit c35c86d

Browse files
authored
Merge branch 'main' into fix/infer-dtype-numeric-with-na
2 parents ddd7e3b + 1da0d02 commit c35c86d

36 files changed

+839
-635
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
-----------------
77

8-
# pandas: powerful Python data analysis toolkit
8+
# pandas: A Powerful Python Data Analysis Toolkit
99

1010
| | |
1111
| --- | --- |

ci/deps/actions-310-minimum_versions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818
- pytest-xdist>=3.4.0
1919
- pytest-localserver>=0.8.1
2020
- pytest-qt>=4.4.0
21-
- boto3
21+
- boto3=1.37.3
2222

2323
# required dependencies
2424
- python-dateutil=2.8.2

ci/deps/actions-310.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
- pytest-xdist>=3.4.0
1717
- pytest-localserver>=0.8.1
1818
- pytest-qt>=4.4.0
19-
- boto3
19+
- boto3=1.37.3
2020

2121
# required dependencies
2222
- python-dateutil

ci/deps/actions-311-downstream_compat.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies:
1717
- pytest-xdist>=3.4.0
1818
- pytest-localserver>=0.8.1
1919
- pytest-qt>=4.4.0
20-
- boto3
20+
- boto3=1.37.3
2121

2222
# required dependencies
2323
- python-dateutil

ci/deps/actions-311.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
- pytest-xdist>=3.4.0
1717
- pytest-localserver>=0.8.1
1818
- pytest-qt>=4.4.0
19-
- boto3
19+
- boto3=1.37.3
2020

2121
# required dependencies
2222
- python-dateutil

ci/deps/actions-312.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
- pytest-xdist>=3.4.0
1717
- pytest-localserver>=0.8.1
1818
- pytest-qt>=4.4.0
19-
- boto3
19+
- boto3=1.37.3
2020

2121
# required dependencies
2222
- python-dateutil

ci/deps/actions-313.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
- pytest-xdist>=3.4.0
1717
- pytest-localserver>=0.8.1
1818
- pytest-qt>=4.4.0
19-
- boto3
19+
- boto3=1.37.3
2020

2121
# required dependencies
2222
- python-dateutil

doc/source/conf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@
114114
):
115115
exclude_patterns.append(rel_fname)
116116
elif single_doc and rel_fname != pattern:
117+
if "\\" in rel_fname:
118+
rel_fname = rel_fname.replace("\\", "/")
117119
exclude_patterns.append(rel_fname)
118120

119121
with open(os.path.join(source_path, "index.rst.template"), encoding="utf-8") as f:

doc/source/development/community.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Any community member can open issues to:
7777
- Ask questions, e.g. "I noticed the behavior of a certain function
7878
changed between versions. Is this expected?".
7979

80-
Ideally, your questions should be related to how pandas works rather
80+
- Ideally, your questions should be related to how pandas works rather
8181
than how you use pandas. `StackOverflow <https://stackoverflow.com/>`_ is
8282
better suited for answering usage questions, and we ask that all usage
8383
questions are first asked on StackOverflow. Thank you for respecting our

doc/source/development/contributing.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -234,14 +234,14 @@ and merged into project to appear the in the next release. To submit a pull requ
234234
#. Write a descriptive title that includes prefixes. pandas uses a convention for title
235235
prefixes. Here are some common ones along with general guidelines for when to use them:
236236

237-
* ENH: Enhancement, new functionality
238-
* BUG: Bug fix
239-
* DOC: Additions/updates to documentation
240-
* TST: Additions/updates to tests
241-
* BLD: Updates to the build process/scripts
242-
* PERF: Performance improvement
243-
* TYP: Type annotations
244-
* CLN: Code cleanup
237+
* ENH: Enhancement, new functionality
238+
* BUG: Bug fix
239+
* DOC: Additions/updates to documentation
240+
* TST: Additions/updates to tests
241+
* BLD: Updates to the build process/scripts
242+
* PERF: Performance improvement
243+
* TYP: Type annotations
244+
* CLN: Code cleanup
245245

246246
#. Write a description of your changes in the ``Preview Discussion`` tab
247247
#. Click ``Send Pull Request``.

0 commit comments

Comments
 (0)