Skip to content

Commit 4e504f1

Browse files
simonjayhawkinssimonjayhawkins
committed
Merge remote-tracking branch 'upstream/master' into bisect
2 parents 1f3fa0c + e752928 commit 4e504f1

File tree

96 files changed

+4905
-8655
lines changed

Some content is hidden

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

96 files changed

+4905
-8655
lines changed

‎.github/workflows/database.yml

+186
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
1+
name: Database
2+
3+
on:
4+
push:
5+
branches: [master]
6+
pull_request:
7+
branches:
8+
- master
9+
- 1.2.x
10+
11+
env:
12+
PYTEST_WORKERS: "auto"
13+
PANDAS_CI: 1
14+
PATTERN: ((not slow and not network and not clipboard) or (single and db))
15+
16+
jobs:
17+
Linux_py37_locale:
18+
runs-on: ubuntu-latest
19+
defaults:
20+
run:
21+
shell: bash -l {0}
22+
23+
env:
24+
ENV_FILE: ci/deps/actions-37-locale.yaml
25+
LOCALE_OVERRIDE: zh_CN.UTF-8
26+
27+
services:
28+
mysql:
29+
image: mysql
30+
env:
31+
MYSQL_ALLOW_EMPTY_PASSWORD: yes
32+
MYSQL_DATABASE: pandas
33+
options: >-
34+
--health-cmd "mysqladmin ping"
35+
--health-interval 10s
36+
--health-timeout 5s
37+
--health-retries 5
38+
ports:
39+
- 3306:3306
40+
41+
postgres:
42+
image: postgres
43+
env:
44+
POSTGRES_USER: postgres
45+
POSTGRES_PASSWORD: postgres
46+
POSTGRES_DB: pandas
47+
options: >-
48+
--health-cmd pg_isready
49+
--health-interval 10s
50+
--health-timeout 5s
51+
--health-retries 5
52+
ports:
53+
- 5432:5432
54+
55+
steps:
56+
- name: Checkout
57+
uses: actions/checkout@v1
58+
59+
- name: Cache conda
60+
uses: actions/cache@v1
61+
env:
62+
CACHE_NUMBER: 0
63+
with:
64+
path: ~/conda_pkgs_dir
65+
key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{
66+
hashFiles('${{ env.ENV_FILE }}') }}
67+
68+
- uses: conda-incubator/setup-miniconda@v2
69+
with:
70+
activate-environment: pandas-dev
71+
channel-priority: strict
72+
environment-file: ${{ env.ENV_FILE }}
73+
use-only-tar-bz2: true
74+
75+
- name: Environment Detail
76+
run: |
77+
conda info
78+
conda list
79+
80+
- name: Build Pandas
81+
run: |
82+
python setup.py build_ext -j 2
83+
python -m pip install -e . --no-build-isolation --no-use-pep517
84+
85+
- name: Test
86+
run: ci/run_tests.sh
87+
if: always()
88+
89+
- name: Build Version
90+
run: pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
91+
92+
- name: Publish test results
93+
uses: actions/upload-artifact@master
94+
with:
95+
name: Test results
96+
path: test-data.xml
97+
if: failure()
98+
99+
- name: Print skipped tests
100+
run: python ci/print_skipped.py
101+
102+
Linux_py37_cov:
103+
runs-on: ubuntu-latest
104+
defaults:
105+
run:
106+
shell: bash -l {0}
107+
108+
env:
109+
ENV_FILE: ci/deps/actions-37-cov.yaml
110+
PANDAS_TESTING_MODE: deprecate
111+
COVERAGE: true
112+
113+
services:
114+
mysql:
115+
image: mysql
116+
env:
117+
MYSQL_ALLOW_EMPTY_PASSWORD: yes
118+
MYSQL_DATABASE: pandas
119+
options: >-
120+
--health-cmd "mysqladmin ping"
121+
--health-interval 10s
122+
--health-timeout 5s
123+
--health-retries 5
124+
ports:
125+
- 3306:3306
126+
127+
postgres:
128+
image: postgres
129+
env:
130+
POSTGRES_USER: postgres
131+
POSTGRES_PASSWORD: postgres
132+
POSTGRES_DB: pandas
133+
options: >-
134+
--health-cmd pg_isready
135+
--health-interval 10s
136+
--health-timeout 5s
137+
--health-retries 5
138+
ports:
139+
- 5432:5432
140+
141+
steps:
142+
- name: Checkout
143+
uses: actions/checkout@v1
144+
145+
- name: Cache conda
146+
uses: actions/cache@v1
147+
env:
148+
CACHE_NUMBER: 0
149+
with:
150+
path: ~/conda_pkgs_dir
151+
key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{
152+
hashFiles('${{ env.ENV_FILE }}') }}
153+
154+
- uses: conda-incubator/setup-miniconda@v2
155+
with:
156+
activate-environment: pandas-dev
157+
channel-priority: strict
158+
environment-file: ${{ env.ENV_FILE }}
159+
use-only-tar-bz2: true
160+
161+
- name: Environment Detail
162+
run: |
163+
conda info
164+
conda list
165+
166+
- name: Build Pandas
167+
run: |
168+
python setup.py build_ext -j 2
169+
python -m pip install -e . --no-build-isolation --no-use-pep517
170+
171+
- name: Test
172+
run: ci/run_tests.sh
173+
if: always()
174+
175+
- name: Build Version
176+
run: pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
177+
178+
- name: Publish test results
179+
uses: actions/upload-artifact@master
180+
with:
181+
name: Test results
182+
path: test-data.xml
183+
if: failure()
184+
185+
- name: Print skipped tests
186+
run: python ci/print_skipped.py

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ asv_bench/pandas/
110110
doc/source/generated
111111
doc/source/user_guide/styled.xlsx
112112
doc/source/reference/api
113-
doc/source/_static
113+
doc/source/_static/*.html
114114
doc/source/vbench
115115
doc/source/vbench.rst
116116
doc/source/index.rst

‎.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ repos:
162162
hooks:
163163
- id: yesqa
164164
- repo: https://github.com/pre-commit/pre-commit-hooks
165-
rev: v3.3.0
165+
rev: v3.4.0
166166
hooks:
167167
- id: end-of-file-fixer
168168
exclude: ^LICENSES/|\.(html|csv|txt|svg|py)$

‎.travis.yml

+1-16
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ services:
1616
# travis cache --delete inside the project directory from the travis command line client
1717
# The cache directories will be deleted if anything in ci/ changes in a commit
1818
cache:
19+
apt: true
1920
ccache: true
2021
directories:
2122
- $HOME/.cache # cython cache
2223

2324
env:
2425
global:
25-
- PYTEST_WORKERS="auto"
2626
# create a github personal access token
2727
# cd pandas-dev/pandas
2828
# travis encrypt 'PANDAS_GH_TOKEN=personal_access_token' -r pandas-dev/pandas
@@ -35,25 +35,10 @@ matrix:
3535
fast_finish: true
3636

3737
include:
38-
- env:
39-
- JOB="3.7, locale" ENV_FILE="ci/deps/travis-37-locale.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8" SQL="1"
40-
services:
41-
- mysql
42-
- postgresql
43-
4438
- arch: arm64
4539
env:
4640
- JOB="3.7, arm64" PYTEST_WORKERS=1 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard and not arm_slow)"
4741

48-
- env:
49-
# Enabling Deprecations when running tests
50-
# PANDAS_TESTING_MODE="deprecate" causes DeprecationWarning messages to be displayed in the logs
51-
# See pandas/_testing.py for more details.
52-
- JOB="3.7, coverage" ENV_FILE="ci/deps/travis-37-cov.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" PANDAS_TESTING_MODE="deprecate" COVERAGE=true SQL="1"
53-
services:
54-
- mysql
55-
- postgresql
56-
5742
allow_failures:
5843
# Moved to allowed_failures 2020-09-29 due to timeouts https://github.com/pandas-dev/pandas/issues/36719
5944
- arch: arm64

‎asv_bench/benchmarks/rolling.py

+18
Original file line numberDiff line numberDiff line change
@@ -252,4 +252,22 @@ def time_groupby_mean(self, engine):
252252
self.gb_ewm.mean(engine=engine)
253253

254254

255+
def table_method_func(x):
256+
return np.sum(x, axis=0) + 1
257+
258+
259+
class TableMethod:
260+
261+
params = ["single", "table"]
262+
param_names = ["method"]
263+
264+
def setup(self, method):
265+
self.df = pd.DataFrame(np.random.randn(10, 1000))
266+
267+
def time_apply(self, method):
268+
self.df.rolling(2, method=method).apply(
269+
table_method_func, raw=True, engine="numba"
270+
)
271+
272+
255273
from .pandas_vb_common import setup # noqa: F401 isort:skip

‎ci/deps/travis-37-cov.yaml renamed to ‎ci/deps/actions-37-cov.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515
- beautifulsoup4
1616
- botocore>=1.11
1717
- dask
18-
- fastparquet>=0.3.2
18+
- fastparquet>=0.4.0
1919
- fsspec>=0.7.4
2020
- gcsfs>=0.6.0
2121
- geopandas

‎ci/deps/travis-37-locale.yaml renamed to ‎ci/deps/actions-37-locale.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
name: pandas-dev
22
channels:
3-
- defaults
43
- conda-forge
54
dependencies:
65
- python=3.7.*
@@ -18,9 +17,9 @@ dependencies:
1817

1918
# optional
2019
- beautifulsoup4
21-
- blosc=1.15.0
20+
- blosc=1.17.0
2221
- python-blosc
23-
- fastparquet=0.3.2
22+
- fastparquet=0.4.0
2423
- html5lib
2524
- ipython
2625
- jinja2
@@ -43,5 +42,5 @@ dependencies:
4342

4443
# sql
4544
- psycopg2=2.7
46-
- pymysql=0.7.11
45+
- pymysql=0.8.1
4746
- sqlalchemy=1.3.0

‎ci/deps/azure-38-slow.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
name: pandas-dev
22
channels:
3-
- defaults
43
- conda-forge
54
dependencies:
65
- python=3.8.*

‎ci/deps/azure-windows-38.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515
# pandas dependencies
1616
- blosc
1717
- bottleneck
18-
- fastparquet>=0.3.2
18+
- fastparquet>=0.4.0
1919
- flask
2020
- fsspec>=0.8.0
2121
- matplotlib=3.1.3

0 commit comments

Comments
 (0)