Skip to content

Commit ce78c1d

Browse files
committed
Merge remote-tracking branch 'upstream/main' into ci
2 parents 4364252 + fd2c231 commit ce78c1d

File tree

218 files changed

+2244
-1445
lines changed

Some content is hidden

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

218 files changed

+2244
-1445
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ body:
1717
[latest version](https://pandas.pydata.org/docs/whatsnew/index.html) of pandas.
1818
required: true
1919
- label: >
20-
I have confirmed this bug exists on the main branch of pandas.
20+
I have confirmed this bug exists on the [main branch]
21+
(https://pandas.pydata.org/docs/dev/getting_started/install.html#installing-the-development-version-of-pandas)
22+
of pandas.
2123
- type: textarea
2224
id: example
2325
attributes:

.github/workflows/32-bit-linux.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
. ~/virtualenvs/pandas-dev/bin/activate && \
4040
python -m pip install --no-deps -U pip wheel 'setuptools<60.0.0' && \
4141
python -m pip install versioneer[toml] && \
42-
python -m pip install cython numpy python-dateutil pytz pytest pytest-xdist pytest-asyncio>=0.17 hypothesis && \
42+
python -m pip install cython numpy python-dateutil pytz pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17 hypothesis>=6.34.2 && \
4343
python setup.py build_ext -q -j1 && \
4444
python -m pip install --no-build-isolation --no-use-pep517 -e . && \
4545
python -m pip list && \

.github/workflows/python-dev.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ jobs:
7575
run: |
7676
python --version
7777
python -m pip install --upgrade pip setuptools wheel
78-
python -m pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
78+
python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
7979
python -m pip install git+https://github.com/nedbat/coveragepy.git
8080
python -m pip install versioneer[toml]
81-
python -m pip install python-dateutil pytz cython hypothesis==6.52.1 pytest>=6.2.5 pytest-xdist pytest-cov pytest-asyncio>=0.17
81+
python -m pip install python-dateutil pytz cython hypothesis>=6.34.2 pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-cov pytest-asyncio>=0.17
8282
python -m pip list
8383
8484
# GH 47305: Parallel build can cause flaky ImportError from pandas/_libs/tslibs

.github/workflows/wheels.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ jobs:
168168
# (1. Generate sdist 2. Build wheels from sdist)
169169
# This tests the sdists, and saves some build time
170170
python -m pip install dist/*.gz
171-
pip install hypothesis==6.52.1 pytest>=6.2.5 pytest-xdist pytest-asyncio>=0.17
171+
pip install hypothesis>=6.34.2 pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17
172172
cd .. # Not a good idea to test within the src tree
173173
python -c "import pandas; print(pandas.__version__);
174174
pandas.test(extra_args=['-m not clipboard and not single_cpu', '--skip-slow', '--skip-network', '--skip-db', '-n=2']);

asv_bench/asv.conf.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
// pip (with all the conda available packages installed first,
4242
// followed by the pip installed packages).
4343
"matrix": {
44-
"numpy": ["1.23.5"], // https://github.com/pandas-dev/pandas/pull/50356
44+
"numpy": [],
4545
"Cython": ["0.29.32"],
4646
"matplotlib": [],
4747
"sqlalchemy": [],

ci/deps/actions-310-numpydev.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
name: pandas-dev
22
channels:
3-
- defaults
3+
- conda-forge
44
dependencies:
55
- python=3.10
66

77
# build dependencies
88
- versioneer[toml]
99

1010
# test dependencies
11-
- pytest>=6.0
11+
- pytest>=7.0.0
1212
- pytest-cov
13-
- pytest-xdist>=1.31
14-
- hypothesis>=5.5.3
13+
- pytest-xdist>=2.2.0
14+
- hypothesis>=6.34.2
1515
- pytest-asyncio>=0.17
1616

1717
# pandas dependencies
@@ -22,5 +22,5 @@ dependencies:
2222
- "cython"
2323
- "--extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple"
2424
- "--pre"
25-
- "numpy<1.24"
25+
- "numpy"
2626
- "scipy"

ci/deps/actions-310.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ dependencies:
99
- cython>=0.29.32
1010

1111
# test dependencies
12-
- pytest>=6.0
12+
- pytest>=7.0.0
1313
- pytest-cov
14-
- pytest-xdist>=1.31
14+
- pytest-xdist>=2.2.0
1515
- psutil
1616
- pytest-asyncio>=0.17
1717
- boto3
1818

1919
# required dependencies
2020
- python-dateutil
21-
- numpy<1.24
21+
- numpy
2222
- pytz
2323

2424
# optional dependencies

ci/deps/actions-38-downstream_compat.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ dependencies:
1010
- cython>=0.29.32
1111

1212
# test dependencies
13-
- pytest>=6.0
13+
- pytest>=7.0.0
1414
- pytest-cov
15-
- pytest-xdist>=1.31
15+
- pytest-xdist>=2.2.0
1616
- psutil
1717
- pytest-asyncio>=0.17
1818
- boto3
1919

2020
# required dependencies
2121
- python-dateutil
22-
- numpy<1.24
22+
- numpy
2323
- pytz
2424

2525
# optional dependencies

ci/deps/actions-38-minimum_versions.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ dependencies:
1111
- cython>=0.29.32
1212

1313
# test dependencies
14-
- pytest>=6.0
14+
- pytest>=7.0.0
1515
- pytest-cov
16-
- pytest-xdist>=1.31
16+
- pytest-xdist>=2.2.0
1717
- psutil
1818
- pytest-asyncio>=0.17
1919
- boto3
@@ -31,7 +31,7 @@ dependencies:
3131
- fastparquet=0.6.3
3232
- fsspec=2021.07.0
3333
- html5lib=1.1
34-
- hypothesis=6.13.0
34+
- hypothesis=6.34.2
3535
- gcsfs=2021.07.0
3636
- jinja2=3.0.0
3737
- lxml=4.6.3

ci/deps/actions-38.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ dependencies:
99
- cython>=0.29.32
1010

1111
# test dependencies
12-
- pytest>=6.0
12+
- pytest>=7.0.0
1313
- pytest-cov
14-
- pytest-xdist>=1.31
14+
- pytest-xdist>=2.2.0
1515
- psutil
1616
- pytest-asyncio>=0.17
1717
- boto3
1818

1919
# required dependencies
2020
- python-dateutil
21-
- numpy<1.24
21+
- numpy
2222
- pytz
2323

2424
# optional dependencies

ci/deps/actions-39.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ dependencies:
99
- cython>=0.29.32
1010

1111
# test dependencies
12-
- pytest>=6.0
12+
- pytest>=7.0.0
1313
- pytest-cov
14-
- pytest-xdist>=1.31
14+
- pytest-xdist>=2.2.0
1515
- psutil
1616
- pytest-asyncio>=0.17
1717
- boto3
1818

1919
# required dependencies
2020
- python-dateutil
21-
- numpy<1.24
21+
- numpy
2222
- pytz
2323

2424
# optional dependencies

ci/deps/actions-pypy-38.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ dependencies:
1212
- cython>=0.29.32
1313

1414
# test dependencies
15-
- pytest>=6.0
15+
- pytest>=7.0.0
1616
- pytest-cov
1717
- pytest-asyncio
18-
- pytest-xdist>=1.31
19-
- hypothesis>=5.5.3
18+
- pytest-xdist>=2.2.0
19+
- hypothesis>=6.34.2
2020

2121
# required
22-
- numpy<1.24
22+
- numpy
2323
- python-dateutil
2424
- pytz

ci/deps/circle-38-arm64.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ dependencies:
99
- cython>=0.29.32
1010

1111
# test dependencies
12-
- pytest>=6.0
12+
- pytest>=7.0.0
1313
- pytest-cov
14-
- pytest-xdist>=1.31
14+
- pytest-xdist>=2.2.0
1515
- psutil
1616
- pytest-asyncio>=0.17
1717
- boto3
1818

1919
# required dependencies
2020
- python-dateutil
21-
- numpy<1.24
21+
- numpy
2222
- pytz
2323

2424
# optional dependencies

ci/test_wheels_windows.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ pd.test(extra_args=['-m not clipboard and single_cpu', '--skip-slow', '--skip-ne
44

55
python --version
66
pip install pytz six numpy python-dateutil
7-
pip install hypothesis==6.52.1 pytest>=6.2.5 pytest-xdist pytest-asyncio>=0.17
7+
pip install hypothesis>=6.34.2 pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17
88
pip install --find-links=pandas/dist --no-index pandas
9-
python -c "%test_command%"
9+
python -c "%test_command%"

doc/source/getting_started/install.rst

+18-2
Original file line numberDiff line numberDiff line change
@@ -201,15 +201,31 @@ Installing from source
201201

202202
See the :ref:`contributing guide <contributing>` for complete instructions on building from the git source tree. Further, see :ref:`creating a development environment <contributing_environment>` if you wish to create a pandas development environment.
203203

204+
Installing the development version of pandas
205+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
206+
207+
Installing a nightly build is the quickest way to:
208+
209+
* Try a new feature that will be shipped in the next release (that is, a feature from a pull-request that was recently merged to the main branch).
210+
* Check whether a bug you encountered has been fixed since the last release.
211+
212+
You can install the nightly build of pandas using the scipy-wheels-nightly index from the PyPI registry of anaconda.org with the following command::
213+
214+
pip install --pre --extra-index https://pypi.anaconda.org/scipy-wheels-nightly/simple pandas
215+
216+
Note that first uninstalling pandas might be required to be able to install nightly builds::
217+
218+
pip uninstall pandas -y
219+
204220
Running the test suite
205221
----------------------
206222

207223
pandas is equipped with an exhaustive set of unit tests, covering about 97% of
208224
the code base as of this writing. To run it on your machine to verify that
209225
everything is working (and that you have all of the dependencies, soft and hard,
210226
installed), make sure you have `pytest
211-
<https://docs.pytest.org/en/latest/>`__ >= 6.0 and `Hypothesis
212-
<https://hypothesis.readthedocs.io/en/latest/>`__ >= 6.13.0, then run:
227+
<https://docs.pytest.org/en/latest/>`__ >= 7.0 and `Hypothesis
228+
<https://hypothesis.readthedocs.io/en/latest/>`__ >= 6.34.2, then run:
213229

214230
::
215231

doc/source/whatsnew/v1.5.3.rst

+3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,12 @@ Fixed regressions
2727

2828
Bug fixes
2929
~~~~~~~~~
30+
- Bug in the Copy-on-Write implementation losing track of views when indexing a :class:`DataFrame` with another :class:`DataFrame` (:issue:`50630`)
3031
- Bug in :meth:`.Styler.to_excel` leading to error when unrecognized ``border-style`` (e.g. ``"hair"``) provided to Excel writers (:issue:`48649`)
32+
- Bug in :meth:`Series.quantile` emitting warning from NumPy when :class:`Series` has only ``NA`` values (:issue:`50681`)
3133
- Bug when chaining several :meth:`.Styler.concat` calls, only the last styler was concatenated (:issue:`49207`)
3234
- Fixed bug when instantiating a :class:`DataFrame` subclass inheriting from ``typing.Generic`` that triggered a ``UserWarning`` on python 3.11 (:issue:`49649`)
35+
- Bug in :func:`pandas.testing.assert_series_equal` (and equivalent ``assert_`` functions) when having nested data and using numpy >= 1.25 (:issue:`50360`)
3336
-
3437

3538
.. ---------------------------------------------------------------------------

0 commit comments

Comments
 (0)