diff --git a/.meta/requirements-test.txt b/.meta/requirements-test.txt index 05ac6d3f..80f29162 100644 --- a/.meta/requirements-test.txt +++ b/.meta/requirements-test.txt @@ -1,4 +1,4 @@ -flake8 +pre-commit pytest pytest-cov pytest-timeout diff --git a/Makefile b/Makefile index 10ee2e2a..f0d1c0e6 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,8 @@ all: @+make build flake8: - @+flake8 -j 8 --count --statistics --exit-zero . + @+pre-commit run -a flake8 + @+pre-commit run -a nbstripout test: TOX_SKIP_ENV=perf tox --skip-missing-interpreters -p all @@ -159,6 +160,7 @@ install_build: python -m pip install -r .meta/requirements-dev.txt install_test: python -m pip install -r .meta/requirements-test.txt + pre-commit install build: @make prebuildclean diff --git a/environment.yml b/environment.yml index 60b98022..638afe12 100644 --- a/environment.yml +++ b/environment.yml @@ -22,14 +22,10 @@ dependencies: - pytest-timeout - pytest-asyncio # [py>=3.7] - nbval -- flake8 -- flake8-bugbear -- flake8-comprehensions - coverage # extras - dask # dask - matplotlib # gui -- nbstripout # notebook editing - numpy # pandas, keras, contrib.tenumerate - pandas - tensorflow # keras @@ -41,5 +37,3 @@ dependencies: - pydoc-markdown # `cd docs && pymake` - pip: - py-make >=0.1.0 # `setup.py make/pymake` - - flake8-debugger # flake8 - - flake8-string-format # flake8