resolve merge conflict in release notes, re #10787

archesproject · Jun 25, 2024 · 2e323ef · 2e323ef
2 parents b6dca52 + c825b59
commit 2e323ef
Show file tree

Hide file tree

Showing 451 changed files with 61,350 additions and 39,986 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,7 +1,7 @@
 [run]
-source = arches
+source =
+    arches/
 
-[report]
 omit =
     */python?.?/*
     */models/migrations/*
@@ -10,5 +10,20 @@ omit =
     */wsgi.py
     */celery.py
     */__init__.py
-
+
+data_file = coverage/python/.coverage
+
+[report]
 show_missing = true
+
+exclude_lines =
+    pragma: no cover
+
+[html]
+directory = coverage/python/htmlcov
+
+[xml]
+output = coverage/python/coverage.xml
+
+[json]
+output = coverage/python/coverage.json
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,3 +1,9 @@
+# Reformat python code with black (2024)
+6d519d00e752448362b880b73c3641a562ee9ee3
+eea27d316c5ff975556e15ccd4c11d7c393dd95c
+8de09526329685ee4d80c816c3475a66b19d46e9
+9740c846eda0cc067f49d7abffdcb1a93fe3e0a9
+# Relevant subset of git log --grep black
 9b7e30d4499cb02dec6d17c7c99f9a7087fcdd47
 b959f1139a1d789e6c116d43d8be7daa0baa6075
 9a0a8789635af909dbef7edc4bb3f7e1b6d68bc4
@@ -26,6 +32,7 @@ a6027f6485abf8da610ffa6b41e890da361f359a
 389d8c846b011a04a22a000f1cc914c4e8987a90
 6ed0767170ff67764a2e676971541ef1e83010d6
 c7d4eb120f13eee2d9f9708e203387a875663110
+# git log --grep 'Fixing style errors.'
 5df93c451e4123b96b1e32b79e60b97db9d6fad1
 60d32a3f795e5e3eff67979c3239c84d7c0c7eaa
 0af36402f86f2b6d6a70238d85ae290c5201ba17