diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a86345a0..0195d1d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,8 +22,11 @@ jobs: with: python-version: '3.11' + - name: Run pre-commit + uses: pre-commit/action@v3.0.0 + - name: Install Nox run: pip install nox - - name: Run tests + - name: Run Nox run: nox diff --git a/.vscode/settings.json b/.vscode/settings.json index ef14b48c..71d6017a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,10 +10,6 @@ "[yaml][html][css][javascript][jinja-html][jinja-css][jinja-js]": { "editor.tabSize": 2, }, - "[yaml]": { - "editor.defaultFormatter": "redhat.vscode-yaml", - "editor.formatOnSave": true, - }, "[html][jinja-html]": { "editor.rulers": [120], }, diff --git a/noxfile.py b/noxfile.py index 129d9683..a959f458 100644 --- a/noxfile.py +++ b/noxfile.py @@ -5,8 +5,7 @@ def tests(session: nox.Session): session.install("-e", ".[test]", "-e", "./test/_submodules/HexMod") - session.run("pre-commit") + session.run("pytest", *session.posargs) # test cookiecutter last so the extra package install doesn't interfere - session.run("pytest", *session.posargs) session.run("pytest", "-k", "test_cookiecutter", "--nox", *session.posargs)