Skip to content

Commit 46810e9

Browse files
committed
Merge remote-tracking branch 'upstream/main' into feat/cleanup_docs
2 parents df5ae5a + e92ea57 commit 46810e9

File tree

148 files changed

+1026
-1442
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+1026
-1442
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
fi
4747
- run:
4848
name: Build aarch64 wheels
49+
no_output_timeout: 30m # Sometimes the tests won't generate any output, make sure the job doesn't get killed by that
4950
command: |
5051
pip3 install cibuildwheel==2.14.1
5152
cibuildwheel --prerelease-pythons --output-dir wheelhouse

.github/workflows/wheels.yml

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

141141
- name: Build wheels
142-
uses: pypa/cibuildwheel@v2.14.1
142+
uses: pypa/cibuildwheel@v2.15.0
143143
with:
144144
package-dir: ./dist/${{ matrix.buildplat[1] == 'macosx_*' && env.sdist_name || needs.build_sdist.outputs.sdist_file }}
145145
env:

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ repos:
2424
hooks:
2525
- id: black
2626
- repo: https://github.com/astral-sh/ruff-pre-commit
27-
rev: v0.0.282
27+
rev: v0.0.284
2828
hooks:
2929
- id: ruff
3030
args: [--exit-non-zero-on-fix]

asv_bench/benchmarks/algos/isin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ def setup(self, series_type, vals_type):
247247
elif series_type == "long":
248248
ser_vals = np.arange(N_many)
249249
elif series_type == "long_floats":
250-
ser_vals = np.arange(N_many, dtype=np.float_)
250+
ser_vals = np.arange(N_many, dtype=np.float64)
251251

252252
self.series = Series(ser_vals).astype(object)
253253

@@ -258,7 +258,7 @@ def setup(self, series_type, vals_type):
258258
elif vals_type == "long":
259259
values = np.arange(N_many)
260260
elif vals_type == "long_floats":
261-
values = np.arange(N_many, dtype=np.float_)
261+
values = np.arange(N_many, dtype=np.float64)
262262

263263
self.values = values.astype(object)
264264

doc/source/conf.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,10 @@
242242
"footer_start": ["pandas_footer", "sphinx-version"],
243243
"github_url": "https://github.com/pandas-dev/pandas",
244244
"twitter_url": "https://twitter.com/pandas_dev",
245-
"analytics": {"google_analytics_id": "G-5RE31C1RNW"},
245+
"analytics": {
246+
"plausible_analytics_domain": "pandas.pydata.org",
247+
"plausible_analytics_url": "https://views.scientific-python.org/js/script.js",
248+
},
246249
"logo": {"image_dark": "https://pandas.pydata.org/static/img/pandas_white.svg"},
247250
"navbar_end": ["version-switcher", "theme-switcher", "navbar-icon-links"],
248251
"switcher": {

doc/source/getting_started/comparison/comparison_with_sql.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ methods.
107107
.. ipython:: python
108108
109109
frame = pd.DataFrame(
110-
{"col1": ["A", "B", np.NaN, "C", "D"], "col2": ["F", np.NaN, "G", "H", "I"]}
110+
{"col1": ["A", "B", np.nan, "C", "D"], "col2": ["F", np.nan, "G", "H", "I"]}
111111
)
112112
frame
113113

doc/source/getting_started/install.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ Package Minimum support
206206
`NumPy <https://numpy.org>`__ 1.22.4
207207
`python-dateutil <https://dateutil.readthedocs.io/en/stable/>`__ 2.8.2
208208
`pytz <https://pypi.org/project/pytz/>`__ 2020.1
209+
`tzdata <https://pypi.org/project/tzdata/>`__ 2022.1
209210
================================================================ ==========================
210211

211212
.. _install.optional_dependencies:

doc/source/reference/series.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ Datetime properties
314314
Series.dt.weekday
315315
Series.dt.dayofyear
316316
Series.dt.day_of_year
317+
Series.dt.days_in_month
317318
Series.dt.quarter
318319
Series.dt.is_month_start
319320
Series.dt.is_month_end
@@ -327,6 +328,7 @@ Datetime properties
327328
Series.dt.tz
328329
Series.dt.freq
329330
Series.dt.unit
331+
Series.dt.normalize
330332

331333
Datetime methods
332334
^^^^^^^^^^^^^^^^

doc/source/user_guide/enhancingperf.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ can be improved by passing an ``np.ndarray``.
183183
...: return s * dx
184184
...: cpdef np.ndarray[double] apply_integrate_f(np.ndarray col_a, np.ndarray col_b,
185185
...: np.ndarray col_N):
186-
...: assert (col_a.dtype == np.float_
187-
...: and col_b.dtype == np.float_ and col_N.dtype == np.int_)
186+
...: assert (col_a.dtype == np.float64
187+
...: and col_b.dtype == np.float64 and col_N.dtype == np.int_)
188188
...: cdef Py_ssize_t i, n = len(col_N)
189189
...: assert (len(col_a) == len(col_b) == n)
190190
...: cdef np.ndarray[double] res = np.empty(n)

doc/source/user_guide/gotchas.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ present in the more domain-specific statistical programming language `R
327327
``numpy.unsignedinteger`` | ``uint8, uint16, uint32, uint64``
328328
``numpy.object_`` | ``object_``
329329
``numpy.bool_`` | ``bool_``
330-
``numpy.character`` | ``string_, unicode_``
330+
``numpy.character`` | ``bytes_, str_``
331331

332332
The R language, by contrast, only has a handful of built-in data types:
333333
``integer``, ``numeric`` (floating-point), ``character``, and

doc/source/user_guide/io.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4881,7 +4881,7 @@ unspecified columns of the given DataFrame. The argument ``selector``
48814881
defines which table is the selector table (which you can make queries from).
48824882
The argument ``dropna`` will drop rows from the input ``DataFrame`` to ensure
48834883
tables are synchronized. This means that if a row for one of the tables
4884-
being written to is entirely ``np.NaN``, that row will be dropped from all tables.
4884+
being written to is entirely ``np.nan``, that row will be dropped from all tables.
48854885

48864886
If ``dropna`` is False, **THE USER IS RESPONSIBLE FOR SYNCHRONIZING THE TABLES**.
48874887
Remember that entirely ``np.Nan`` rows are not written to the HDFStore, so if

0 commit comments

Comments
 (0)