Add ruff package, remove unneeded packages

This commit is contained in:
Daniel Egger 2024-08-27 15:19:08 +02:00
parent d5e6b623d3
commit b862cdeb46
4 changed files with 9 additions and 139 deletions

View File

@ -64,9 +64,10 @@ python-linting: &python-linting
script: script:
- source ./env/bitbucket/prepare_for_test.sh - source ./env/bitbucket/prepare_for_test.sh
- pip install -r server/requirements/requirements-dev.txt - 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 - 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 . - trufflehog --exclude_paths trufflehog-exclude-patterns.txt --allow trufflehog-allow.json --entropy=True --max_depth=100 .
- ufmt check server
js-tests: &js-tests js-tests: &js-tests
name: js tests name: js tests

View File

@ -13,16 +13,10 @@ pytest-xdist #
pytest-order pytest-order
djangorestframework-stubs # https://github.com/typeddjango/djangorestframework-stubs djangorestframework-stubs # https://github.com/typeddjango/djangorestframework-stubs
# Code quality # Code quality
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
flake8 # https://github.com/PyCQA/flake8
flake8-isort # https://github.com/gforcada/flake8-isort
coverage # https://github.com/nedbat/coveragepy coverage # https://github.com/nedbat/coveragepy
black>=22.8.0 # https://github.com/psf/black ruff
pylint-django # https://github.com/PyCQA/pylint-django
pre-commit # https://github.com/pre-commit/pre-commit
ufmt
# Django # Django
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------

View File

