Merge branch 'develop' into fix/list-utils-falsy-handling

Author: rishi-jat

.github/workflows/codeql-analysis.yml

@@ -63,7 +63,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
+      uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -91,6 +91,6 @@ jobs:
         exit 1
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
+      uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
       with:
         category: "/language:${{matrix.language}}"

Makefile

@@ -39,7 +39,7 @@ submodules: ## Initialize git submodules (nist-content, oscal)
 	git submodule update --init
 
 develop: submodules ## Set up development environment
-	pip install hatch "virtualenv>=20.26.6,<21"  # Pin until hatch supports virtualenv 21.x
+	pip install hatch
 	pip install -e .[dev]
 
 pre-commit: ## Install pre-commit hooks

pyproject.toml

@@ -113,15 +113,6 @@ packages = ["trestle"]
 [tool.hatch.envs.default]
 dependencies = [
   "coverage[toml]~=7.4",
-  "virtualenv>=20.26.6,<21",  # Pin until hatch supports virtualenv 21.x
-]
-
-# Constrains the internal environment hatch uses to run build hooks.
-# Without this, hatch resolves the latest virtualenv (21.x+) which breaks
-# the hatch-build env due to removed `propose_interpreters` API.
-[tool.hatch.envs.hatch-build]
-dependencies = [
-  "virtualenv>=20.26.6,<21",  # Pin until hatch supports virtualenv 21.x
 ]
 
 [tool.hatch.envs.hatch-test]
@@ -134,7 +125,6 @@ dependencies = [
     "pytest-xdist[psutil]>=3.5",
     "pytest-randomly>=3.15",
     "mypy",
-    "virtualenv>=20.26.6,<21",  # Pin until hatch supports virtualenv 21.x
 ]
 
 [[tool.hatch.envs.hatch-test.matrix]]

trestle/core/commands/task.py

@@ -81,7 +81,8 @@ def _run(self, args: argparse.Namespace) -> int:
 
             # permit ${name} in config definitions
             global_config = configparser.ConfigParser(interpolation=configparser.ExtendedInterpolation())
-            global_config.read_file(config_path.open('r', encoding=const.FILE_ENCODING))
+            with config_path.open('r', encoding=const.FILE_ENCODING) as f:
+                global_config.read_file(f)
             # run setup
             task_index = self._build_task_index()
 

trestle/core/repository.py

@@ -238,8 +238,8 @@ def import_model(
                 errmsg = f'Validation of model {name} did not pass'
                 logger.error(errmsg)
         except Exception as err:
-            logger.error(errmsg)
             errmsg = f'Import of model {name} failed. Validation failed with error: {err}'
+            logger.error(errmsg)
 
         if not success:
             # rollback in case of validation error or failure