From aa2b74002ef86d9d76d6cec1fb375aa0b2d51dfd Mon Sep 17 00:00:00 2001 From: Patrick Ogenstad Date: Mon, 24 Jun 2024 17:55:06 +0200 Subject: [PATCH] Remove pylama --- .github/workflows/main.yaml | 2 - CONTRIBUTING.rst | 2 +- Makefile | 6 +-- poetry.lock | 79 +------------------------------------ pyproject.toml | 1 - setup.cfg | 19 --------- 6 files changed, 3 insertions(+), 106 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index dd2af1983..2c899adc4 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -38,8 +38,6 @@ jobs: - name: Run ruff run: make ruff - - name: Run pylama - run: make pylama - name: Run black run: make black - name: Run mypy diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 2b7ae0228..61a4ce166 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -119,7 +119,7 @@ The Black GitHub repo has information about how you can integrate Black in your Tests ------------- -As part of the automatic CI on every pull request, besides coding style checks with ``black``, we also do linting with ``pylama``, static type checking with ``mypy``, unit tests with ``pytest``, docs generation with ``sphinx`` and ``nbsphinx`` (for Jupyter notebooks) and verification of outputs in Jupyter notebook tutorials with pytest plugin ``nbval``. +As part of the automatic CI on every pull request, besides coding style checks with ``black``, we also do linting with ``ruff``, static type checking with ``mypy``, unit tests with ``pytest``, docs generation with ``sphinx`` and ``nbsphinx`` (for Jupyter notebooks) and verification of outputs in Jupyter notebook tutorials with pytest plugin ``nbval``. After modifying any code in the core, at first, we recommend running unit tests locally before running the whole test suite (which takes longer time): diff --git a/Makefile b/Makefile index 926484af4..f0b13e342 100644 --- a/Makefile +++ b/Makefile @@ -25,10 +25,6 @@ sphinx: # poetry run sphinx-build -W -b html -d docs/_build/doctrees docs docs/_build/html echo "WARNING: sphinx needs to be added here!!!" -.PHONY: pylama -pylama: - poetry run pylama ${NORNIR_DIRS} - .PHONY: mypy mypy: poetry run mypy nornir tests @@ -44,7 +40,7 @@ ruff: poetry run ruff check . .PHONY: tests -tests: ruff black pylama mypy nbval pytest sphinx +tests: ruff black mypy nbval pytest sphinx .PHONY: docker-tests docker-tests: docker diff --git a/poetry.lock b/poetry.lock index cd4edb998..b0fc3cf8e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1542,17 +1542,6 @@ files = [ [package.dependencies] traitlets = "*" -[[package]] -name = "mccabe" -version = "0.7.0" -description = "McCabe checker, plugin for flake8" -optional = false -python-versions = ">=3.6" -files = [ - {file = "mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"}, - {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"}, -] - [[package]] name = "mistune" version = "3.0.2" @@ -2180,17 +2169,6 @@ files = [ [package.extras] tests = ["pytest"] -[[package]] -name = "pycodestyle" -version = "2.11.0" -description = "Python style guide checker" -optional = false -python-versions = ">=3.8" -files = [ - {file = "pycodestyle-2.11.0-py2.py3-none-any.whl", hash = "sha256:5d1013ba8dc7895b548be5afb05740ca82454fd899971563d2ef625d090326f8"}, - {file = "pycodestyle-2.11.0.tar.gz", hash = "sha256:259bcc17857d8a8b3b4a2327324b79e5f020a13c16074670f9c8c8f872ea76d0"}, -] - [[package]] name = "pycparser" version = "2.21" @@ -2202,23 +2180,6 @@ files = [ {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, ] -[[package]] -name = "pydocstyle" -version = "6.3.0" -description = "Python docstring style checker" -optional = false -python-versions = ">=3.6" -files = [ - {file = "pydocstyle-6.3.0-py3-none-any.whl", hash = "sha256:118762d452a49d6b05e194ef344a55822987a462831ade91ec5c06fd2169d019"}, - {file = "pydocstyle-6.3.0.tar.gz", hash = "sha256:7ce43f0c0ac87b07494eb9c0b462c0b73e6ff276807f204d6b53edc72b7e44e1"}, -] - -[package.dependencies] -snowballstemmer = ">=2.2.0" - -[package.extras] -toml = ["tomli (>=1.2.3)"] - [[package]] name = "pyeapi" version = "1.0.2" @@ -2236,17 +2197,6 @@ netaddr = "*" dev = ["check-manifest", "pep8", "pyflakes", "twine"] test = ["coverage", "mock"] -[[package]] -name = "pyflakes" -version = "3.1.0" -description = "passive checker of Python programs" -optional = false -python-versions = ">=3.8" -files = [ - {file = "pyflakes-3.1.0-py2.py3-none-any.whl", hash = "sha256:4132f6d49cb4dae6819e5379898f2b8cce3c5f23994194c24b77d5da2e36f774"}, - {file = "pyflakes-3.1.0.tar.gz", hash = "sha256:a0aae034c444db0071aa077972ba4768d40c830d9539fd45bf4cd3f8f6992efc"}, -] - [[package]] name = "pygments" version = "2.16.1" @@ -2261,33 +2211,6 @@ files = [ [package.extras] plugins = ["importlib-metadata"] -[[package]] -name = "pylama" -version = "8.4.1" -description = "Code audit tool for python" -optional = false -python-versions = ">=3.7" -files = [ - {file = "pylama-8.4.1-py3-none-any.whl", hash = "sha256:5bbdbf5b620aba7206d688ed9fc917ecd3d73e15ec1a89647037a09fa3a86e60"}, - {file = "pylama-8.4.1.tar.gz", hash = "sha256:2d4f7aecfb5b7466216d48610c7d6bad1c3990c29cdd392ad08259b161e486f6"}, -] - -[package.dependencies] -mccabe = ">=0.7.0" -pycodestyle = ">=2.9.1" -pydocstyle = ">=6.1.1" -pyflakes = ">=2.5.0" - -[package.extras] -all = ["eradicate", "mypy", "pylint", "radon", "vulture"] -eradicate = ["eradicate"] -mypy = ["mypy"] -pylint = ["pylint"] -radon = ["radon"] -tests = ["eradicate (>=2.0.0)", "mypy", "pylama-quotes", "pylint (>=2.11.1)", "pytest (>=7.1.2)", "pytest-mypy", "radon (>=5.1.0)", "toml", "types-setuptools", "types-toml", "vulture"] -toml = ["toml (>=0.10.2)"] -vulture = ["vulture"] - [[package]] name = "pynacl" version = "1.5.0" @@ -3572,4 +3495,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.8,<4.0" -content-hash = "d8b67ba6327d7b9cca180438dec2e6bef065b33084e62873a426c59110f354fc" +content-hash = "beeecfa098d80f15b4ab1fec20916e4f3972a1d5afbf7f0c13c6590926273a94" diff --git a/pyproject.toml b/pyproject.toml index 71fdc3c9b..e6647c8fc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,7 +36,6 @@ decorator = "*" nbval = "^0.10.0" pytest = "*" pytest-cov = "*" -pylama = "*" requests-mock = "*" black = "^23.9.1" isort = "^5.12.0" diff --git a/setup.cfg b/setup.cfg index 3fd76670c..e538fc170 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,25 +4,6 @@ # will need to generate wheels for each Python version that you support. universal=1 -# E127: continuation line over-indented for visual indent -# E128: continuation line under-indented for visual indent -# E265: block comment should start with # -# E731: do not assign a lambda expression, use a def -# D10?: missing docstrings -[pylama] -linters = mccabe,pycodestyle,pyflakes -ignore = D203,C901,W503 -skip = .tox/*,.venv/*,nornir/_vendor/* - -[pylama:pycodestyle] -max_line_length = 100 - -[pycodestyle] -ignore = D203,C901,W503 -exclude = .git,__pycache__,build,dist -max-complexity = 10 -max-line-length = 100 - [tool:pytest] #addopts = --cov=nornir --cov-report=term-missing -vs filterwarnings =