From a2cf5ab8dd35ad82ad8d3afd1f32ed939ca6b018 Mon Sep 17 00:00:00 2001 From: Fabian Haase Date: Fri, 16 Nov 2018 15:00:22 +0100 Subject: [PATCH 1/3] Update flake8-rst version Update flake8-rst version to version 0.6.0+. Signed-off-by: Fabian Haase --- ci/deps/travis-36.yaml | 2 +- doc/source/conf.py | 1 + environment.yml | 2 +- requirements-dev.txt | 2 +- setup.cfg | 54 +++++++++++++++++++++++++++++++++++++++--- 5 files changed, 55 insertions(+), 6 deletions(-) diff --git a/ci/deps/travis-36.yaml b/ci/deps/travis-36.yaml index 1880fa2501581..71dc93b797a69 100644 --- a/ci/deps/travis-36.yaml +++ b/ci/deps/travis-36.yaml @@ -9,7 +9,7 @@ dependencies: - fastparquet - flake8>=3.5 - flake8-comprehensions - - flake8-rst=0.4.2 + - flake8-rst>=0.6.0 - gcsfs - geopandas - html5lib diff --git a/doc/source/conf.py b/doc/source/conf.py index d88b5e9757423..1e2534d6bf4da 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -74,6 +74,7 @@ 'sphinx.ext.ifconfig', 'sphinx.ext.linkcode', 'nbsphinx', + 'flake8_rst.sphinxext.custom_roles', 'contributors', # custom pandas extension ] diff --git a/environment.yml b/environment.yml index fc35f1290f1b1..115acb2410f96 100644 --- a/environment.yml +++ b/environment.yml @@ -13,7 +13,7 @@ dependencies: - Cython>=0.28.2 - flake8 - flake8-comprehensions - - flake8-rst=0.4.2 + - flake8-rst>=0.6.0 - gitpython - hypothesis>=3.58.0 - isort diff --git a/requirements-dev.txt b/requirements-dev.txt index d01a21ac5fed5..ac01fe4126b9d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,7 +4,7 @@ pytz Cython>=0.28.2 flake8 flake8-comprehensions -flake8-rst==0.4.2 +flake8-rst>=0.6.0 gitpython hypothesis>=3.58.0 isort diff --git a/setup.cfg b/setup.cfg index 76710fcb42445..ba6c9cabb6d94 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,25 +31,73 @@ exclude = env # exclude asv benchmark environments from linting [flake8-rst] -ignore = - F821, # undefined name - W391, # blank line at end of file [Seems to be a bug (v0.4.1)] +ignore = E402, # module level import not at top of file + W503, # line break before binary operator exclude = doc/source/whatsnew/v0.7.0.rst + doc/source/whatsnew/v0.7.3.rst + doc/source/whatsnew/v0.8.0.rst + doc/source/whatsnew/v0.9.0.rst + doc/source/whatsnew/v0.9.1.rst + doc/source/whatsnew/v0.10.0.rst doc/source/whatsnew/v0.10.1.rst + doc/source/whatsnew/v0.11.0.rst doc/source/whatsnew/v0.12.0.rst doc/source/whatsnew/v0.13.0.rst doc/source/whatsnew/v0.13.1.rst doc/source/whatsnew/v0.14.0.rst + doc/source/whatsnew/v0.14.1.rst doc/source/whatsnew/v0.15.0.rst + doc/source/whatsnew/v0.15.1.rst + doc/source/whatsnew/v0.15.2.rst doc/source/whatsnew/v0.16.0.rst + doc/source/whatsnew/v0.16.1.rst doc/source/whatsnew/v0.16.2.rst doc/source/whatsnew/v0.17.0.rst + doc/source/whatsnew/v0.17.1.rst doc/source/whatsnew/v0.18.0.rst doc/source/whatsnew/v0.18.1.rst + doc/source/whatsnew/v0.19.0.rst doc/source/whatsnew/v0.20.0.rst doc/source/whatsnew/v0.21.0.rst + doc/source/whatsnew/v0.22.0.rst doc/source/whatsnew/v0.23.0.rst + doc/source/whatsnew/v0.23.1.rst + doc/source/whatsnew/v0.23.2.rst + doc/source/whatsnew/v0.24.0.rst + doc/source/10min.rst + doc/source/advanced.rst + doc/source/basics.rst + doc/source/categorical.rst + doc/source/comparison_with_r.rst + doc/source/comparison_with_sas.rst + doc/source/comparison_with_sql.rst + doc/source/comparison_with_stata.rst + doc/source/computation.rst + doc/source/contributing.rst + doc/source/contributing_docstring.rst + doc/source/cookbook.rst + doc/source/developer.rst + doc/source/dsintro.rst + doc/source/enhancingperf.rst + doc/source/extending.rst + doc/source/gotchas.rst + doc/source/groupby.rst + doc/source/indexing.rst + doc/source/install.rst + doc/source/internals.rst + doc/source/io.rst + doc/source/merging.rst + doc/source/missing_data.rst + doc/source/options.rst + doc/source/release.rst + doc/source/reshaping.rst + doc/source/sparse.rst + doc/source/text.rst + doc/source/timedeltas.rst + doc/source/timeseries.rst + doc/source/visualization.rst + [yapf] based_on_style = pep8 From 363d0df2ab0f297fb6b03d99389d688eb06d347f Mon Sep 17 00:00:00 2001 From: Fabian Haase Date: Fri, 30 Nov 2018 16:25:33 +0100 Subject: [PATCH 2/3] Add comment for sphinx extension Signed-off-by: Fabian Haase --- doc/source/conf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/source/conf.py b/doc/source/conf.py index 1e2534d6bf4da..2959a6b0741bd 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -74,6 +74,7 @@ 'sphinx.ext.ifconfig', 'sphinx.ext.linkcode', 'nbsphinx', + # add `:flake8-*:` roles to `code-block` and `ipython` directives 'flake8_rst.sphinxext.custom_roles', 'contributors', # custom pandas extension ] From b3d878d97e96068e51b7e9fc996016bc311785f9 Mon Sep 17 00:00:00 2001 From: Fabian Haase Date: Sun, 2 Dec 2018 16:31:39 +0100 Subject: [PATCH 3/3] review of @datapythonista Signed-off-by: Fabian Haase --- doc/source/conf.py | 2 -- setup.cfg | 8 -------- 2 files changed, 10 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 2959a6b0741bd..d88b5e9757423 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -74,8 +74,6 @@ 'sphinx.ext.ifconfig', 'sphinx.ext.linkcode', 'nbsphinx', - # add `:flake8-*:` roles to `code-block` and `ipython` directives - 'flake8_rst.sphinxext.custom_roles', 'contributors', # custom pandas extension ] diff --git a/setup.cfg b/setup.cfg index 411ab0fd7d8cc..cc7393e5a09b9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -70,30 +70,22 @@ exclude = doc/source/basics.rst doc/source/categorical.rst doc/source/comparison_with_r.rst - doc/source/comparison_with_sas.rst doc/source/comparison_with_sql.rst doc/source/comparison_with_stata.rst doc/source/computation.rst doc/source/contributing.rst doc/source/contributing_docstring.rst - doc/source/cookbook.rst - doc/source/developer.rst doc/source/dsintro.rst doc/source/enhancingperf.rst doc/source/extending.rst - doc/source/gotchas.rst doc/source/groupby.rst doc/source/indexing.rst - doc/source/install.rst - doc/source/internals.rst doc/source/io.rst doc/source/merging.rst doc/source/missing_data.rst doc/source/options.rst doc/source/release.rst doc/source/reshaping.rst - doc/source/sparse.rst - doc/source/text.rst doc/source/timedeltas.rst doc/source/timeseries.rst doc/source/visualization.rst