From 6dcdadd0e3682af41264f4935e9375e4231eecb8 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 25 Apr 2023 23:02:23 +0200
Subject: [PATCH] config black exceptions in pyproject.toml

This means that anyone can run `black .` and it won't break things. Plus it
gives us a roadmap for fully enabling black.
---
 .gitlab-ci.yml | 40 +---------------------------------------
 pyproject.toml | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48ccd791..b5bfa058 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -254,45 +254,7 @@ black:
   <<: *apt-template
   script:
     - apt-get install black
-    - black --check --diff --color
-        examples/fdroid_clean_repos.py
-        examples/fdroid_extract_repo_pubkey.py
-        fdroid
-        fdroidserver/btlog.py
-        fdroidserver/exception.py
-        fdroidserver/gpgsign.py
-        fdroidserver/init.py
-        fdroidserver/lint.py
-        fdroidserver/mirror.py
-        fdroidserver/net.py
-        fdroidserver/readmeta.py
-        fdroidserver/rewritemeta.py
-        fdroidserver/signatures.py
-        fdroidserver/signindex.py
-        fdroidserver/tail.py
-        fdroidserver/verify.py
-        setup.py
-        tests/api.TestCase
-        tests/build.TestCase
-        tests/deploy.TestCase
-        tests/dump_internal_metadata_format.py
-        tests/exception.TestCase
-        tests/gpgsign.TestCase
-        tests/import_subcommand.TestCase
-        tests/index.TestCase
-        tests/init.TestCase
-        tests/install.TestCase
-        tests/key-tricks.py
-        tests/lint.TestCase
-        tests/main.TestCase
-        tests/metadata.TestCase
-        tests/net.TestCase
-        tests/nightly.TestCase
-        tests/rewritemeta.TestCase
-        tests/scanner.TestCase
-        tests/signindex.TestCase
-        tests/vcs.TestCase
-        tests/verify.TestCase
+    - black --check --diff --color $CI_PROJECT_DIR
 
 fedora_latest:
   image: fedora:latest
diff --git a/pyproject.toml b/pyproject.toml
index 489df45b..9702f4e5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,45 @@
 [tool.black]
 skip-string-normalization = true
 target-version = ["py38"]
+include = '(^fdroid|\.pyi?|\.TestCase)$'
+# These files will never be included in black runs.  To run black on
+# one of thes files, remove it from this list.
+force-exclude = '''(
+  \.direnv|\.eggs|\.git|\.hg|\.mypy_cache|\.nox|\.svn|\.tox|\.venv|venv|_build|buck-out|build|dist|__pypackages__
+  | docs/source/conf\.py
+  | examples/fdroid_export_keystore_to_nitrokey\.py
+  | examples/fdroid_exportkeystore\.py
+  | examples/fdroid_fetchsrclibs\.py
+  | examples/fdroid_nitrokeyimport\.py
+  | fdroidserver/__init__\.py
+  | fdroidserver/__main__\.py
+  | fdroidserver/apksigcopier\.py
+  | fdroidserver/build\.py
+  | fdroidserver/checkupdates\.py
+  | fdroidserver/common\.py
+  | fdroidserver/deploy\.py
+  | fdroidserver/import_subcommand\.py
+  | fdroidserver/index\.py
+  | fdroidserver/install\.py
+  | fdroidserver/metadata\.py
+  | fdroidserver/nightly\.py
+  | fdroidserver/publish\.py
+  | fdroidserver/scanner\.py
+  | fdroidserver/update\.py
+  | fdroidserver/vmtools\.py
+  | locale/pick-complete-translations\.py
+  | tests/config\.py
+  | tests/extra/manual-vmtools-test\.py
+  | tests/gradle-release-checksums\.py
+  | tests/openssl-version-check-test\.py
+  | tests/testcommon\.py
+  | tests/valid-package-names/test\.py
+  | tests/checkupdates\.TestCase
+  | tests/common\.TestCase
+  | tests/publish\.TestCase
+  | tests/signatures\.TestCase
+  | tests/update\.TestCase
+)$'''
 
 
 [tool.mypy]