@ -20,8 +20,6 @@ argon2-cffi-bindings==21.2.0
# via argon2-cffi # via argon2-cffi
asgiref==3.7.2 asgiref==3.7.2
# via django # via django
astroid==2.15.6
# via pylint
asttokens==2.2.1 asttokens==2.2.1
# via stack-data # via stack-data
async-property==0.2.2 async-property==0.2.2
@ -32,7 +30,6 @@ attrs==23.1.0
# via # via
# jsonschema # jsonschema
# referencing # referencing
# usort
authlib==1.2.1 authlib==1.2.1
# via -r requirements.in # via -r requirements.in
azure-core==1.29.1 azure-core==1.29.1
@ -49,10 +46,6 @@ bcrypt==4.0.1
# via paramiko # via paramiko
beautifulsoup4==4.11.2 beautifulsoup4==4.11.2
# via wagtail # via wagtail
black==23.7.0
# via
# -r requirements-dev.in
# ufmt
boto3==1.28.23 boto3==1.28.23
# via -r requirements.in # via -r requirements.in
botocore==1.31.23 botocore==1.31.23
@ -76,19 +69,13 @@ cffi==1.15.1
# argon2-cffi-bindings # argon2-cffi-bindings
# cryptography # cryptography
# pynacl # pynacl
cfgv==3.3.1
# via pre-commit
charset-normalizer==3.2.0 charset-normalizer==3.2.0
# via requests # via requests
click==8.1.6 click==8.1.6
# via # via
# -r requirements.in # -r requirements.in
# black
# django-click # django-click
# moreorless
# pip-tools # pip-tools
# ufmt
# usort
# uvicorn # uvicorn
concurrent-log-handler==0.9.24 concurrent-log-handler==0.9.24
# via -r requirements.in # via -r requirements.in
@ -113,10 +100,6 @@ defusedxml==0.7.1
# via willow # via willow
deprecation==2.1.0 deprecation==2.1.0
# via python-keycloak # via python-keycloak
dill==0.3.7
# via pylint
distlib==0.3.7
# via virtualenv
dj-database-url==2.0.0 dj-database-url==2.0.0
# via -r requirements.in # via -r requirements.in
django==4.2.13 django==4.2.13
@ -223,16 +206,8 @@ factory-boy==3.3.0
# wagtail-factories # wagtail-factories
faker==19.3.0 faker==19.3.0
# via factory-boy # via factory-boy
filelock==3.12.2
# via virtualenv
filetype==1.2.0 filetype==1.2.0
# via willow # 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 freezegun==1.2.2
# via -r requirements-dev.in # via -r requirements-dev.in
gitdb==4.0.10 gitdb==4.0.10
@ -268,8 +243,6 @@ httptools==0.6.0
# via uvicorn # via uvicorn
httpx==0.27.0 httpx==0.27.0
# via python-keycloak # via python-keycloak
identify==2.5.26
# via pre-commit
idna==3.4 idna==3.4
# via # via
# anyio # anyio
@ -285,10 +258,6 @@ ipython==8.14.0
# via ipdb # via ipdb
isodate==0.6.1 isodate==0.6.1
# via azure-storage-blob # via azure-storage-blob
isort==5.12.0
# via
# flake8-isort
# pylint
jedi==0.19.0 jedi==0.19.0
# via ipython # via ipython
jmespath==1.0.1 jmespath==1.0.1
@ -305,24 +274,10 @@ jwcrypto==1.5.6
# via python-keycloak # via python-keycloak
l18n==2021.3 l18n==2021.3
# via wagtail # via wagtail
lazy-object-proxy==1.9.0
# via astroid
libcst==1.0.1
# via
# ufmt
# usort
marshmallow==3.20.1 marshmallow==3.20.1
# via environs # via environs
matplotlib-inline==0.1.6 matplotlib-inline==0.1.6
# via ipython # via ipython
mccabe==0.7.0
# via
# flake8
# pylint
moreorless==0.4.0
# via
# ufmt
# usort
msal==1.23.0 msal==1.23.0
# via # via
# azure-identity # azure-identity
@ -335,21 +290,15 @@ mypy==1.4.1
# django-stubs # django-stubs
# djangorestframework-stubs # djangorestframework-stubs
mypy-extensions==1.0.0 mypy-extensions==1.0.0
# via # via mypy
# black
# mypy
# typing-inspect
newrelic==8.11.0 newrelic==8.11.0
# via -r requirements.in # via -r requirements.in
nodeenv==1.8.0
# via pre-commit
openpyxl==3.1.2 openpyxl==3.1.2
# via # via
# -r requirements.in # -r requirements.in
# wagtail # wagtail
packaging==23.1 packaging==23.1
# via # via
# black
# build # build
# deprecation # deprecation
# gunicorn # gunicorn
@ -362,10 +311,6 @@ paramiko==3.3.1
# sftpserver # sftpserver
parso==0.8.3 parso==0.8.3
# via jedi # via jedi
pathspec==0.11.2
# via
# black
# trailrunner
pexpect==4.8.0 pexpect==4.8.0
# via ipython # via ipython
pickleshare==0.7.5 pickleshare==0.7.5
@ -379,11 +324,6 @@ pillow-heif==0.13.0
# via willow # via willow
pip-tools==7.3.0 pip-tools==7.3.0
# via -r requirements-dev.in # via -r requirements-dev.in
platformdirs==3.10.0
# via
# black
# pylint
# virtualenv
pluggy==1.2.0 pluggy==1.2.0
# via pytest # via pytest
polib==1.2.0 polib==1.2.0
@ -392,8 +332,6 @@ portalocker==2.7.0
# via # via
# concurrent-log-handler # concurrent-log-handler
# msal-extensions # msal-extensions
pre-commit==3.3.3
# via -r requirements-dev.in
promise==2.3 promise==2.3
# via graphene-django # via graphene-django
prompt-toolkit==3.0.39 prompt-toolkit==3.0.39
@ -404,28 +342,14 @@ ptyprocess==0.7.0
# via pexpect # via pexpect
pure-eval==0.2.2 pure-eval==0.2.2
# via stack-data # via stack-data
pycodestyle==2.11.0
# via flake8
pycparser==2.21 pycparser==2.21
# via cffi # via cffi
pycryptodome==3.18.0 pycryptodome==3.18.0
# via -r requirements.in # via -r requirements.in
pyflakes==3.1.0
# via flake8
pygments==2.16.1 pygments==2.16.1
# via ipython # via ipython
pyjwt[crypto]==2.8.0 pyjwt[crypto]==2.8.0
# via # via msal
# 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
pynacl==1.5.0 pynacl==1.5.0
# via paramiko # via paramiko
pyproject-hooks==1.0.0 pyproject-hooks==1.0.0
@ -474,8 +398,6 @@ pyyaml==6.0.1
# via # via
# caprover-api # caprover-api
# drf-spectacular # drf-spectacular
# libcst
# pre-commit
# uvicorn # uvicorn
redis==4.6.0 redis==4.6.0
# via # via
@ -500,6 +422,8 @@ rpds-py==0.9.2
# via # via
# jsonschema # jsonschema
# referencing # referencing
ruff==0.6.2
# via -r requirements-dev.in
s3transfer==0.6.1 s3transfer==0.6.1
# via boto3 # via boto3
sendgrid==6.10.0 sendgrid==6.10.0
@ -533,8 +457,6 @@ stack-data==0.6.2
# via ipython # via ipython
starkbank-ecdsa==2.2.0 starkbank-ecdsa==2.2.0
# via sendgrid # via sendgrid
stdlibs==2022.10.9
# via usort
structlog==23.1.0 structlog==23.1.0
# via -r requirements.in # via -r requirements.in
swapper==1.3.0 swapper==1.3.0
@ -547,27 +469,15 @@ text-unidecode==1.3
# via # via
# graphene-django # graphene-django
# python-slugify # python-slugify
toml==0.10.2
# via usort
tomli==2.0.1 tomli==2.0.1
# via # via
# black
# build # build
# django-stubs # django-stubs
# ipdb # ipdb
# mypy # mypy
# pip-tools # pip-tools
# pylint
# pyproject-hooks # pyproject-hooks
# pytest # pytest
tomlkit==0.12.1
# via
# pylint
# ufmt
trailrunner==1.4.0
# via
# ufmt
# usort
traitlets==5.9.0 traitlets==5.9.0
# via # via
# ipython # ipython
@ -589,7 +499,6 @@ types-urllib3==1.26.25.14
typing-extensions==4.7.1 typing-extensions==4.7.1
# via # via
# asgiref # asgiref
# astroid
# azure-core # azure-core
# azure-storage-blob # azure-storage-blob
# dj-database-url # dj-database-url
@ -597,18 +506,11 @@ typing-extensions==4.7.1
# django-stubs-ext # django-stubs-ext
# djangorestframework-stubs # djangorestframework-stubs
# jwcrypto # jwcrypto
# libcst
# mypy # mypy
# typing-inspect
# ufmt
# uvicorn # uvicorn
# wagtail-localize # wagtail-localize
typing-inspect==0.9.0
# via libcst
ua-parser==0.18.0 ua-parser==0.18.0
# via -r requirements.in # via -r requirements.in
ufmt==2.2.0
# via -r requirements-dev.in
uritemplate==4.1.1 uritemplate==4.1.1
# via drf-spectacular # via drf-spectacular
urllib3==1.26.16 urllib3==1.26.16
@ -616,14 +518,10 @@ urllib3==1.26.16
# botocore # botocore
# requests # requests
# sentry-sdk # sentry-sdk
usort==1.0.7
# via ufmt
uvicorn[standard]==0.23.2 uvicorn[standard]==0.23.2
# via -r requirements.in # via -r requirements.in
uvloop==0.17.0 uvloop==0.17.0
# via uvicorn # via uvicorn
virtualenv==20.24.2
# via pre-commit
wagtail==5.1 wagtail==5.1
# via # via
# -r requirements.in # -r requirements.in
@ -652,11 +550,7 @@ wheel==0.41.1
whitenoise[brotli]==6.5.0 whitenoise[brotli]==6.5.0
# via -r requirements.in # via -r requirements.in
willow[heif]==1.6.1 willow[heif]==1.6.1
# via # via wagtail
# wagtail
# willow
wrapt==1.15.0
# via astroid
# The following packages are considered to be unsafe in a requirements file: # The following packages are considered to be unsafe in a requirements file:
# pip # pip

View File

@ -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] [mypy]
python_version = 3.9 python_version = 3.10
check_untyped_defs = True check_untyped_defs = True
ignore_missing_imports = True ignore_missing_imports = True
warn_unused_ignores = True warn_unused_ignores = True