Merge branch 'revert_commandline_library_cleanup' into 'master'

Partial reversion of af57525d

See merge request e3/e3-require!126

.flake8

-[flake8]
-ignore = E501, E203, W503
-# E501, E203: black
-# W503: PEP8

.pre-commit-config.yaml

 repos:
-  - repo: https://github.com/ambv/black
-    rev: 22.3.0
+  - repo: https://github.com/psf/black
+    rev: 22.8.0
     hooks:
       - id: black
-  - repo: https://github.com/pycqa/flake8
-    rev: 3.9.2
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: v0.0.238
     hooks:
-    -   id: flake8
+      - id: ruff
+  - repo: https://github.com/PyCQA/doc8.git
+    rev: v1.0.0 # 1.1.0 drops python3.6 support
+    hooks:
+      - id: doc8
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.0.1 # 4.2.0 drops python3.6 support
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
-  - repo: https://github.com/timothycrosley/isort
-    rev: 5.10.1
-    hooks:
-    - id: isort
-      args: ["--profile", "black"]
-  - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v13.0.0
-    hooks:
-    - id: clang-format
+      - id: check-yaml

require-ess/Db/moduleversion.template

@@ -50,7 +50,7 @@ record(stringin,"$(REQUIRE_IOC):BaseVersion")
 }
 
 # This record contains labels for the created NTTable, named $(REQUIRE_IOC):LoadedModules.
-record(aai, "$(REQUIRE_IOC):Labels") 
+record(aai, "$(REQUIRE_IOC):Labels")
 {
     field(DESC, "Labels for the NTTable")
     field(FTVL, "STRING")

require-ess/tools/driver.makefile

@@ -192,6 +192,8 @@ USR_CPPFLAGS+=-DUSE_TYPED_RSET
 endif
 
 SHRLIB_VERSION=
+# Avoid linking everything with libreadline.so
+COMMANDLINE_LIBRARY=
 
 OBJ=.o
 

ruff.toml

+extend-select = ["D212"]
+extend-ignore = ["D105", "D107", "D202", "D418", "E501"]

tests/utils.py

@@ -153,9 +153,7 @@ EXCLUDE_ARCHS+=debug
 
 
 def run_ioc_get_output(*args, **kwargs):
-    """
-    Run an IOC and try to load the test module
-    """
+    """Run an IOC and try to load the test module."""
     ioc_args = []
     module = kwargs.get("module", None)
     version = kwargs.get("version", None)