summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers+gitlab@digital-scurf.org>2021-11-16 08:56:19 +0000
committerDaniel Silverstone <dsilvers+gitlab@digital-scurf.org>2021-11-16 08:56:19 +0000
commit00e5df7d31bf9fa0827dc1fe9ee1f7ee61b2b997 (patch)
treeef58627649e0867de19089fee10a0b003f01b1c8
parentb54b80dac6fe81489a935f2c053de441565fd7ee (diff)
parent2abe1020bbc3a2bf966bc554d9c24061679ec62e (diff)
downloadsubplot-00e5df7d31bf9fa0827dc1fe9ee1f7ee61b2b997.tar.gz
Merge branch 'fix-pyflake8' into 'main'
test: disable (some) flake8 formatting checks See merge request subplot/subplot!231
-rwxr-xr-xcheck8
-rw-r--r--flake8.ini3
-rw-r--r--share/python/lib/daemon.py1
3 files changed, 9 insertions, 3 deletions
diff --git a/check b/check
index b7c5164..e95b53a 100755
--- a/check
+++ b/check
@@ -174,11 +174,11 @@ def check_python(r):
)
# Test with flake8 if available. Flake8 finds Python files itself.
- r.runcmd_maybe(["flake8", "check"] + py)
+ r.runcmd_maybe(["flake8", "--config=flake8.ini", "check"] + py)
# Check formatting with Black. We need to provide the files to Python
# ourselves.
- r.runcmd_maybe(["black", "--check"] + py)
+ # r.runcmd_maybe(["black", "--check"] + py)
# Find and run unit tests.
tests = find_files("**/*_tests.py", lambda f: True)
@@ -336,7 +336,9 @@ def check_tooling(r):
if not r.got_command(command):
if command == "pandoc-citeproc":
if r.pandoc_is_newer():
- r.msg(" Fortunately pandoc is new enough for --citeproc, no need for pandoc-citeproc")
+ r.msg(
+ " Fortunately pandoc is new enough for --citeproc, no need for pandoc-citeproc"
+ )
continue
sys.exit(f"can't find {command}, which is needed for test suite")
diff --git a/flake8.ini b/flake8.ini
new file mode 100644
index 0000000..5cf16d3
--- /dev/null
+++ b/flake8.ini
@@ -0,0 +1,3 @@
+[flake8]
+max-line-length = 999
+ignore = E203, E302, W503 \ No newline at end of file
diff --git a/share/python/lib/daemon.py b/share/python/lib/daemon.py
index 1d0d443..9f58af0 100644
--- a/share/python/lib/daemon.py
+++ b/share/python/lib/daemon.py
@@ -65,6 +65,7 @@ def _daemon_whereis(path):
return absolute
return path
+
# Start a daeamon, get its PID. Don't wait for a port or anything. This is
# meant for background processes that don't have port. Useful for testing the
# lib/daemon library of Subplot, but not much else.