Merge remote-tracking branch 'upstream/master' into issue-23334-attrs-to-eval

Author: gasparia405

README.md

@@ -26,8 +26,9 @@
  <td>Package Status</td>
  <td>
 <a href="https://pypi.org/project/pandas/">
-<img src="https://img.shields.io/pypi/status/pandas.svg" alt="status" /></td>
+<img src="https://img.shields.io/pypi/status/pandas.svg" alt="status" />
 </a>
+ </td>
 </tr>
 <tr>
  <td>License</td>
@@ -73,8 +74,8 @@
 <td>Gitter</td>
 <td>
 <a href="https://gitter.im/pydata/pandas">
-<img src="https://badges.gitter.im/Join%20Chat.svg"
-</a>
+<img src="https://badges.gitter.im/Join%20Chat.svg" />
+</a>
 </td>
 </tr>
 </table>

asv_bench/benchmarks/groupby.py

@@ -14,7 +14,7 @@
 method_blacklist = {
  'object': {'median', 'prod', 'sem', 'cumsum', 'sum', 'cummin', 'mean',
  'max', 'skew', 'cumprod', 'cummax', 'rank', 'pct_change', 'min',
- 'var', 'mad', 'describe', 'std'},
+ 'var', 'mad', 'describe', 'std', 'quantile'},
  'datetime': {'median', 'prod', 'sem', 'cumsum', 'sum', 'mean', 'skew',
  'cumprod', 'cummax', 'pct_change', 'var', 'mad', 'describe',
  'std'}
@@ -316,8 +316,9 @@ class GroupByMethods(object):
  ['all', 'any', 'bfill', 'count', 'cumcount', 'cummax', 'cummin',
  'cumprod', 'cumsum', 'describe', 'ffill', 'first', 'head',
  'last', 'mad', 'max', 'min', 'median', 'mean', 'nunique',
- 'pct_change', 'prod', 'rank', 'sem', 'shift', 'size', 'skew',
- 'std', 'sum', 'tail', 'unique', 'value_counts', 'var'],
+ 'pct_change', 'prod', 'quantile', 'rank', 'sem', 'shift',
+ 'size', 'skew', 'std', 'sum', 'tail', 'unique', 'value_counts',
+ 'var'],
  ['direct', 'transformation']]
 
  def setup(self, dtype, method, application):

ci/code_checks.sh

@@ -241,8 +241,8 @@ fi
 ### DOCSTRINGS ###
 if [[ -z "$CHECK" || "$CHECK" == "docstrings" ]]; then
 
- MSG='Validate docstrings (GL06, GL07, GL09, SS04, PR03, PR05, PR10, EX04, RT04, RT05, SS05, SA05)' ; echo $MSG
- $BASE_DIR/scripts/validate_docstrings.py --format=azure --errors=GL06,GL07,GL09,SS04,PR03,PR04,PR05,EX04,RT04,RT05,SS05,SA05
+ MSG='Validate docstrings (GL06, GL07, GL09, SS04, SS05, PR03, PR04, PR05, PR10, EX04, RT04, RT05, SA05)' ; echo $MSG
+ $BASE_DIR/scripts/validate_docstrings.py --format=azure --errors=GL06,GL07,GL09,SS04,SS05,PR03,PR04,PR05,PR10,EX04,RT04,RT05,SA05
  RET=$(($RET + $?)) ; echo $MSG "DONE"
 
 fi

ci/deps/azure-27-compat.yaml

@@ -18,7 +18,7 @@ dependencies:
  - xlsxwriter=0.5.2
  - xlwt=0.7.5
  # universal
- - pytest
+ - pytest>=4.0.2
  - pytest-xdist
  - pytest-mock
  - isort

ci/deps/azure-27-locale.yaml

@@ -20,7 +20,7 @@ dependencies:
  - xlsxwriter=0.5.2
  - xlwt=0.7.5
  # universal
- - pytest
+ - pytest>=4.0.2
  - pytest-xdist
  - pytest-mock
  - hypothesis>=3.58.0

ci/deps/azure-36-locale_slow.yaml

@@ -26,7 +26,7 @@ dependencies:
  - xlsxwriter
  - xlwt
  # universal
- - pytest
+ - pytest>=4.0.2
  - pytest-xdist
  - pytest-mock
  - moto

ci/deps/azure-37-locale.yaml

@@ -25,7 +25,7 @@ dependencies:
  - xlsxwriter
  - xlwt
  # universal
- - pytest
+ - pytest>=4.0.2
  - pytest-xdist
  - pytest-mock
  - isort

ci/deps/azure-37-numpydev.yaml

@@ -6,7 +6,7 @@ dependencies:
  - pytz
  - Cython>=0.28.2
  # universal
- - pytest
+ - pytest>=4.0.2
  - pytest-xdist
  - pytest-mock
  - hypothesis>=3.58.0

ci/deps/azure-macos-35.yaml

@@ -21,11 +21,11 @@ dependencies:
  - xlrd
  - xlsxwriter
  - xlwt
- # universal
- - pytest
- - pytest-xdist
- - pytest-mock
  - isort
  - pip:
  - python-dateutil==2.5.3
+ # universal
+ - pytest>=4.0.2
+ - pytest-xdist
+ - pytest-mock
  - hypothesis>=3.58.0

ci/deps/azure-windows-27.yaml

@@ -25,7 +25,7 @@ dependencies:
  - xlwt
  # universal
  - cython>=0.28.2
- - pytest
+ - pytest>=4.0.2
  - pytest-xdist
  - pytest-mock
  - moto