Use ruff format across files

Author: bulletmark

Makefile

@@ -1,20 +1,26 @@
 NAME = $(shell basename $(CURDIR))
 PYNAME = $(subst -,_,$(NAME))
+PYFILES = $(PYNAME)/*.py $(PYNAME)/*/*.py
 
 check:
-	ruff check .
-	vermin -vv --exclude importlib.metadata --no-tips -i */*.py */*/*.py
-
-build:
-	rm -rf dist
-	python3 -m build
+	ruff check $(PYFILES)
+	mypy $(PYFILES)
+	vermin -vv --exclude importlib.metadata --exclude tomllib \
+		--no-tips -i $(PYFILES)
 
 upload: build
 	twine3 upload dist/*
 
+build:
+	rm -rf dist
+	python3 -m build --sdist --wheel
+
 doc:
 	update-readme-usage
 
+format:
+	ruff check --select I --fix $(PYFILES) && ruff format $(PYFILES)
+
 clean:
-	@rm -vrf *.egg-info */*.egg-info .venv/ build/ dist/ __pycache__/ \
-          */__pycache__ */*/__pycache__
+	@rm -vrf *.egg-info build/ dist/ __pycache__/ \
+	    */__pycache__ */*/__pycache__

README.md

@@ -83,10 +83,9 @@ See the [current parsers](pkglog/parsers) for example code.
 Type `pkglog -h` to view the usage summary:
 
 ```
-usage: pkglog [-h] [-u | -i | -I | -n] [-N INSTALLED_NET_DAYS]
-                   [-d DAYS | -a | -b] [-j] [-v] [-c]
-                   [-p {pacman,zypper,apt,dnf} | -f PARSER_PLUGIN]
-                   [-t TIMEGAP] [-P PATH] [-g | -r] [-V]
+usage: pkglog [-h] [-u | -i | -I | -n] [-N INSTALLED_NET_DAYS] [-d DAYS |
+                   -a | -b] [-j] [-v] [-c] [-p {pacman,zypper,apt,dnf} |
+                   -f PARSER_PLUGIN] [-t TIMEGAP] [-P PATH] [-g | -r] [-V]
                    [package ...]
 
 Reports concise log of package changes.
@@ -100,10 +99,10 @@ options:
   -i, --installed       show installed/removed only
   -I, --installed-only  show installed only
   -n, --installed-net   show net installed only
-  -N INSTALLED_NET_DAYS, --installed-net-days INSTALLED_NET_DAYS
+  -N, --installed-net-days INSTALLED_NET_DAYS
                         days previously removed before being re-considered as
                         new net installed, default=2. Set to 0 to disable.
-  -d DAYS, --days DAYS  show all packages only from given number of days ago,
+  -d, --days DAYS       show all packages only from given number of days ago,
                         or from given YYYY-MM-DD[?HH:MM[:SS]],
                         default=30(days), 0=today, -1=all. If only time is
                         specified, then today is assumed.
@@ -112,13 +111,13 @@ options:
   -j, --nojustify       don't right justify version numbers
   -v, --verbose         be verbose, describe upgrades/downgrades
   -c, --no-color        do not color output lines
-  -p {pacman,zypper,apt,dnf}, --parser {pacman,zypper,apt,dnf}
+  -p, --parser {pacman,zypper,apt,dnf}
                         log parser type, default=pacman
-  -f PARSER_PLUGIN, --parser-plugin PARSER_PLUGIN
+  -f, --parser-plugin PARSER_PLUGIN
                         path to alternate custom parser plugin file
-  -t TIMEGAP, --timegap TIMEGAP
+  -t, --timegap TIMEGAP
                         max minutes gap between grouped changes, default=2
-  -P PATH, --path PATH  alternate log path[s] (separate multiple using ":",
+  -P, --path PATH       alternate log path[s] (separate multiple using ":",
                         must be time sequenced)
   -g, --glob            given package name[s] is glob pattern to match
   -r, --regex           given package name[s] is regular expression to match

pkglog/__main__.py

@@ -1,4 +1,6 @@
 from sys import exit
+
 from . import pkglog
+
 if __name__ == '__main__':
     exit(pkglog.main())

pkglog/parsers/apt.py

@@ -1,5 +1,6 @@
 #!/usr/bin/python3
-'Parse Debian/Ubuntu APT log messages'
+"Parse Debian/Ubuntu APT log messages"
+
 import re
 from datetime import datetime
 
@@ -13,10 +14,12 @@
     'Reinstall': 'reinstalled',
 }
 
+
 class g:
     action = None
     line = None
 
+
 def get_time(line):
     vals = line.split(':', maxsplit=1)
     if len(vals) != 2:
@@ -40,6 +43,7 @@ def get_time(line):
         g.line = rest[1:]
     return None
 
+
 def get_packages():
     if g.action:
         for pline in g.line.strip().split('),'):

pkglog/parsers/dnf.py

@@ -1,5 +1,6 @@
 #!/usr/bin/python3
-'Parse RedHat/Fedora DNF log messages'
+"Parse RedHat/Fedora DNF log messages"
+
 import re
 from datetime import datetime
 
@@ -14,9 +15,11 @@
     'Reinstalled': ('reinstalled', 0),
 }
 
+
 class g:
-    vers = {}
-    pkgs = None
+    vers = {}  # type: ignore
+    pkgs = None  # type: ignore
+
 
 def get_time(line):
     fields = line.split(maxsplit=3)
@@ -49,7 +52,7 @@ def get_time(line):
     if index < 0:
         dts = dts.replace('Z', '+00:00')
     else:
-        dts = dts[:index + 3] + ':' + dts[index + 3:]
+        dts = dts[: index + 3] + ':' + dts[index + 3 :]
 
     # Return the logged time in localtime
     try:
@@ -59,5 +62,6 @@ def get_time(line):
 
     return dt
 
+
 def get_packages():
     yield g.pkgs

pkglog/parsers/pacman.py

@@ -1,15 +1,18 @@
 #!/usr/bin/python3
-'Parse Arch Linux pacman log messages'
+"Parse Arch Linux pacman log messages"
+
 import sys
 from datetime import datetime
 
 logfile = '/var/log/pacman.log'
 
 LINETYPES = {'[ALPM]', '[PACMAN]'}
 
+
 class g:
     line = None
 
+
 def get_time(line):
     # Handle old format pacman logs
     if len(line) > 11 and line[11] == ' ':
@@ -43,6 +46,7 @@ def get_time(line):
     # We also convert the logged time to localtime
     return dt.astimezone().replace(tzinfo=None)
 
+
 def get_packages():
     try:
         res = g.line.strip().split(maxsplit=2)

pkglog/parsers/zypper.py

@@ -1,20 +1,23 @@
 #!/usr/bin/python3
-'Parse OpenSUSE zypper log format'
+"Parse OpenSUSE zypper log format"
+
 import sys
 from datetime import datetime
 
 # User may want to chmod 755 the "/var/log/zypp" directory so they can
 # run this tool as normal user.
 logfile = '/var/log/zypp/history'
 
-_pkgs = {}
+_pkgs = {}  # type: ignore
+
 
 class g:
     pkg = None
     vers = None
     oldvers = None
     removed = None
 
+
 def get_time(line):
     vals = line.split('|', maxsplit=4)
     if len(vals) < 4:
@@ -43,12 +46,14 @@ def get_time(line):
 
     return dt
 
+
 def get_packages():
     try:
-        from looseversion import LooseVersion as Version
+        from looseversion import LooseVersion as Version  # type: ignore
     except Exception:
-        sys.exit('Error: Need to install Python looseversion package to use '
-        'zypper parsing.')
+        sys.exit(
+            'Error: Need to install Python looseversion package to use zypper parsing.'
+        )
 
     if g.removed:
         action = 'removed'