Skip to content

Commit 3df5cf3

Browse files
Merge branch 'master' into read-excel-bug-dtype
2 parents 57c65e5 + 226876a commit 3df5cf3

File tree

101 files changed

+1822
-646
lines changed

Some content is hidden

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

101 files changed

+1822
-646
lines changed

.github/workflows/database.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
run: python ci/print_skipped.py
105105

106106
- name: Upload coverage to Codecov
107-
uses: codecov/codecov-action@v1
107+
uses: codecov/codecov-action@v2
108108
with:
109109
flags: unittests
110110
name: codecov-pandas

.github/workflows/posix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
run: python ci/print_skipped.py
9595

9696
- name: Upload coverage to Codecov
97-
uses: codecov/codecov-action@v1
97+
uses: codecov/codecov-action@v2
9898
with:
9999
flags: unittests
100100
name: codecov-pandas

.github/workflows/python-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
coverage report -m
7979
8080
- name: Upload coverage to Codecov
81-
uses: codecov/codecov-action@v1
81+
uses: codecov/codecov-action@v2
8282
with:
8383
flags: unittests
8484
name: codecov-pandas

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ repos:
110110
entry: python scripts/generate_pip_deps_from_conda.py
111111
files: ^(environment.yml|requirements-dev.txt)$
112112
pass_filenames: false
113-
additional_dependencies: [pyyaml]
113+
additional_dependencies: [pyyaml, toml]
114114
- id: sync-flake8-versions
115115
name: Check flake8 version is synced across flake8, yesqa, and environment.yml
116116
language: python

asv_bench/benchmarks/groupby.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,18 @@ def time_category_size(self):
369369
self.draws.groupby(self.cats).size()
370370

371371

372+
class Shift:
373+
def setup(self):
374+
N = 18
375+
self.df = DataFrame({"g": ["a", "b"] * 9, "v": list(range(N))})
376+
377+
def time_defaults(self):
378+
self.df.groupby("g").shift()
379+
380+
def time_fill_value(self):
381+
self.df.groupby("g").shift(fill_value=99)
382+
383+
372384
class FillNA:
373385
def setup(self):
374386
N = 100

asv_bench/benchmarks/reshape.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ def setup(self, dtype):
102102
columns = np.arange(n)
103103
if dtype == "int":
104104
values = np.arange(m * m * n).reshape(m * m, n)
105+
self.df = DataFrame(values, index, columns)
105106
else:
106107
# the category branch is ~20x slower than int. So we
107108
# cut down the size a bit. Now it's only ~3x slower.
@@ -111,7 +112,10 @@ def setup(self, dtype):
111112
values = np.take(list(string.ascii_letters), indices)
112113
values = [pd.Categorical(v) for v in values.T]
113114

114-
self.df = DataFrame(values, index, columns)
115+
self.df = DataFrame(
116+
{i: cat for i, cat in enumerate(values)}, index, columns
117+
)
118+
115119
self.df2 = self.df.iloc[:-1]
116120

117121
def time_full_product(self, dtype):

ci/code_checks.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ if [[ -z "$CHECK" || "$CHECK" == "doctests" ]]; then
121121
pandas/io/parsers/ \
122122
pandas/io/sas/ \
123123
pandas/io/sql.py \
124+
pandas/io/formats/format.py \
125+
pandas/io/formats/style.py \
126+
pandas/io/stata.py \
124127
pandas/tseries/
125128
RET=$(($RET + $?)) ; echo $MSG "DONE"
126129

ci/deps/actions-38-locale.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818
- html5lib
1919
- ipython
2020
- jinja2
21-
- jedi<0.18.0
21+
- jedi
2222
- lxml
2323
- matplotlib<3.3.0
2424
- moto

ci/deps/actions-39-slow.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ dependencies:
2323
- matplotlib
2424
- moto>=1.3.14
2525
- flask
26+
- numba
2627
- numexpr
2728
- numpy
2829
- openpyxl

ci/deps/actions-39.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ dependencies:
2222
- matplotlib
2323
- moto>=1.3.14
2424
- flask
25+
- numba
2526
- numexpr
2627
- numpy
2728
- openpyxl

0 commit comments

Comments
 (0)