Fixed incorrect package version in build; Increased pipdeptree version

Details:

* For reasons not fully understood, the new setuptools-scm version 9.2.0 caused
  the 'python -m setuptools_scm' command to display a version with one
  character less in the commit ID (when the directory was not clean) than the
  'build' package did. By using the 9.2.0 version as a minimum and by building
  without isolation (build --no-isolation), the issue could be fixed.

* In order to verify the correct package version, the distribution archives
  are now listed in the make rule that builds them, so that any issues are
  surfaced immediately and not as a follow-up error somewhere else.
  The list commands issue some analysis commands if they fail.

* Increased minimum version of pipdeptree to 2.24.0 (latest version still
  supporting Python 3.8), in order to solve the issue that the previously used
  version 2.2.0 did not find the version for package name 'ruamel-yaml' that
  is specified as a dependency of the 'safety' package, presumably because it
  did not properly match that dependent package name with the installed
  package name of 'ruamel.yaml'.

Signed-off-by: Andreas Maier <andreas.r.maier@gmx.de>

Author: andy-maier

Makefile

@@ -504,16 +504,18 @@ AUTHORS.md: _always
 	echo '```' >>AUTHORS.md.tmp
 	git shortlog --summary --email | cut -f 2 | sort >>AUTHORS.md.tmp
 	echo '```' >>AUTHORS.md.tmp
-	sh -c "if ! diff -q AUTHORS.md.tmp AUTHORS.md; then mv AUTHORS.md.tmp AUTHORS.md; else rm AUTHORS.md.tmp; fi"
+	bash -c "if ! diff -q AUTHORS.md.tmp AUTHORS.md; then mv AUTHORS.md.tmp AUTHORS.md; else rm AUTHORS.md.tmp; fi"
 
 $(sdist_file): pyproject.toml $(dist_dependent_files)
 	@echo "Makefile: Building the source distribution archive: $(sdist_file)"
-	$(PYTHON_CMD) -m build --sdist --outdir $(dist_dir) .
+	$(PYTHON_CMD) -m build --no-isolation --sdist --outdir $(dist_dir) .
+	bash -c "ls -l $(sdist_file) || ls -l $(dist_dir) && echo package_level=$(package_level) && $(PYTHON_CMD) -m setuptools_scm"
 	@echo "Makefile: Done building the source distribution archive: $(sdist_file)"
 
 $(bdist_file) $(version_file): pyproject.toml $(dist_dependent_files)
 	@echo "Makefile: Building the wheel distribution archive: $(bdist_file)"
-	$(PYTHON_CMD) -m build --wheel --outdir $(dist_dir) -C--universal .
+	$(PYTHON_CMD) -m build --no-isolation --wheel --outdir $(dist_dir) -C--universal .
+	bash -c "ls -l $(bdist_file) $(version_file) || ls -l $(dist_dir) && echo package_level=$(package_level) && $(PYTHON_CMD) -m setuptools_scm"
 	@echo "Makefile: Done building the wheel distribution archive: $(bdist_file)"
 
 $(done_dir)/flake8_$(pymn)_$(PACKAGE_LEVEL).done: $(done_dir)/develop_$(pymn)_$(PACKAGE_LEVEL).done Makefile $(flake8_rc_file) $(check_py_files)

base-requirements.txt

@@ -7,5 +7,5 @@
 
 pip>=25.0
 setuptools>=70.0.0
-setuptools-scm[toml]>=8.1.0
+setuptools-scm[toml]>=9.2.0
 wheel>=0.41.3

dev-requirements.txt

@@ -104,13 +104,16 @@ importlib-metadata>=4.8.3
 mypy>=1.2.0
 
 # Package dependency management tools
-pipdeptree>=2.2.0
+pipdeptree>=2.24.0
 # pip-check-reqs 2.3.2 is needed to have proper support for pip>=21.3 and below.
 # pip-check-reqs 2.4.3 fixes a speed issue on Python 3.11.
 # pip-check-reqs 2.5.0 has issue https://github.com/r1chardj0n3s/pip-check-reqs/issues/143
 pip-check-reqs>=2.4.3,!=2.5.0; python_version == '3.8'
 pip-check-reqs>=2.5.1; python_version >= '3.9'
 
+# packaging (used by pytest, safety)
+packaging>=24.1
+
 # pytz (used by TBD)
 pytz>=2019.1
 

docs/changes.rst

@@ -18,6 +18,12 @@ Released: not yet
 
 * Addressed safety issues up to 2025-06-29.
 
+* Dev: Fixed issue where the package version used for distribution archive file
+  names were generated inconsistently between setuptools_scm (used in Makefile)
+  and the 'build' module, by using no build isolation ('--no-isolation' option
+  of the 'build' module) and increasing the minimum version of 'setuptools-scm'
+  to 9.2.0, which fixes a number of version related issues.
+
 **Enhancements:**
 
 **Cleanup:**

minimum-constraints-develop.txt

@@ -94,12 +94,12 @@ importlib-metadata==4.8.3
 mypy==1.2.0
 
 # Package dependency management tools
-pipdeptree==2.2.0
+pipdeptree==2.24.0
 pip-check-reqs==2.4.3; python_version <= '3.8'
 pip-check-reqs==2.5.1; python_version >= '3.9'
 
 # packaging (used by pytest, safety)
-packaging==22.0
+packaging==24.1
 
 # pluggy (used by pytest, tox)
 pluggy==0.13.1

minimum-constraints-install.txt

@@ -10,7 +10,7 @@
 pip==25.0
 setuptools==70.0.0
 # Note on not specifying 'setuptools-scm[toml]': Extras cannot be in constraints files
-setuptools-scm==8.1.0
+setuptools-scm==9.2.0
 wheel==0.41.3
 
 

pyproject.toml

@@ -8,7 +8,7 @@ requires = [
     # Keep in sync with base-requirements.txt and the base dependencies in
     # minimum-constraints-install.txt
     "setuptools>=70.0.0",
-    "setuptools-scm[toml]>=8.1.0",
+    "setuptools-scm[toml]>=9.2.0",
     "wheel>=0.41.3"
 ]
 build-backend = "setuptools.build_meta"