From 724188df57738f96b572cb352331e79b098478f7 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Fri, 26 Jun 2020 21:16:28 +0100 Subject: [PATCH 1/4] fix imports --- .pre-commit-config.yaml | 4 ++++ scripts/tests/test_validate_docstrings.py | 3 ++- scripts/tests/test_validate_unwanted_patterns.py | 2 +- setup.cfg | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b7fd797fb7230..3cab086d435ab 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -24,6 +24,10 @@ repos: types: - file args: [--append-config=flake8/cython-template.cfg] +- repo: https://github.com/asottile/seed-isort-config + rev: v2.2.0 + hooks: + - id: seed-isort-config - repo: https://github.com/pre-commit/mirrors-isort rev: v4.3.21 hooks: diff --git a/scripts/tests/test_validate_docstrings.py b/scripts/tests/test_validate_docstrings.py index b11de0c4ad860..6bba5b4220c65 100644 --- a/scripts/tests/test_validate_docstrings.py +++ b/scripts/tests/test_validate_docstrings.py @@ -2,7 +2,8 @@ import textwrap import pytest -import validate_docstrings + +from scripts import validate_docstrings class BadDocstrings: diff --git a/scripts/tests/test_validate_unwanted_patterns.py b/scripts/tests/test_validate_unwanted_patterns.py index b6cfa20cd7ca0..81e06f758d700 100644 --- a/scripts/tests/test_validate_unwanted_patterns.py +++ b/scripts/tests/test_validate_unwanted_patterns.py @@ -2,7 +2,7 @@ import pytest -import validate_unwanted_patterns +from scripts import validate_unwanted_patterns class TestBarePytestRaises: diff --git a/setup.cfg b/setup.cfg index 49a57b7a525f0..c1acd433a1ef7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -112,7 +112,7 @@ known_dtypes = pandas.core.dtypes known_post_core = pandas.tseries,pandas.io,pandas.plotting sections = FUTURE,STDLIB,THIRDPARTY,PRE_LIBS,PRE_CORE,DTYPES,FIRSTPARTY,POST_CORE,LOCALFOLDER known_first_party = pandas -known_third_party = _pytest,announce,dateutil,docutils,flake8,git,hypothesis,jinja2,lxml,matplotlib,numpy,numpydoc,pkg_resources,pyarrow,pytest,pytz,requests,scipy,setuptools,sphinx,sqlalchemy,validate_docstrings,yaml,odf +known_third_party = announce,dateutil,docutils,feedparser,git,hypothesis,jinja2,markdown,matplotlib,numpy,numpydoc,odf,pkg_resources,pyarrow,pytest,pytz,requests,scipy,setuptools,sphinx,sqlalchemy,yaml multi_line_output = 3 include_trailing_comma = True force_grid_wrap = 0 From 3b609fe5286479cd459db8e0451cc307546e9b69 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Tue, 30 Jun 2020 19:55:29 +0100 Subject: [PATCH 2/4] remove validate_docstrings from 3rd parties --- .pre-commit-config.yaml | 4 ---- scripts/tests/test_validate_docstrings.py | 2 +- scripts/tests/test_validate_unwanted_patterns.py | 2 +- setup.cfg | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3cab086d435ab..b7fd797fb7230 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -24,10 +24,6 @@ repos: types: - file args: [--append-config=flake8/cython-template.cfg] -- repo: https://github.com/asottile/seed-isort-config - rev: v2.2.0 - hooks: - - id: seed-isort-config - repo: https://github.com/pre-commit/mirrors-isort rev: v4.3.21 hooks: diff --git a/scripts/tests/test_validate_docstrings.py b/scripts/tests/test_validate_docstrings.py index 6bba5b4220c65..b9ce1d0d1611a 100644 --- a/scripts/tests/test_validate_docstrings.py +++ b/scripts/tests/test_validate_docstrings.py @@ -3,7 +3,7 @@ import pytest -from scripts import validate_docstrings +import validate_docstrings class BadDocstrings: diff --git a/scripts/tests/test_validate_unwanted_patterns.py b/scripts/tests/test_validate_unwanted_patterns.py index 81e06f758d700..b6cfa20cd7ca0 100644 --- a/scripts/tests/test_validate_unwanted_patterns.py +++ b/scripts/tests/test_validate_unwanted_patterns.py @@ -2,7 +2,7 @@ import pytest -from scripts import validate_unwanted_patterns +import validate_unwanted_patterns class TestBarePytestRaises: diff --git a/setup.cfg b/setup.cfg index c1acd433a1ef7..26e9f19fdedfa 100644 --- a/setup.cfg +++ b/setup.cfg @@ -112,7 +112,7 @@ known_dtypes = pandas.core.dtypes known_post_core = pandas.tseries,pandas.io,pandas.plotting sections = FUTURE,STDLIB,THIRDPARTY,PRE_LIBS,PRE_CORE,DTYPES,FIRSTPARTY,POST_CORE,LOCALFOLDER known_first_party = pandas -known_third_party = announce,dateutil,docutils,feedparser,git,hypothesis,jinja2,markdown,matplotlib,numpy,numpydoc,odf,pkg_resources,pyarrow,pytest,pytz,requests,scipy,setuptools,sphinx,sqlalchemy,yaml +known_third_party = _pytest,announce,dateutil,docutils,flake8,git,hypothesis,jinja2,lxml,matplotlib,numpy,numpydoc,pkg_resources,pyarrow,pytest,pytz,requests,scipy,setuptools,sphinx,sqlalchemy,yaml,odf multi_line_output = 3 include_trailing_comma = True force_grid_wrap = 0 From bffdc434b0637d0a8ac962e40180344d0170fdb8 Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Tue, 30 Jun 2020 19:56:43 +0100 Subject: [PATCH 3/4] add validate_unwanted_patterns to 3rd parties --- scripts/tests/test_validate_unwanted_patterns.py | 1 - setup.cfg | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/tests/test_validate_unwanted_patterns.py b/scripts/tests/test_validate_unwanted_patterns.py index b6cfa20cd7ca0..947666a730ee9 100644 --- a/scripts/tests/test_validate_unwanted_patterns.py +++ b/scripts/tests/test_validate_unwanted_patterns.py @@ -1,7 +1,6 @@ import io import pytest - import validate_unwanted_patterns diff --git a/setup.cfg b/setup.cfg index 26e9f19fdedfa..09cac143aafd3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -112,7 +112,7 @@ known_dtypes = pandas.core.dtypes known_post_core = pandas.tseries,pandas.io,pandas.plotting sections = FUTURE,STDLIB,THIRDPARTY,PRE_LIBS,PRE_CORE,DTYPES,FIRSTPARTY,POST_CORE,LOCALFOLDER known_first_party = pandas -known_third_party = _pytest,announce,dateutil,docutils,flake8,git,hypothesis,jinja2,lxml,matplotlib,numpy,numpydoc,pkg_resources,pyarrow,pytest,pytz,requests,scipy,setuptools,sphinx,sqlalchemy,yaml,odf +known_third_party = _pytest,announce,dateutil,docutils,flake8,git,hypothesis,jinja2,lxml,matplotlib,numpy,numpydoc,pkg_resources,pyarrow,pytest,pytz,requests,scipy,setuptools,sphinx,sqlalchemy,validate_docstrings,validate_unwanted_patterns,yaml,odf multi_line_output = 3 include_trailing_comma = True force_grid_wrap = 0 From d43937a49e78b8ae2337f5d0e28d8b967dfd6f9c Mon Sep 17 00:00:00 2001 From: Marco Gorelli Date: Tue, 30 Jun 2020 19:57:20 +0100 Subject: [PATCH 4/4] isort --- scripts/tests/test_validate_docstrings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/tests/test_validate_docstrings.py b/scripts/tests/test_validate_docstrings.py index b9ce1d0d1611a..b11de0c4ad860 100644 --- a/scripts/tests/test_validate_docstrings.py +++ b/scripts/tests/test_validate_docstrings.py @@ -2,7 +2,6 @@ import textwrap import pytest - import validate_docstrings