From b862cdeb46d605da888af4b2387079bb0569ad55 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Tue, 27 Aug 2024 15:19:08 +0200 Subject: [PATCH] Add ruff package, remove unneeded packages --- bitbucket-pipelines.yml | 3 +- server/requirements/requirements-dev.in | 8 +- server/requirements/requirements-dev.txt | 116 +---------------------- server/setup.cfg | 21 +--- 4 files changed, 9 insertions(+), 139 deletions(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 0dcb4cc1..2139d43d 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -64,9 +64,10 @@ python-linting: &python-linting script: - source ./env/bitbucket/prepare_for_test.sh - pip install -r server/requirements/requirements-dev.txt + - ruff check server + - ruff format server --check - git-crypt status -e | sort > git-crypt-encrypted-files-check.txt && diff -w git-crypt-encrypted-files.txt git-crypt-encrypted-files-check.txt - trufflehog --exclude_paths trufflehog-exclude-patterns.txt --allow trufflehog-allow.json --entropy=True --max_depth=100 . - - ufmt check server js-tests: &js-tests name: js tests diff --git a/server/requirements/requirements-dev.in b/server/requirements/requirements-dev.in index 66f2cbdf..6c39d536 100644 --- a/server/requirements/requirements-dev.in +++ b/server/requirements/requirements-dev.in @@ -13,16 +13,10 @@ pytest-xdist # pytest-order djangorestframework-stubs # https://github.com/typeddjango/djangorestframework-stubs - # Code quality # ------------------------------------------------------------------------------ -flake8 # https://github.com/PyCQA/flake8 -flake8-isort # https://github.com/gforcada/flake8-isort coverage # https://github.com/nedbat/coveragepy -black>=22.8.0 # https://github.com/psf/black -pylint-django # https://github.com/PyCQA/pylint-django -pre-commit # https://github.com/pre-commit/pre-commit -ufmt +ruff # Django # ------------------------------------------------------------------------------ diff --git a/server/requirements/requirements-dev.txt b/server/requirements/requirements-dev.txt index a39638bc..103f283d 100644 --- a/server/requirements/requirements-dev.txt +++ b/server/requirements/requirements-dev.txt @@ -20,8 +20,6 @@ argon2-cffi-bindings==21.2.0 # via argon2-cffi asgiref==3.7.2 # via django -astroid==2.15.6 - # via pylint asttokens==2.2.1 # via stack-data async-property==0.2.2 @@ -32,7 +30,6 @@ attrs==23.1.0 # via # jsonschema # referencing - # usort authlib==1.2.1 # via -r requirements.in azure-core==1.29.1 @@ -49,10 +46,6 @@ bcrypt==4.0.1 # via paramiko beautifulsoup4==4.11.2 # via wagtail -black==23.7.0 - # via - # -r requirements-dev.in - # ufmt boto3==1.28.23 # via -r requirements.in botocore==1.31.23 @@ -76,19 +69,13 @@ cffi==1.15.1 # argon2-cffi-bindings # cryptography # pynacl -cfgv==3.3.1 - # via pre-commit charset-normalizer==3.2.0 # via requests click==8.1.6 # via # -r requirements.in - # black # django-click - # moreorless # pip-tools - # ufmt - # usort # uvicorn concurrent-log-handler==0.9.24 # via -r requirements.in @@ -113,10 +100,6 @@ defusedxml==0.7.1 # via willow deprecation==2.1.0 # via python-keycloak -dill==0.3.7 - # via pylint -distlib==0.3.7 - # via virtualenv dj-database-url==2.0.0 # via -r requirements.in django==4.2.13 @@ -223,16 +206,8 @@ factory-boy==3.3.0 # wagtail-factories faker==19.3.0 # via factory-boy -filelock==3.12.2 - # via virtualenv filetype==1.2.0 # via willow -flake8==6.1.0 - # via - # -r requirements-dev.in - # flake8-isort -flake8-isort==6.0.0 - # via -r requirements-dev.in freezegun==1.2.2 # via -r requirements-dev.in gitdb==4.0.10 @@ -268,8 +243,6 @@ httptools==0.6.0 # via uvicorn httpx==0.27.0 # via python-keycloak -identify==2.5.26 - # via pre-commit idna==3.4 # via # anyio @@ -285,10 +258,6 @@ ipython==8.14.0 # via ipdb isodate==0.6.1 # via azure-storage-blob -isort==5.12.0 - # via - # flake8-isort - # pylint jedi==0.19.0 # via ipython jmespath==1.0.1 @@ -305,24 +274,10 @@ jwcrypto==1.5.6 # via python-keycloak l18n==2021.3 # via wagtail -lazy-object-proxy==1.9.0 - # via astroid -libcst==1.0.1 - # via - # ufmt - # usort marshmallow==3.20.1 # via environs matplotlib-inline==0.1.6 # via ipython -mccabe==0.7.0 - # via - # flake8 - # pylint -moreorless==0.4.0 - # via - # ufmt - # usort msal==1.23.0 # via # azure-identity @@ -335,21 +290,15 @@ mypy==1.4.1 # django-stubs # djangorestframework-stubs mypy-extensions==1.0.0 - # via - # black - # mypy - # typing-inspect + # via mypy newrelic==8.11.0 # via -r requirements.in -nodeenv==1.8.0 - # via pre-commit openpyxl==3.1.2 # via # -r requirements.in # wagtail packaging==23.1 # via - # black # build # deprecation # gunicorn @@ -362,10 +311,6 @@ paramiko==3.3.1 # sftpserver parso==0.8.3 # via jedi -pathspec==0.11.2 - # via - # black - # trailrunner pexpect==4.8.0 # via ipython pickleshare==0.7.5 @@ -379,11 +324,6 @@ pillow-heif==0.13.0 # via willow pip-tools==7.3.0 # via -r requirements-dev.in -platformdirs==3.10.0 - # via - # black - # pylint - # virtualenv pluggy==1.2.0 # via pytest polib==1.2.0 @@ -392,8 +332,6 @@ portalocker==2.7.0 # via # concurrent-log-handler # msal-extensions -pre-commit==3.3.3 - # via -r requirements-dev.in promise==2.3 # via graphene-django prompt-toolkit==3.0.39 @@ -404,28 +342,14 @@ ptyprocess==0.7.0 # via pexpect pure-eval==0.2.2 # via stack-data -pycodestyle==2.11.0 - # via flake8 pycparser==2.21 # via cffi pycryptodome==3.18.0 # via -r requirements.in -pyflakes==3.1.0 - # via flake8 pygments==2.16.1 # via ipython pyjwt[crypto]==2.8.0 - # via - # msal - # pyjwt -pylint==2.17.5 - # via - # pylint-django - # pylint-plugin-utils -pylint-django==2.5.3 - # via -r requirements-dev.in -pylint-plugin-utils==0.8.2 - # via pylint-django + # via msal pynacl==1.5.0 # via paramiko pyproject-hooks==1.0.0 @@ -474,8 +398,6 @@ pyyaml==6.0.1 # via # caprover-api # drf-spectacular - # libcst - # pre-commit # uvicorn redis==4.6.0 # via @@ -500,6 +422,8 @@ rpds-py==0.9.2 # via # jsonschema # referencing +ruff==0.6.2 + # via -r requirements-dev.in s3transfer==0.6.1 # via boto3 sendgrid==6.10.0 @@ -533,8 +457,6 @@ stack-data==0.6.2 # via ipython starkbank-ecdsa==2.2.0 # via sendgrid -stdlibs==2022.10.9 - # via usort structlog==23.1.0 # via -r requirements.in swapper==1.3.0 @@ -547,27 +469,15 @@ text-unidecode==1.3 # via # graphene-django # python-slugify -toml==0.10.2 - # via usort tomli==2.0.1 # via - # black # build # django-stubs # ipdb # mypy # pip-tools - # pylint # pyproject-hooks # pytest -tomlkit==0.12.1 - # via - # pylint - # ufmt -trailrunner==1.4.0 - # via - # ufmt - # usort traitlets==5.9.0 # via # ipython @@ -589,7 +499,6 @@ types-urllib3==1.26.25.14 typing-extensions==4.7.1 # via # asgiref - # astroid # azure-core # azure-storage-blob # dj-database-url @@ -597,18 +506,11 @@ typing-extensions==4.7.1 # django-stubs-ext # djangorestframework-stubs # jwcrypto - # libcst # mypy - # typing-inspect - # ufmt # uvicorn # wagtail-localize -typing-inspect==0.9.0 - # via libcst ua-parser==0.18.0 # via -r requirements.in -ufmt==2.2.0 - # via -r requirements-dev.in uritemplate==4.1.1 # via drf-spectacular urllib3==1.26.16 @@ -616,14 +518,10 @@ urllib3==1.26.16 # botocore # requests # sentry-sdk -usort==1.0.7 - # via ufmt uvicorn[standard]==0.23.2 # via -r requirements.in uvloop==0.17.0 # via uvicorn -virtualenv==20.24.2 - # via pre-commit wagtail==5.1 # via # -r requirements.in @@ -652,11 +550,7 @@ wheel==0.41.1 whitenoise[brotli]==6.5.0 # via -r requirements.in willow[heif]==1.6.1 - # via - # wagtail - # willow -wrapt==1.15.0 - # via astroid + # via wagtail # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/server/setup.cfg b/server/setup.cfg index 89bb03c8..64efb619 100644 --- a/server/setup.cfg +++ b/server/setup.cfg @@ -1,24 +1,5 @@ -[flake8] -max-line-length = 120 -exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv - -[pycodestyle] -max-line-length = 120 -exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv - -[isort] -line_length = 88 -known_first_party = vbv_lernwelt,config -multi_line_output = 3 -default_section = THIRDPARTY -skip = venv/ -skip_glob = **/migrations/*.py -include_trailing_comma = true -force_grid_wrap = 0 -use_parentheses = true - [mypy] -python_version = 3.9 +python_version = 3.10 check_untyped_defs = True ignore_missing_imports = True warn_unused_ignores = True