Skip to content

Commit 2426319

Browse files
authored
Merge branch 'master' into stringarray-nan
2 parents eb7d8f2 + 3713e9a commit 2426319

File tree

202 files changed

+4355
-2508
lines changed

Some content is hidden

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

202 files changed

+4355
-2508
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ jobs:
4141

4242
- uses: conda-incubator/setup-miniconda@v2
4343
with:
44+
mamba-version: "*"
45+
channels: conda-forge
4446
activate-environment: pandas-dev
4547
channel-priority: strict
4648
environment-file: ${{ env.ENV_FILE }}
@@ -104,6 +106,8 @@ jobs:
104106

105107
- uses: conda-incubator/setup-miniconda@v2
106108
with:
109+
mamba-version: "*"
110+
channels: conda-forge
107111
activate-environment: pandas-dev
108112
channel-priority: strict
109113
environment-file: ${{ env.ENV_FILE }}

.github/workflows/database.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ jobs:
8888

8989
- uses: conda-incubator/setup-miniconda@v2
9090
with:
91+
mamba-version: "*"
92+
channels: conda-forge
9193
activate-environment: pandas-dev
9294
channel-priority: strict
9395
environment-file: ${{ matrix.ENV_FILE }}

.github/workflows/posix.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ jobs:
8181

8282
- uses: conda-incubator/setup-miniconda@v2
8383
with:
84+
mamba-version: "*"
85+
channels: conda-forge
8486
activate-environment: pandas-dev
8587
channel-priority: flexible
8688
environment-file: ${{ env.ENV_FILE }}

.github/workflows/python-dev.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,11 @@ jobs:
4545
with:
4646
python-version: '3.10-dev'
4747

48+
# TODO: GH#44980 https://github.com/pypa/setuptools/issues/2941
4849
- name: Install dependencies
4950
shell: bash
5051
run: |
51-
python -m pip install --upgrade pip setuptools wheel
52+
python -m pip install --upgrade pip "setuptools<60.0.0" wheel
5253
pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
5354
pip install git+https://github.com/nedbat/coveragepy.git
5455
pip install cython python-dateutil pytz hypothesis pytest>=6.2.5 pytest-xdist pytest-cov

.github/workflows/sdist.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ jobs:
3939
with:
4040
python-version: ${{ matrix.python-version }}
4141

42+
# TODO: GH#44980 https://github.com/pypa/setuptools/issues/2941
4243
- name: Install dependencies
4344
run: |
44-
python -m pip install --upgrade pip setuptools wheel
45+
python -m pip install --upgrade pip "setuptools<60.0.0" wheel
4546
4647
# GH 39416
4748
pip install numpy
@@ -57,8 +58,10 @@ jobs:
5758
channels: conda-forge
5859
python-version: '${{ matrix.python-version }}'
5960

