diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1a4d90f..ac84864 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -45,6 +45,7 @@ jobs: run: | ruff -V ruff check --output-format=github nutree tests setup.py + ruff format --check nutree tests setup.py - name: Test with pytest run: | diff --git a/tox.ini b/tox.ini index ac41178..c713a35 100644 --- a/tox.ini +++ b/tox.ini @@ -62,20 +62,7 @@ deps = commands = ruff -V ruff check nutree tests setup.py - - -; [testenv:check] -; description = Check Black formatting, isort compliance, and flake8 -; ; skip_install = true -; deps = -; black[jupyter] ~=24.3 -; isort -; {[testenv:lint]deps} -; changedir = {toxinidir} -; commands = -; isort --check-only --profile black nutree tests setup.py -; black --check --diff nutree tests setup.py -; {[testenv:lint]commands} + ruff format --check nutree tests setup.py [testenv:format] @@ -96,23 +83,6 @@ commands = ; black nutree tests setup.py {[testenv:lint]commands} -; [testenv:format-no-pyupgrade] -; description = Same a `format` but without pyupgrade, so it runs on windows -; # skip_install = true -; deps = -; {[testenv:check]deps} -; pyupgrade -; allowlist_externals: -; bash -; changedir = {toxinidir} -; commands = -; ; bash -ec 'pyupgrade --py38-plus --exit-zero-even-if-changed nutree/*.py tests/*.py setup.py' -; ruff check --fix nutree tests setup.py -; ; ruff format nutree tests setup.py -; isort --profile black nutree tests setup.py {posargs} -; black nutree tests setup.py -; {[testenv:lint]commands} - [testenv:docs] description = Build Sphinx documentation (output directory: docs/sphinx-build) @@ -122,7 +92,6 @@ deps = fabulist pydot rdflib - ; recommonmark sphinx sphinx_rtd_theme myst-parser[linkify]