Skip to content

Commit

Permalink
Run pre-commit hooks (#2822)
Browse files Browse the repository at this point in the history
* Apply pre-commit hooks

* Remove second option from tool.djlint.exclude

---------

Co-authored-by: deen13 <[email protected]>
  • Loading branch information
timobrembeck and deen13 authored Aug 7, 2024
1 parent 508b734 commit 3394b72
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ RUN apt-get install -y netcat-traditional pcregrep

WORKDIR /workspace

CMD ["sleep", "infinity"]
CMD ["sleep", "infinity"]
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repos:
- id: mixed-line-ending
- id: trailing-whitespace
args: ["--markdown-linebreak-ext=md,markdown"]
exclude: .github/PULL_REQUEST_TEMPLATE.md
exclude: .github/PULL_REQUEST_TEMPLATE.md|tests/cms/views/dashboard/expected_output/chat.html
- id: no-commit-to-branch
args: [--branch, main, --branch, develop]
- repo: https://github.com/astral-sh/ruff-pre-commit
Expand All @@ -33,7 +33,7 @@ repos:
rev: v1.34.1
hooks:
- id: djlint-django
args: [--reformat, --lint]
args: [--reformat, --lint, --exclude, tests/cms/views/dashboard/expected_output]
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v8.56.0
hooks:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ This content management system helps local integration experts to provide multil
## Development Setup

This section provides a brief overview of setting up the development environment.
We support various environments: you can set up everything locally using your preferred package manager, use it as a devcontainer, or utilize the nix-flake.
Please clone the repository with the following snippet before starting to set up your development environment.
We support various environments: you can set up everything locally using your preferred package manager, use it as a devcontainer, or utilize the nix-flake. Please clone the repository with the following snippet before starting to
setup your development environment.

````
git clone [email protected]:digitalfabrik/integreat-cms.git
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion integreat_cms/static/src/svg/speech.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,10 @@ line_break_after_multiline_tag=true
# exclude invalid html files until this is resolved https://github.com/djlint/djLint/issues/703
exclude = "integreat_cms/api/v3/templates/"

[tool.isort]
profile = "black"
order_by_type = false

[tool.pylint.main]
jobs = 0
load-plugins = [
Expand Down
2 changes: 1 addition & 1 deletion tools/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ if [[ ! -x "$(command -v pip3)" ]]; then
echo "Pip for Python3 is not installed. Please install python3-pip manually and run this script again." | print_error
exit 1
fi
# Check if postgres instance is running on host system or database backend is installed
# Check if postgres instance is running on host system or database backend is installed
if ! { [[ -x "$(command -v docker)" ]] || [[ -x "$(command -v psql)" ]] || nc -z localhost 5432 > /dev/null 2>&1; }; then
echo "In order to run the database, you need either Docker (recommended) or PostgreSQL. Please install at least one of them manually and run this script again."
exit 1
Expand Down

0 comments on commit 3394b72

Please sign in to comment.