Skip to content

Commit 3b9b52a

Browse files
committed
Merge remote-tracking branch 'upstream/master' into io-parquet-multiindex
2 parents cc8e85c + 601eff1 commit 3b9b52a

Some content is hidden

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

90 files changed

+2476
-1914
lines changed

.pre-commit-config.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,14 @@ repos:
4646
files: ^(environment.yml|requirements-dev.txt)$
4747
pass_filenames: false
4848
additional_dependencies: [pyyaml]
49+
- id: flake8-rst
50+
name: flake8-rst
51+
description: Run flake8 on code snippets in docstrings or RST files
52+
language: python
53+
entry: flake8-rst
54+
types: [rst]
55+
args: [--filename=*.rst]
56+
additional_dependencies: [flake8-rst==0.7.0, flake8==3.7.9]
4957
- repo: https://github.com/asottile/yesqa
5058
rev: v1.2.2
5159
hooks:

ci/code_checks.sh

-7
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,6 @@ if [[ -z "$CHECK" || "$CHECK" == "lint" ]]; then
7373
flake8 --format="$FLAKE8_FORMAT" pandas/_libs --append-config=flake8/cython-template.cfg
7474
RET=$(($RET + $?)) ; echo $MSG "DONE"
7575

76-
echo "flake8-rst --version"
77-
flake8-rst --version
78-
79-
MSG='Linting code-blocks in .rst documentation' ; echo $MSG
80-
flake8-rst doc/source --filename=*.rst --format="$FLAKE8_FORMAT"
81-
RET=$(($RET + $?)) ; echo $MSG "DONE"
82-
8376
# Check that cython casting is of the form `<type>obj` as opposed to `<type> obj`;
8477
# it doesn't make a difference, but we want to be internally consistent.
8578
# Note: this grep pattern is (intended to be) equivalent to the python

ci/deps/travis-37-cov.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ dependencies:
3232
- google-cloud-bigquery>=1.27.2 # GH 36436
3333
- psycopg2
3434
- pyarrow>=0.15.0
35-
- pymysql=0.7.11
35+
- pymysql<0.10.0 # temporary pin, GH 36465
3636
- pytables
3737
- python-snappy
3838
- python-dateutil
3939
- pytz
4040
- s3fs>=0.4.0
4141
- scikit-learn
4242
- scipy
43-
- sqlalchemy=1.3.0
43+
- sqlalchemy
4444
- statsmodels
4545
- xarray
4646
- xlrd

doc/source/ecosystem.rst

+6
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,11 @@ found in NumPy or pandas, which work well with pandas' data containers.
435435
Cyberpandas provides an extension type for storing arrays of IP Addresses. These
436436
arrays can be stored inside pandas' Series and DataFrame.
437437

438+
`Pandas-Genomics`_
439+
~~~~~~~~~~~~~~~~~~
440+
441+
Pandas-Genomics provides extension types and extension arrays for working with genomics data
442+
438443
`Pint-Pandas`_
439444
~~~~~~~~~~~~~~
440445

@@ -465,6 +470,7 @@ Library Accessor Classes Description
465470
.. _cyberpandas: https://cyberpandas.readthedocs.io/en/latest
466471
.. _pdvega: https://altair-viz.github.io/pdvega/
467472
.. _Altair: https://altair-viz.github.io/
473+
.. _pandas-genomics: https://pandas-genomics.readthedocs.io/en/latest/
468474
.. _pandas_path: https://github.com/drivendataorg/pandas-path/
469475
.. _pathlib.Path: https://docs.python.org/3/library/pathlib.html
470476
.. _pint-pandas: https://github.com/hgrecco/pint-pandas

0 commit comments

Comments
 (0)