Change to PEP 621

Author: bulletmark

.flake8

@@ -1,4 +1,4 @@
 [flake8]
 ignore = E126,E127,E128,E302,E305,W503
 max-line-length = 80
-max-complexity = 30
+max-complexity = 32

.gitignore

@@ -1,6 +1,7 @@
 README.html
 build/
 dist/
+logs/
 .idea/
 .vscode/
 *.egg-info/

Makefile

@@ -1,31 +1,21 @@
 NAME = $(shell basename $(CURDIR))
 PYNAME = $(subst -,_,$(NAME))
 
-all:
-	@echo "Type sudo make install|uninstall"
-	@echo "or make sdist|upload|check|clean"
-
-install:
-	pip3 install -U --root-user-action=ignore .
-
-uninstall:
-	pip3 uninstall --root-user-action=ignore $(NAME)
+check:
+	ruff .
+	flake8 */*.py */*/*.py
+	vermin -vv --exclude importlib.metadata --no-tips -i */*.py */*/*.py
 
-sdist:
+build:
 	rm -rf dist
-	python3 setup.py sdist bdist_wheel
+	python3 -m build
 
-upload: sdist
-	twine3 upload --skip-existing dist/*
-
-check:
-	flake8 $(PYNAME)/*.py $(PYNAME)/*/*.py setup.py
-	vermin --no-tips -i $(PYNAME)/*.py $(PYNAME)/*/*.py setup.py
-	python3 setup.py check
+upload: build
+	twine3 upload dist/*
 
 doc:
 	update-readme-usage
 
 clean:
-	@rm -vrf *.egg-info build/ dist/ __pycache__/ \
-	    */__pycache__ */*/__pycache__
+	@rm -vrf *.egg-info */*.egg-info .venv/ build/ dist/ __pycache__/ \
+          */__pycache__ */*/__pycache__

README.md

@@ -83,7 +83,7 @@ Type `pkglog -h` to view the usage summary:
 ```
 usage: pkglog [-h] [-u | -i | -I | -n] [-d DAYS | -a | -b] [-j] [-v] [-c]
                    [-p {pacman,zypper,apt,dnf} | -f PARSER_PLUGIN]
-                   [-t TIMEGAP] [-P PATH] [-g | -r]
+                   [-t TIMEGAP] [-P PATH] [-g | -r] [-V]
                    [package]
 
 Reports concise log of package changes.
@@ -116,6 +116,7 @@ options:
                         must be time sequenced)
   -g, --glob            given package name is glob pattern to match
   -r, --regex           given package name is regular expression to match
+  -V, --version         show pkglog version
 
 Note you can set default starting options in ~/.config/pkglog-flags.conf.
 ```
@@ -148,29 +149,29 @@ ensure that `python3-pip` and `python3-wheel` are installed then type
 the following to install (or upgrade):
 
 ```
-$ sudo pip3 install -U --use-pep517 --root-user-action=ignore pkglog
+$ sudo pip3 install -U pkglog
 ```
 
 Alternatively, do the following to install from the source repository.
 
 ```sh
 $ git clone http://github.com/bulletmark/pkglog
 $ cd pkglog
-$ sudo pip3 install -U --use-pep517 --root-user-action=ignore .
+$ sudo pip3 install -U .
 ```
 
 ## UPGRADE
 
 ```sh
 $ cd pkglog  # Source dir, as above
 $ git pull
-$ sudo pip3 install -U --use-pep517 --root-user-action=ignore .
+$ sudo pip3 install -U .
 ```
 
 ## REMOVAL
 
 ```sh
-$ sudo pip3 uninstall --root-user-action=ignore pkglog
+$ sudo pip3 uninstall pkglog
 ```
 
 ## LICENSE

pkglog/pkglog.py

@@ -219,6 +219,8 @@ def main():
             help='given package name is glob pattern to match')
     grp2.add_argument('-r', '--regex', action='store_true',
             help='given package name is regular expression to match')
+    opt.add_argument('-V', '--version', action='store_true',
+            help=f'show {opt.prog} version')
     opt.add_argument('package', nargs='?',
             help='specific package name to report')
 
@@ -234,6 +236,20 @@ def main():
 
     args = opt.parse_args(shlex.split(cnflines) + sys.argv[1:])
 
+    if args.version:
+        try:
+            from importlib.metadata import version
+        except ImportError:
+            from importlib_metadata import version
+
+        try:
+            ver = version(opt.prog)
+        except Exception:
+            ver = 'unknown'
+
+        print(ver)
+        return
+
     Queue.no_color = args.no_color or not sys.stdout.isatty()
 
     if args.parser_plugin:

pyproject.toml

@@ -0,0 +1,43 @@
+[build-system]
+requires = ["setuptools>=61.0", "setuptools-scm[toml]>=6.2"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "pkglog"
+description = "Reports concise log of package changes"
+readme = "README.md"
+authors = [
+  {name = "Mark Blakeney", email = "[email protected]"},
+]
+requires-python = ">=3.7"
+keywords = ["pacman", "apt-get", "apt", "dnf"]
+classifiers = [
+  "Programming Language :: Python :: 3",
+]
+dynamic = ["version"]
+dependencies = [
+  "importlib-metadata; python_version < '3.8'",
+]
+
+[project.urls]
+Homepage = "https://github.com/bulletmark/pkglog"
+
+[project.scripts]
+pkglog = "pkglog.pkglog:main"
+
+[project.license]
+text = "GPLv3"
+
+[tool.setuptools.packages.find]
+where = ["pkglog"]
+
+[tool.setuptools_scm]
+version_scheme = "post-release"
+
+[tool.edit-lint]
+linters = [
+  "ruff",
+  "flake8",
+]
+
+# vim:se sw=2: