Skip to content

Updating my fork #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 51 commits into from
Aug 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
a21ce87
BUG: GroupBy.count() and GroupBy.sum() incorreclty return NaN instead…
smithto1 Aug 7, 2020
ce03883
To latex position (#35284)
SylvainLan Aug 7, 2020
dfa546e
BUG: GroupBy.apply() returns different results if a different GroupBy…
smithto1 Aug 7, 2020
9843926
CLN: clarify TypeError for IndexSlice argument to pd.xs (#35411)
arw2019 Aug 7, 2020
1922ec4
BUG: Ensure rolling groupby doesn't segfault with center=True (#35562)
mroeschke Aug 7, 2020
23dcab5
DOC: Docstring updated for DataFrame.equals (#34508)
pandeydeepak0 Aug 7, 2020
319a6d3
REF: use unpack_zerodim_and_defer on EA methods (#34042)
jbrockmendel Aug 7, 2020
067f86f
PERF: BlockManager.equals blockwise (#35357)
jbrockmendel Aug 7, 2020
f194094
BUG: DataFrameGroupBy.__getitem__ fails to propagate dropna (#35078)
arw2019 Aug 7, 2020
16bd49d
BUG: fix styler cell_ids arg so that blank style is ignored on False …
attack68 Aug 7, 2020
92bf41a
BUG: assign consensus name to index union in array case GH13475 (#35338)
iamlemec Aug 7, 2020
47c17cb
REGR: Fix conversion of mixed dtype DataFrame to numpy str (#35473)
dsaxton Aug 7, 2020
fa92ece
DOC: corrected statement about compression support for file objects i…
twoertwein Aug 8, 2020
a9cb64a
CI: Linux py36_locale failures with pytest DeprecationWarning (#35621)
simonjayhawkins Aug 8, 2020
188ce73
REF: Avoid post-processing in blockwise op (#35356)
jbrockmendel Aug 8, 2020
71a327c
DOC: docstrings for __array_wrap__ (#35629)
simonjayhawkins Aug 8, 2020
aefae55
TYP: update setup.cfg (#35628)
simonjayhawkins Aug 8, 2020
6875a05
BUG: RollingGroupby with closed and column selection no longer raises…
mroeschke Aug 10, 2020
5dee73b
DEPR: Deprecate inplace param in MultiIndex.set_codes and MultiIndex.…
topper-123 Aug 10, 2020
2560173
REF: Simplify Index.copy (#35592)
topper-123 Aug 10, 2020
9a8152c
BUG: Fix assert_equal when check_exact=True for non-numeric dtypes #3…
ivirshup Aug 10, 2020
df1d440
Storage options (#35381)
martindurant Aug 10, 2020
32abe63
REF/PERF: Move MultiIndex._tuples to MultiIndex._cache (#35641)
topper-123 Aug 10, 2020
cac9f28
Doc notes for core team members (#35608)
TomAugspurger Aug 10, 2020
993ab08
BUG: DataFrame.apply with func altering row in-place (#35633)
jbrockmendel Aug 11, 2020
0639e7f
REF: use consistent pattern in tslibs.vectorized (#35613)
jbrockmendel Aug 11, 2020
c87e40c
[FIX] Handle decimal and thousand separator in 'round_trip' converer …
ales-erjavec Aug 11, 2020
8380708
Drop Python 3.6 support (#35214)
fangchenli Aug 11, 2020
3c87b01
CI/TST: change skip to xfail #35660 (#35672)
fangchenli Aug 11, 2020
59ffa25
CLN: consistent signatures for equals methods (#35636)
simonjayhawkins Aug 12, 2020
bf8e9ef
BUG: Support custom BaseIndexers in groupby.rolling (#35647)
mroeschke Aug 12, 2020
8145ea6
REF: _cython_agg_blocks follow patterns similar to _apply_blockwise (…
jbrockmendel Aug 12, 2020
a0896e1
BUG: to_pickle/read_pickle do not close user-provided file objects (#…
twoertwein Aug 12, 2020
4079505
BUG: GH-35558 merge_asof tolerance error (#35654)
ikedaosushi Aug 13, 2020
288c8ed
Reorganize imports to be compliant with isort (and conventional) (#35…
el-iot Aug 13, 2020
7a67592
add web/ directory to isort checks (#35709)
el-iot Aug 13, 2020
e530066
PERF: make RangeIndex iterate over ._range (#35676)
topper-123 Aug 13, 2020
542b20a
Refactor tables latex (#35649)
SylvainLan Aug 13, 2020
ed23eb8
CI: avoid file leaks in sas_xport tests (#35693)
jbrockmendel Aug 13, 2020
59febbd
BUG/ENH: consistent gzip compression arguments (#35645)
twoertwein Aug 13, 2020
6ea8474
REGR: Dataframe.reset_index() on empty DataFrame with MI and datatime…
simonjayhawkins Aug 14, 2020
faa6e36
CLN: remove extant uses of built-in filter function (#35717)
simonjayhawkins Aug 14, 2020
ba3400d
BUG: Styler cell_ids fails on multiple renders (#35664)
attack68 Aug 14, 2020
21eb4e6
REGR: fix DataFrame.diff with read-only data (#35707)
jorisvandenbossche Aug 14, 2020
3989493
[BUG] fixed DateOffset pickle bug when months >= 12 (#35258)
fujiaxiang Aug 14, 2020
7c31b2d
CLN: remove unused variable (#35726)
jbrockmendel Aug 14, 2020
0658ce3
agg with list of non-aggregating functions (#35723)
rhshadrach Aug 14, 2020
6325a33
BLD: bump xlrd min version to 1.2.0 (#35728)
jbrockmendel Aug 14, 2020
a3f5c6a
Fix broken link in cookbook.rst (#35729)
estasney Aug 14, 2020
ed11655
CI: Min Pytest Cov Version/Restrict xdist version (#35754)
alimcmaster1 Aug 17, 2020
0abfc7e
REGR: Fix interpolation on empty dataframe (#35543)
sanderland Aug 17, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ matrix:
- JOB="3.7, arm64" PYTEST_WORKERS=8 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard)"

- env:
- JOB="3.6, locale" ENV_FILE="ci/deps/travis-36-locale.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8" SQL="1"
- 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"
services:
- mysql
- postgresql
Expand All @@ -54,7 +54,7 @@ matrix:
# Enabling Deprecations when running tests
# PANDAS_TESTING_MODE="deprecate" causes DeprecationWarning messages to be displayed in the logs
# See pandas/_testing.py for more details.
- JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36-cov.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" PANDAS_TESTING_MODE="deprecate" COVERAGE=true SQL="1"
- 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"
services:
- mysql
- postgresql
Expand Down
24 changes: 16 additions & 8 deletions asv_bench/benchmarks/index_object.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ def time_datetime_difference_disjoint(self):

class Range:
def setup(self):
self.idx_inc = RangeIndex(start=0, stop=10 ** 7, step=3)
self.idx_dec = RangeIndex(start=10 ** 7, stop=-1, step=-3)
self.idx_inc = RangeIndex(start=0, stop=10 ** 6, step=3)
self.idx_dec = RangeIndex(start=10 ** 6, stop=-1, step=-3)

def time_max(self):
self.idx_inc.max()
Expand All @@ -73,15 +73,23 @@ def time_min_trivial(self):
self.idx_inc.min()

def time_get_loc_inc(self):
self.idx_inc.get_loc(900000)
self.idx_inc.get_loc(900_000)

def time_get_loc_dec(self):
self.idx_dec.get_loc(100000)
self.idx_dec.get_loc(100_000)

def time_iter_inc(self):
for _ in self.idx_inc:
pass

def time_iter_dec(self):
for _ in self.idx_dec:
pass


class IndexEquals:
def setup(self):
idx_large_fast = RangeIndex(100000)
idx_large_fast = RangeIndex(100_000)
idx_small_slow = date_range(start="1/1/2012", periods=1)
self.mi_large_slow = MultiIndex.from_product([idx_large_fast, idx_small_slow])

Expand All @@ -94,7 +102,7 @@ def time_non_object_equals_multiindex(self):
class IndexAppend:
def setup(self):

N = 10000
N = 10_000
self.range_idx = RangeIndex(0, 100)
self.int_idx = self.range_idx.astype(int)
self.obj_idx = self.int_idx.astype(str)
Expand Down Expand Up @@ -168,7 +176,7 @@ def time_get_loc_non_unique_sorted(self, dtype):
class Float64IndexMethod:
# GH 13166
def setup(self):
N = 100000
N = 100_000
a = np.arange(N)
self.ind = Float64Index(a * 4.8000000418824129e-08)

Expand Down Expand Up @@ -212,7 +220,7 @@ class GC:
params = [1, 2, 5]

def create_use_drop(self):
idx = Index(list(range(1000 * 1000)))
idx = Index(list(range(1_000_000)))
idx._engine

def peakmem_gc_instances(self, N):
Expand Down
24 changes: 9 additions & 15 deletions asv_bench/benchmarks/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,16 @@
import subprocess
import sys

from pandas.compat import PY37


class TimeImport:
def time_import(self):
if PY37:
# on py37+ we the "-X importtime" usage gives us a more precise
# measurement of the import time we actually care about,
# without the subprocess or interpreter overhead
cmd = [sys.executable, "-X", "importtime", "-c", "import pandas as pd"]
p = subprocess.run(cmd, stderr=subprocess.PIPE)

line = p.stderr.splitlines()[-1]
field = line.split(b"|")[-2].strip()
total = int(field) # microseconds
return total
# on py37+ we the "-X importtime" usage gives us a more precise
# measurement of the import time we actually care about,
# without the subprocess or interpreter overhead
cmd = [sys.executable, "-X", "importtime", "-c", "import pandas as pd"]
p = subprocess.run(cmd, stderr=subprocess.PIPE)

cmd = [sys.executable, "-c", "import pandas as pd"]
subprocess.run(cmd, stderr=subprocess.PIPE)
line = p.stderr.splitlines()[-1]
field = line.split(b"|")[-2].strip()
total = int(field) # microseconds
return total
52 changes: 26 additions & 26 deletions ci/azure/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,57 +9,57 @@ jobs:
strategy:
matrix:
${{ if eq(parameters.name, 'macOS') }}:
py36_macos:
ENV_FILE: ci/deps/azure-macos-36.yaml
CONDA_PY: "36"
py37_macos:
ENV_FILE: ci/deps/azure-macos-37.yaml
CONDA_PY: "37"
PATTERN: "not slow and not network"

${{ if eq(parameters.name, 'Linux') }}:
py36_minimum_versions:
ENV_FILE: ci/deps/azure-36-minimum_versions.yaml
CONDA_PY: "36"
py37_minimum_versions:
ENV_FILE: ci/deps/azure-37-minimum_versions.yaml
CONDA_PY: "37"
PATTERN: "not slow and not network and not clipboard"

py36_locale_slow_old_np:
ENV_FILE: ci/deps/azure-36-locale_slow.yaml
CONDA_PY: "36"
py37_locale_slow:
ENV_FILE: ci/deps/azure-37-locale_slow.yaml
CONDA_PY: "37"
PATTERN: "slow"
# pandas does not use the language (zh_CN), but should support different encodings (utf8)
# we should test with encodings different than utf8, but doesn't seem like Ubuntu supports any
LANG: "zh_CN.utf8"
LC_ALL: "zh_CN.utf8"
EXTRA_APT: "language-pack-zh-hans"

py36_slow:
ENV_FILE: ci/deps/azure-36-slow.yaml
CONDA_PY: "36"
py37_slow:
ENV_FILE: ci/deps/azure-37-slow.yaml
CONDA_PY: "37"
PATTERN: "slow"

py36_locale:
ENV_FILE: ci/deps/azure-36-locale.yaml
CONDA_PY: "36"
py37_locale:
ENV_FILE: ci/deps/azure-37-locale.yaml
CONDA_PY: "37"
PATTERN: "not slow and not network"
LANG: "it_IT.utf8"
LC_ALL: "it_IT.utf8"
EXTRA_APT: "language-pack-it xsel"

#py36_32bit:
# ENV_FILE: ci/deps/azure-36-32bit.yaml
# CONDA_PY: "36"
# PATTERN: "not slow and not network and not clipboard"
# BITS32: "yes"
# py37_32bit:
# ENV_FILE: ci/deps/azure-37-32bit.yaml
# CONDA_PY: "37"
# PATTERN: "not slow and not network and not clipboard"
# BITS32: "yes"

py37_locale:
ENV_FILE: ci/deps/azure-37-locale.yaml
CONDA_PY: "37"
py38_locale:
ENV_FILE: ci/deps/azure-38-locale.yaml
CONDA_PY: "38"
PATTERN: "not slow and not network"
LANG: "zh_CN.utf8"
LC_ALL: "zh_CN.utf8"
EXTRA_APT: "language-pack-zh-hans xsel"

py37_np_dev:
ENV_FILE: ci/deps/azure-37-numpydev.yaml
CONDA_PY: "37"
py38_np_dev:
ENV_FILE: ci/deps/azure-38-numpydev.yaml
CONDA_PY: "38"
PATTERN: "not slow and not network"
TEST_ARGS: "-W error"
PANDAS_TESTING_MODE: "deprecate"
Expand Down
12 changes: 6 additions & 6 deletions ci/azure/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ jobs:
vmImage: ${{ parameters.vmImage }}
strategy:
matrix:
py36_np15:
ENV_FILE: ci/deps/azure-windows-36.yaml
CONDA_PY: "36"
PATTERN: "not slow and not network"

py37_np18:
py37_np16:
ENV_FILE: ci/deps/azure-windows-37.yaml
CONDA_PY: "37"
PATTERN: "not slow and not network"

py38_np18:
ENV_FILE: ci/deps/azure-windows-38.yaml
CONDA_PY: "38"
PATTERN: "not slow and not network"

steps:
- powershell: |
Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
Expand Down
2 changes: 1 addition & 1 deletion ci/code_checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ if [[ -z "$CHECK" || "$CHECK" == "lint" ]]; then

# Imports - Check formatting using isort see setup.cfg for settings
MSG='Check import format using isort' ; echo $MSG
ISORT_CMD="isort --quiet --check-only pandas asv_bench scripts"
ISORT_CMD="isort --quiet --check-only pandas asv_bench scripts web"
if [[ "$GITHUB_ACTIONS" == "true" ]]; then
eval $ISORT_CMD | awk '{print "##[error]" $0}'; RET=$(($RET + ${PIPESTATUS[0]}))
else
Expand Down
8 changes: 4 additions & 4 deletions ci/deps/azure-36-32bit.yaml → ci/deps/azure-37-32bit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ channels:
- defaults
- conda-forge
dependencies:
- python=3.6.*
- python=3.7.*

# tools
### Cython 0.29.13 and pytest 5.0.1 for 32 bits are not available with conda, installing below with pip instead
### Cython 0.29.16 and pytest 5.0.1 for 32 bits are not available with conda, installing below with pip instead
- pytest-xdist>=1.21
- hypothesis>=3.58.0
- pytest-azurepipelines
Expand All @@ -15,12 +15,12 @@ dependencies:
- attrs=19.1.0
- gcc_linux-32
- gxx_linux-32
- numpy=1.14.*
- python-dateutil
- pytz=2017.2
- pytz=2017.3

# see comment above
- pip
- pip:
- cython>=0.29.16
- numpy>=1.16.5
- pytest>=5.0.1
8 changes: 3 additions & 5 deletions ci/deps/azure-37-locale.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: pandas-dev
channels:
- defaults
- conda-forge
dependencies:
- python=3.7.*
Expand All @@ -22,7 +23,7 @@ dependencies:
- moto
- nomkl
- numexpr
- numpy
- numpy=1.16.*
- openpyxl
- pytables
- python-dateutil
Expand All @@ -32,7 +33,4 @@ dependencies:
- xlrd
- xlsxwriter
- xlwt
- pyarrow>=0.15
- pip
- pip:
- pyxlsb
- moto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- defaults
- conda-forge
dependencies:
- python=3.6.*
- python=3.7.*

# tools
- cython>=0.29.16
Expand All @@ -16,17 +16,15 @@ dependencies:
- beautifulsoup4=4.6.0
- bottleneck=1.2.*
- lxml
- matplotlib=2.2.2
- numpy=1.14.*
- matplotlib=3.0.0
- numpy=1.16.*
- openpyxl=2.5.7
- python-dateutil
- python-blosc
- pytz=2017.2
- pytz=2017.3
- scipy
- sqlalchemy=1.1.4
- xlrd=1.1.0
- xlsxwriter=0.9.8
- xlwt=1.2.0
- pip
- pip:
- html5lib==1.0b2
- sqlalchemy=1.2.8
- xlrd=1.2.0
- xlsxwriter=1.0.2
- xlwt=1.3.0
- html5lib=1.0.1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: pandas-dev
channels:
- conda-forge
dependencies:
- python=3.6.1
- python=3.7.1

# tools
- cython=0.29.16
Expand All @@ -15,16 +15,17 @@ dependencies:
# pandas dependencies
- beautifulsoup4=4.6.0
- bottleneck=1.2.1
- jinja2=2.8
- jinja2=2.10
- numba=0.46.0
- numexpr=2.6.2
- numpy=1.15.4
- numexpr=2.6.8
- numpy=1.16.5
- openpyxl=2.5.7
- pytables=3.4.3
- pytables=3.4.4
- python-dateutil=2.7.3
- pytz=2017.2
- pytz=2017.3
- pyarrow=0.15
- scipy=1.2
- xlrd=1.1.0
- xlsxwriter=0.9.8
- xlwt=1.2.0
- xlrd=1.2.0
- xlsxwriter=1.0.2
- xlwt=1.3.0
- html5lib=1.0.1
2 changes: 1 addition & 1 deletion ci/deps/azure-36-slow.yaml → ci/deps/azure-37-slow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- defaults
- conda-forge
dependencies:
- python=3.6.*
- python=3.7.*

# tools
- cython>=0.29.16
Expand Down
Loading