61+
# TODO: GH#44980 https://github.com/pypa/setuptools/issues/2941
6062
- name: Install pandas from sdist
6163
run: |
64+
python -m pip install --upgrade "setuptools<60.0.0"
6265
pip list
6366
python -m pip install dist/*.gz
6467

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ global-exclude *.xpt
3636
global-exclude *.cpt
3737
global-exclude *.xz
3838
global-exclude *.zip
39+
global-exclude *.zst
3940
global-exclude *~
4041
global-exclude .DS_Store
4142
global-exclude .git*

asv_bench/benchmarks/frame_ctor.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,21 @@ def time_frame_from_arrays_sparse(self):
182182
)
183183

184184

185+
class From3rdParty:
186+
# GH#44616
187+
188+
def setup(self):
189+
try:
190+
import torch
191+
except ImportError:
192+
raise NotImplementedError
193+
194+
row = 700000
195+
col = 64
196+
self.val_tensor = torch.randn(row, col)
197+
198+
def time_from_torch(self):
199+
DataFrame(self.val_tensor)
200+
201+
185202
from .pandas_vb_common import setup # noqa: F401 isort:skip

azure-pipelines.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,14 @@ jobs:
3636
vmImage: ubuntu-18.04
3737

3838
steps:
39+
# TODO: GH#44980 https://github.com/pypa/setuptools/issues/2941
3940
- script: |
4041
docker pull quay.io/pypa/manylinux2014_i686
4142
docker run -v $(pwd):/pandas quay.io/pypa/manylinux2014_i686 \
4243
/bin/bash -xc "cd pandas && \
4344
/opt/python/cp38-cp38/bin/python -m venv ~/virtualenvs/pandas-dev && \
4445
. ~/virtualenvs/pandas-dev/bin/activate && \
45-
python -m pip install --no-deps -U pip wheel setuptools && \
46+
python -m pip install --no-deps -U pip wheel 'setuptools<60.0.0' && \
4647
pip install cython numpy python-dateutil pytz pytest pytest-xdist hypothesis pytest-azurepipelines && \
4748
python setup.py build_ext -q -j2 && \
4849
python -m pip install --no-build-isolation -e . && \

ci/azure/posix.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,16 @@ jobs:
88
vmImage: ${{ parameters.vmImage }}
99
strategy:
1010
matrix:
11-
${{ if eq(parameters.name, 'macOS') }}:
12-
py38_macos_1:
13-
ENV_FILE: ci/deps/azure-macos-38.yaml
14-
CONDA_PY: "38"
15-
PATTERN: "not slow"
16-
PYTEST_TARGET: "pandas/tests/[a-h]*"
17-
py38_macos_2:
18-
ENV_FILE: ci/deps/azure-macos-38.yaml
19-
CONDA_PY: "38"
20-
PATTERN: "not slow"
21-
PYTEST_TARGET: "pandas/tests/[i-z]*"
11+
py38_macos_1:
12+
ENV_FILE: ci/deps/azure-macos-38.yaml
13+
CONDA_PY: "38"
14+
PATTERN: "not slow"
15+
PYTEST_TARGET: "pandas/tests/[a-h]*"
16+
py38_macos_2:
17+
ENV_FILE: ci/deps/azure-macos-38.yaml
18+
CONDA_PY: "38"
19+
PATTERN: "not slow"
20+
PYTEST_TARGET: "pandas/tests/[i-z]*"
2221

2322
steps:
2423
- script: echo '##vso[task.prependpath]$(HOME)/miniconda3/bin'

ci/code_checks.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,22 +66,22 @@ if [[ -z "$CHECK" || "$CHECK" == "doctests" ]]; then
6666

6767
MSG='Doctests' ; echo $MSG
6868
python -m pytest --doctest-modules \
69+
pandas/_config/ \
6970
pandas/_libs/ \
71+
pandas/_testing/ \
7072
pandas/api/ \
7173
pandas/arrays/ \
7274
pandas/compat/ \
7375
pandas/core \
7476
pandas/errors/ \
75-
pandas/io/clipboard/ \
76-
pandas/io/json/ \
77-
pandas/io/excel/ \
78-
pandas/io/parsers/ \
79-
pandas/io/sas/ \
80-
pandas/io/sql.py \
81-
pandas/io/formats/format.py \
82-
pandas/io/formats/style.py \
83-
pandas/io/stata.py \
84-
pandas/tseries/
77+
pandas/io/ \
78+
pandas/plotting/ \
79+
pandas/tseries/ \
80+
pandas/util/ \
81+
pandas/_typing.py \
82+
pandas/_version.py \
83+
pandas/conftest.py \
84+
pandas/testing.py
8585
RET=$(($RET + $?)) ; echo $MSG "DONE"
8686

8787
MSG='Cython Doctests' ; echo $MSG

ci/deps/actions-38-db.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ channels:
33
- conda-forge
44
dependencies:
55
- python=3.8
6+
- pip
67

78
# tools
89
- cython>=0.29.24
@@ -45,9 +46,9 @@ dependencies:
4546
- xlrd
4647
- xlsxwriter
4748
- xlwt
48-
- pip
49+
- brotlipy
50+
- coverage
51+
- pandas-datareader
52+
- pyxlsb
4953
- pip:
50-
- brotlipy
51-
- coverage
52-
- pandas-datareader
53-
- pyxlsb
54+
- torch

ci/deps/actions-38-locale.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,4 @@ dependencies:
3333
- xlsxwriter
3434
- xlwt
3535
- pyarrow=1.0.1
36-
- pip
37-
- pip:
38-
- pyxlsb
36+
- pyxlsb

ci/deps/actions-38-slow.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,4 @@ dependencies:
3434
- xlsxwriter
3535
- xlwt
3636
- numba
37+
- zstandard

ci/deps/actions-39-slow.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies:
2626
- numexpr
2727
- numpy
2828
- openpyxl
29-
- pyarrow
29+
- pyarrow>2.0.1
3030
- pytables
3131
- python-dateutil
3232
- pytz
@@ -37,6 +37,5 @@ dependencies:
3737
- xlsxwriter
3838
- xlwt
3939
- pyreadstat
40-
- pip
41-
- pip:
42-
- pyxlsb
40+
- pyxlsb
41+
- zstandard

ci/deps/actions-39.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ dependencies:
2121
- jinja2
2222
- lxml
2323
- matplotlib
24+
- numpy # move up to solve before numba
2425
- numba
2526
- numexpr
26-
- numpy
2727
- openpyxl
28-
- pyarrow
28+
- pyarrow>2.0.1
2929
- pytables
3030
- python-dateutil
3131
- pytz
@@ -36,6 +36,5 @@ dependencies:
3636
- xlsxwriter
3737
- xlwt
3838
- pyreadstat
39-
- pip
40-
- pip:
41-
- pyxlsb
39+
- pyxlsb
40+
- zstandard

ci/deps/azure-macos-38.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,16 @@ dependencies:
2323
- numpy=1.18.5
2424
- openpyxl
2525
- pyarrow=1.0.1
26+
- pyreadstat
2627
- pytables
2728
- python-dateutil==2.8.1
2829
- pytz
30+
- pyxlsb
2931
- xarray
3032
- xlrd
3133
- xlsxwriter
3234
- xlwt
35+
- zstandard
3336
- pip
3437
- pip:
3538
- cython>=0.29.24
36-
- pyreadstat
37-
- pyxlsb

ci/deps/azure-windows-38.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@ dependencies:
3232
- xlrd
3333
- xlsxwriter
3434
- xlwt
35+
- zstandard

ci/deps/azure-windows-39.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,5 @@ dependencies:
3636
- xlsxwriter
3737
- xlwt
3838
- pyreadstat
39-
- pip
40-
- pip:
41-
- pyxlsb
39+
- pyxlsb
40+
- zstandard

ci/deps/circle-38-arm64.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ dependencies:
1212

1313
# pandas dependencies
1414
- botocore>=1.11
15+
- flask
16+
- moto
1517
- numpy
1618
- python-dateutil
1719
- pytz
20+
- zstandard
1821
- pip
19-
- flask
20-
- pip:
21-
- moto

ci/setup_env.sh

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ conda config --set ssl_verify false
4848
conda config --set quiet true --set always_yes true --set changeps1 false
4949
conda install pip conda # create conda to create a historical artifact for pip & setuptools
5050
conda update -n base conda
51+
conda install -y -c conda-forge mamba
5152

5253
echo "conda info -a"
5354
conda info -a
@@ -62,8 +63,8 @@ conda list
6263
conda remove --all -q -y -n pandas-dev
6364

6465
echo
65-
echo "conda env create -q --file=${ENV_FILE}"
66-
time conda env create -q --file="${ENV_FILE}"
66+
echo "mamba env create -q --file=${ENV_FILE}"
67+
time mamba env create -q --file="${ENV_FILE}"
6768

6869

6970
if [[ "$BITS32" == "yes" ]]; then
@@ -86,11 +87,6 @@ echo "w/o removing anything else"
8687
conda remove pandas -y --force || true
8788
pip uninstall -y pandas || true
8889

89-
echo
90-
echo "remove postgres if has been installed with conda"
91-
echo "we use the one from the CI"
92-
conda remove postgresql -y --force || true
93-
9490
echo
9591
echo "remove qt"
9692
echo "causes problems with the clipboard, we use xsel for that"
@@ -106,7 +102,8 @@ echo "[Build extensions]"
106102
python setup.py build_ext -q -j2
107103

108104
echo "[Updating pip]"
109-
python -m pip install --no-deps -U pip wheel setuptools
105+
# TODO: GH#44980 https://github.com/pypa/setuptools/issues/2941
106+
python -m pip install --no-deps -U pip wheel "setuptools<60.0.0"
110107

111108
echo "[Install pandas]"
112109
python -m pip install --no-build-isolation -e .
@@ -115,13 +112,4 @@ echo
115112
echo "conda list"
116113
conda list
117114

118-
# Install DB for Linux
119-
120-
if [[ -n ${SQL:0} ]]; then
121-
echo "installing dbs"
122-
mysql -e 'create database pandas_nosetest;'
123-
psql -c 'create database pandas_nosetest;' -U postgres
124-
else
125-
echo "not using dbs on non-linux Travis builds or Azure Pipelines"
126-
fi
127115
echo "done"

0 commit comments

Comments
 (0)