Update version to v2025.07.11

packaging: Just depend on ruby instead of ruby3.1
- Let debian bookworm and trixie both work. - Other distros are using ruby.
2025-07-11 23:05:37 +10:00 · 2025-07-11 23:03:17 +10:00 · 2025-06-27 23:18:17 +10:00 · 2025-06-27 23:02:57 +10:00 · 2025-06-24 22:10:46 +10:00 · 2025-06-24 18:33:01 +10:00
13 changed files with 31 additions and 28 deletions
--- a/README.md
+++ b/README.md
@ -12,11 +12,11 @@ Eris can be installed by pipx or [uv](https://docs.astral.sh/uv/getting-started/
 To install with pipx:
-    pipx install git+https://gitlab.com/ahamilton/eris@v2025.06.21
+    pipx install git+https://gitlab.com/ahamilton/eris@v2025.07.11
 or to install with uv:
-    uv tool install git+https://gitlab.com/ahamilton/eris@v2025.06.21
+    uv tool install git+https://gitlab.com/ahamilton/eris@v2025.07.11
 Then use eris to install all the tools it uses:
--- a/eris/init.py
+++ b/eris/init.py
@ -1 +1 @@
-__version__ = "v2025.06.21"
+__version__ = "v2025.07.11"
--- a/eris/main.py
+++ b/eris/main.py
@ -794,7 +794,7 @@ class Screen:
            path_colored = lscolors.path_colored(path)
            self._log.log_message([in_green("Patching file: "), path_colored])
            subprocess.run(f"{result.tool.patch_command} {path} | patch -p0", shell=True,
-                           stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+                           capture_output=True)
            subprocess.run(["touch", path])
    def toggle_status_style(self):
@ -1144,6 +1144,8 @@ def print_tool_info():
                print(f"command: {tool.command} foo.{extensions[0]}")
            else:
                print("function:", "eris.tools." + tool.__name__)
            if hasattr(tool, "patch_command") and tool.patch_command is not None:
                print(f"patch command: {tool.patch_command} foo.{extensions[0]}")
            print("url:", tool.url)
            print("extensions:", ", ".join(extensions))
            print("")
@ -1155,8 +1157,7 @@ def install_all_tools():
    install_command = ["apt", "-y", "install"]  # debian / ubuntu
    if "ID=fedora\n" in os_release_lines:
        tools_.remove("lua-check")
-        renames = {"lua5.3": "lua", "python3-bandit": "bandit", "ruby3.1": "ruby",
+        renames = {"lua5.3": "lua", "python3-bandit": "bandit", "xz-utils": "xz"}
                   "xz-utils": "xz"}
        tools_ = [renames.get(tool, tool) for tool in tools_]
        install_command = ["dnf", "-y", "install"]
    elif "ID=arch\n" in os_release_lines:
@ -1164,8 +1165,8 @@ def install_all_tools():
        tools_.remove("python3-pdfminer")  # pdf2txt is not in arch
        tools_.remove("perl-doc")  # perldoc is in perl but not in the path
        tools_.remove("7zip")
-        renames = {"genisoimage": "cdrkit", "lua5.3": "lua", "ruby3.1": "ruby", "xz-utils": "xz",
+        renames = {"genisoimage": "cdrkit", "lua5.3": "lua", "xz-utils": "xz", "g++": "gcc",
-                   "g++": "gcc", "golang-go": "go", "lua-check": "luacheck", "php-cli": "php",
+                   "golang-go": "go", "lua-check": "luacheck", "php-cli": "php",
                   "pylint": "python-pylint", "python3-bandit": "bandit", "python3-mypy": "mypy"}
        tools_ = [renames.get(tool, tool) for tool in tools_]
        tools_ = ["python-" + tool[len("python3-"):] if tool.startswith("python3-") else tool
@ -1174,8 +1175,8 @@ def install_all_tools():
    elif "ID=alpine\n" in os_release_lines:
        tools_.remove("python3-bandit")
        tools_.remove("wabt")
-        renames = {"genisoimage": "cdrkit", "lua5.3": "lua", "ruby3.1": "ruby", "xz-utils": "xz",
+        renames = {"genisoimage": "cdrkit", "lua5.3": "lua", "xz-utils": "xz", "g++": "gcc",
-                   "g++": "gcc", "golang-go": "go", "lua-check": "luacheck", "php-cli": "php",
+                   "golang-go": "go", "lua-check": "luacheck", "php-cli": "php",
                   "pylint": "py3-pylint", "tidy": "tidyhtml"}
        tools_ = [renames.get(tool, tool) for tool in tools_]
        tools_ = ["py3-" + tool[len("python3-"):] if tool.startswith("python3-") else tool
--- a/eris/tools.toml
+++ b/eris/tools.toml
@ -103,7 +103,7 @@ tools_for_extensions = [
  dependencies = ["python3-isort", "python3-colorama"]
  url = "https://pycqa.github.io/isort/"
  command = "/usr/bin/python3 -m isort --check-only --diff --color"
-  patch_command = "/usr/bin/python3 -m isort --diff"
+  patch_command = "/usr/bin/python3 -m isort --overwrite-in-place"
  has_color = true
 [perl_syntax]
@ -128,6 +128,7 @@ tools_for_extensions = [
  dependencies = ["git"]
  url = "https://git-scm.com/docs/git-diff"
  command = "git diff --exit-code"
  patch_command = "git checkout"
  has_color = true
 [git_blame]
@ -247,7 +248,7 @@ tools_for_extensions = [
  command = "cppcheck --error-exitcode=1"
 [ruby_syntax]
-  dependencies = ["ruby3.1"]
+  dependencies = ["ruby"]
  url = "http://www.ruby-lang.org/"
  command = "ruby -c"
@ -255,6 +256,7 @@ tools_for_extensions = [
  dependencies = ["rubocop"]
  url = "https://rubocop.org/"
  command = "rubocop --color --fail-level autocorrect --display-style-guide"
  patch_command = "rubocop --autocorrect"
  has_color = true
 [rustfmt]
--- a/fill3/fill3/init.py
+++ b/fill3/fill3/init.py
@ -15,7 +15,7 @@ import fill3.terminal as terminal
 import termstr
-__version__ = "v2025.06.21"
+__version__ = "v2025.07.11"
 ##########################
--- a/fill3/pyproject.toml
+++ b/fill3/pyproject.toml
@ -2,7 +2,7 @@ tool.uv.package = true
 [project]
 name = "fill3"
-version = "v2025.06.21"
+version = "v2025.07.11"
 description = "Fill3 provides basic widgets for a tui."
 authors = [
    { name = "Andrew Hamilton", email = "and_hamilton@yahoo.com" },
--- a/lscolors/lscolors/init.py
+++ b/lscolors/lscolors/init.py
@ -15,7 +15,7 @@ import lscolors
 import termstr
-__version__ = "v2025.06.21"
+__version__ = "v2025.07.11"
 FILE_KEY = "fi"
--- a/lscolors/pyproject.toml
+++ b/lscolors/pyproject.toml
@ -7,7 +7,7 @@ allow-direct-references = true
 [project]
 name = "lscolors"
-version = "v2025.06.21"
+version = "v2025.07.11"
 description = "Give coloring for file types as in the ls command."
 authors = [
    { name = "Andrew Hamilton", email = "and_hamilton@yahoo.com" },
--- a/packaging/make-readme.py
+++ b/packaging/make-readme.py
@ -28,11 +28,11 @@ Eris can be installed by pipx or [uv](https://docs.astral.sh/uv/getting-started/
 To install with pipx:
-    pipx install git+https://gitlab.com/ahamilton/eris@v2025.06.21
+    pipx install git+https://gitlab.com/ahamilton/eris@v2025.07.11
 or to install with uv:
-    uv tool install git+https://gitlab.com/ahamilton/eris@v2025.06.21
+    uv tool install git+https://gitlab.com/ahamilton/eris@v2025.07.11
 Then use eris to install all the tools it uses:
--- a/pyproject.toml
+++ b/pyproject.toml
@ -2,7 +2,7 @@ tool.uv.package = true
 [project]
 name = "eris"
-version = "v2025.06.21"
+version = "v2025.07.11"
 description = "Eris maintains an up-to-date set of reports for every file in a codebase."
 readme = "README.md"
 authors = [
@ -11,13 +11,13 @@ authors = [
 requires-python = ">=3.11"
 dependencies = [
    "docopt-ng==0.9.0",
-    "fill3 @ git+https://gitlab.com/ahamilton/eris@v2025.06.21#subdirectory=fill3",
+    "fill3 @ git+https://gitlab.com/ahamilton/eris@v2025.07.11#subdirectory=fill3",
-    "lscolors @ git+https://gitlab.com/ahamilton/eris@v2025.06.21#subdirectory=lscolors",
+    "lscolors @ git+https://gitlab.com/ahamilton/eris@v2025.07.11#subdirectory=lscolors",
    "pexpect==4.9.0",
    "pillow==11.2.1",
    "pygments==2.19.1",
    "pyinotify-elephant-fork==0.0.1",
-    "termstr @ git+https://gitlab.com/ahamilton/eris@v2025.06.21#subdirectory=termstr",
+    "termstr @ git+https://gitlab.com/ahamilton/eris@v2025.07.11#subdirectory=termstr",
 ]
 [tool.uv.sources]
--- a/termstr/pyproject.toml
+++ b/termstr/pyproject.toml
@ -2,7 +2,7 @@ tool.uv.package = true
 [project]
 name = "termstr"
-version = "v2025.06.21"
+version = "v2025.07.11"
 description = "Termstr provides strings with extra terminal styling."
 authors = [
    { name = "Andrew Hamilton", email = "and_hamilton@yahoo.com" },
--- a/termstr/termstr/init.py
+++ b/termstr/termstr/init.py
@ -10,7 +10,7 @@ import weakref
 import cwcwidth
-__version__ = "v2025.06.21"
+__version__ = "v2025.07.11"
 ESC = "\x1b"
--- a/uv.lock
+++ b/uv.lock
@ -27,7 +27,7 @@ wheels = [
 [[package]]
 name = "eris"
-version = "2025.6.21"
+version = "2025.7.11"
 source = { editable = "." }
 dependencies = [
    { name = "docopt-ng" },
@ -54,7 +54,7 @@ requires-dist = [
 [[package]]
 name = "fill3"
-version = "2025.6.21"
+version = "2025.7.11"
 source = { editable = "fill3" }
 dependencies = [
    { name = "termstr" },
@ -65,7 +65,7 @@ requires-dist = [{ name = "termstr", editable = "termstr" }]
 [[package]]
 name = "lscolors"
-version = "2025.6.21"
+version = "2025.7.11"
 source = { editable = "lscolors" }
 dependencies = [
    { name = "termstr" },
@ -171,7 +171,7 @@ sdist = { url = "https://files.pythonhosted.org/packages/d6/b4/b44fccc7040b01449
 [[package]]
 name = "termstr"
-version = "2025.6.21"
+version = "2025.7.11"
 source = { editable = "termstr" }
 dependencies = [
    { name = "cwcwidth" },
Author	SHA1	Message	Date
Andrew Hamilton	9e24f7cb85	Update version to v2025.07.11	2025-07-11 23:05:37 +10:00
Andrew Hamilton	699f808951	packaging: Just depend on ruby instead of ruby3.1 - Let debian bookworm and trixie both work. - Other distros are using ruby.	2025-07-11 23:03:17 +10:00
Andrew Hamilton	327852af40	tools: Let rubocop do autocorrect patches	2025-06-27 23:18:17 +10:00
Andrew Hamilton	267a100b09	tools: Add patch command to "git diff" - May as well let the changes be easily removed.	2025-06-27 23:02:57 +10:00
Andrew Hamilton	906b0510bb	Add patch_command to the tool summary	2025-06-24 22:10:46 +10:00
Andrew Hamilton	a8f3261ab8	tools: Fix isort - Isort's has patches containing absolute paths that don't apply. - Let isort apply the patch itself. - The patch_command can either do the patch or return a patch.	2025-06-24 18:33:01 +10:00
`@ -1 +1 @@`
	`__version__ = "v2025.06.21"`	`__version__ = "v2025.07.11"`