diff --git a/.make/base.make b/.make/base.make index 2079232..46b7230 100644 --- a/.make/base.make +++ b/.make/base.make @@ -401,25 +401,22 @@ bump-patch: ## Bump application patch version <0.0.X> .PHONY: check-lint check-lint: ## Check code linting (black, isort, flake8, docformatter and pylint) - poetry run tox -e black,isort,flake8,docformatter,pylint - -.PHONY: check-pylint -check-pylint: ## Check code with pylint - poetry run tox -e pylint + poetry run nox -s check .PHONY: fix-lint fix-lint: ## Fix code linting (black, isort, flynt, docformatter) - poetry run tox -e fix + poetry run nox -s fix .PHONY: precommit precommit: ## Run Pre-commit on all files manually - poetry run tox -e precommit + poetry run pre-commit run --all-files + ## -- Tests targets ------------------------------------------------------------------------------------------------- ## .PHONY: test test: ## Run all tests - poetry run tox -e test + poetry run nox -s test TEST_ARGS ?= MARKER_TEST_ARGS = -m "$(TEST_ARGS)" @@ -429,7 +426,7 @@ CUSTOM_TEST_ARGS = "$(TEST_ARGS)" .PHONY: test-marker test-marker: ## Run tests using pytest markers. Ex. make test-tag TEST_ARGS="" @if [ -n "$(TEST_ARGS)" ]; then \ - poetry run tox -e test-custom -- -- $(MARKER_TEST_ARGS); \ + poetry run nox -s test-custom -- -- $(MARKER_TEST_ARGS); \ else \ echo "" ; \ echo 'ERROR : Variable TEST_ARGS has not been set, please rerun the command like so :' ; \ @@ -440,7 +437,7 @@ test-marker: ## Run tests using pytest markers. Ex. make test-tag TEST_ARGS="=1", markers = "python_version < \"3.11\""} +virtualenv = ">=20.14.1" + +[package.extras] +tox-to-nox = ["jinja2", "tox"] +uv = ["uv (>=0.1.6)"] + [[package]] name = "numpy" version = "2.1.1" @@ -4928,4 +4981,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = ">=3.10,<3.12" -content-hash = "bb5b396bd268e6f4cc510c5b2b66cf3c04b76acc95031f558e4f195b6d32fd71" +content-hash = "c376ad30c9c421d03c5c14939f146bc1f54dc79891ab21e80f85b11e0f50b7e7" diff --git a/pyproject.toml b/pyproject.toml index f82ecbd..3333869 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,6 +42,7 @@ flake8-pyproject = "^1.2.3" docformatter = {extras = ["tomli"], version = "^1.7.5"} nbval = "^0.11.0" black = "^24.8.0" +nox = "^2024.4.15" [tool.poetry.group.lab.dependencies] jupyterlab = "^4.0.10"