From 6d58ba7feb657b186b59c3531cf638bb02d1ac83 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Sun, 21 Nov 2021 13:30:12 +0100
Subject: [PATCH] adjust ci settings to match pretalx settings

---
 .github/workflows/style.yml | 24 ++++++++++++++++++++++++
 setup.cfg                   | 28 ++++++++++++++++++++--------
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
index 499b5df..e47e8bb 100644
--- a/.github/workflows/style.yml
+++ b/.github/workflows/style.yml
@@ -61,6 +61,30 @@ jobs:
       - name: Run flake8
         run: flake8 .
         working-directory: .
+  black:
+    name: black
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: install gettext
+        run: sudo apt install gettext
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.8
+      - uses: actions/cache@v1
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+      - name: Install pretalx
+        run: pip3 install pretalx
+      - name: Install Dependencies
+        run: pip3 install black -Ue .
+      - name: Run black
+        run: black --check .
+        working-directory: .
   docformatter:
     name: docformatter
     runs-on: ubuntu-latest
diff --git a/setup.cfg b/setup.cfg
index 1805733..76e5a7b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,10 +1,22 @@
 [isort]
-balanced_wrapping = True
-combine_as_imports = True
-default_section = THIRDPARTY
-include_trailing_comma = True
-known_third_party = pretalx
-line_length = 80
-multi_line_output = 5
-not_skip = __init__.py
+multi_line_output = 3
+include_trailing_comma=True
+force_grid_wrap=0
+use_parentheses=True
+line_length=88
 skip = migrations,setup.py
+default_section = THIRDPARTY
+known_third_party = pretalx
+
+[tool:pytest]
+DJANGO_SETTINGS_MODULE=pretalx.common.settings.test_settings
+
+[check-manifest]
+ignore =
+  LICENSE
+  README.rst
+  tests
+  tests/*
+
+[flake8]
+max-line-length = 120