diff --git a/Jenkinsfile b/Jenkinsfile index 9f0dc88..b5379e1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,7 +52,7 @@ pipeline { PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL:-https://pypi.mandelblog.com/root/pypi/+simple/} \ pip install --no-build-isolation --pre --editable . setuptools wheel --upgrade --upgrade-strategy=eager --use-deprecated=legacy-resolver cp "${JOB_BASE_NAME}/ocyan.json" "${JOB_BASE_NAME}/${JOB_BASE_NAME}.json" - pip install pylint pylint-django vdt.versionplugin.wheel + pip install ruff vdt.versionplugin.wheel pip install --upgrade "setuptools==69.5.1" wheel manage.py migrate --no-input --skip-checks manage.py loaddemodata --skip-checks || true @@ -66,8 +66,9 @@ pipeline { sh ''' . .venv/bin/activate pip install coverage + pip install ruff cat mandelstudio/ocyan.json | python3 -m json.tool 1>/dev/null - pylint setup.py mandelstudio/ + make lint ''' } } diff --git a/Makefile b/Makefile index 0f9dc36..40f72b2 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,9 @@ collectstatic: lint: fail-if-no-virtualenv cat mandelstudio/ocyan.json |python3 -m json.tool 1>/dev/null - pylint setup.py mandelstudio/ + ruff format --check --exclude "migrations" mandelstudio + ruff check --select I --exclude "migrations" --output-format concise mandelstudio + python -m compileall -q setup.py mandelstudio black: @echo "No formatter configured in template; add your preferred formatter here." diff --git a/pylintrc b/pylintrc index 361c9c0..c1e58b5 100644 --- a/pylintrc +++ b/pylintrc @@ -1,7 +1,5 @@ [MASTER] jobs = 1 -load-plugins = pylint_django,pylint_packageinitcheck -django-settings-module = mandelstudio.settings.base score = n ignore = migrations