Merge branch 'master' into tapelink

Author: vontedduchaithra

.github/workflows/test.yml

@@ -259,7 +259,7 @@ jobs:
         COVERALLS_SERVICE_NAME: github
         COVERALLS_SERVICE_JOB_ID: "${{ github.run_id }}"
         COVERALLS_SERVICE_NUMBER: "${{ github.workflow }}-${{ github.run_number }}"
-      uses: nick-fields/retry@v3
+      uses: nick-fields/retry@v4
       with:
         timeout_seconds: 30
         max_attempts: 3
@@ -315,7 +315,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         COVERALLS_SERVICE_NUMBER: "${{ github.workflow }}-${{ github.run_number }}"
-      uses: nick-fields/retry@v3
+      uses: nick-fields/retry@v4
       with:
         timeout_seconds: 30
         max_attempts: 3

.safety-policy-develop.yml

@@ -36,6 +36,11 @@ security:
             reason: Fixed filelock version 3.20.1 requires Python>=3.10 and is used there
         84183:
             reason: Fixed filelock version 3.20.3 requires Python>=3.10 and is used there
+        84415:
+            reason: Fixed filelock version 3.20.3 requires Python>=3.10 and is used there
+        # Need to comment out due to issue https://github.com/pyupio/safety/issues/847
+        # SFTY-20260218-01424:
+        #     reason: Fixed nltk version 3.9.3 requires Python>=3.10 and is used there
 
     # Continue with exit code 0 when vulnerabilities are found.
     continue-on-vulnerability-error: False

.whitesource

@@ -1,3 +1,3 @@
 {
-  "settingsInheritedFrom": "whitesource-config/whitesource-config@master"
+  "settingsInheritedFrom": "whitesource-config/whitesource-config@main"
 }

Makefile

@@ -295,12 +295,12 @@ help:
 	@echo "  unittest          - Run unit tests (adds to coverage results)"
 	@echo "  functiontest      - Run function tests (adds to coverage results)"
 	@echo "  test              - Run unit and function tests (adds to coverage results)"
-	@echo "  end2end_mocked    - Run end2end tests against example mock environments (adds to coverage results)"
+	@echo "  end2end_mocked    - Run end2end tests against example mock environments (adds to coverage results, checks blanked-out properties in log)"
 	@echo "  installtest       - Run install tests"
 	@echo "  build             - Build the distribution files in: $(dist_dir)"
 	@echo "  builddoc          - Build documentation in: $(doc_build_dir)"
 	@echo "  all               - Do all of the above"
-	@echo "  end2end           - Run end2end tests (adds to coverage results)"
+	@echo "  end2end           - Run end2end tests (adds to coverage results, checks blanked-out properties in log)"
 	@echo "  end2end_show      - Show HMCs defined for end2end tests"
 	@echo "  end2end_check     - Check access to all HMCs defined in your HMC inventory file for end2end tests"
 	@echo "  authors           - Generate AUTHORS.md file from git log"
@@ -703,15 +703,19 @@ endif
 
 .PHONY:	end2end
 end2end: $(done_dir)/develop_$(pymn)_$(PACKAGE_LEVEL).done $(package_py_files) $(test_end2end_py_files) $(test_common_py_files) $(coverage_config_file)
-	bash -c "PYTHONPATH=. TESTEND2END_LOAD=true coverage run --append -m pytest -v -m 'not check_hmcs' $(pytest_general_opts) $(pytest_test_opts) $(test_dir)/end2end"
+	-$(call RM_FUNC,end2end.log)
+	bash -c "PYTHONPATH=. TESTLOGFILE=end2end.log TESTEND2END_LOAD=true coverage run --append -m pytest -v -m 'not check_hmcs' $(pytest_general_opts) $(pytest_test_opts) $(test_dir)/end2end"
 	coverage html
+	bash -c "tools/check_blanked.py --accept-null end2end.log"
 	@echo "Makefile: $@ done."
 
 # TODO: Enable rc checking again once the remaining issues are resolved
 .PHONY:	end2end_mocked
 end2end_mocked: $(done_dir)/develop_$(pymn)_$(PACKAGE_LEVEL).done $(package_py_files) $(test_end2end_py_files) $(test_common_py_files) $(coverage_config_file) tests/end2end/mocked_inventory.yaml tests/end2end/mocked_vault.yaml tests/end2end/mocked_hmc_z16.yaml
-	bash -c "PYTHONPATH=. TESTEND2END_LOAD=true TESTINVENTORY=tests/end2end/mocked_inventory.yaml TESTVAULT=tests/end2end/mocked_vault.yaml coverage run --append -m pytest -v -m 'not check_hmcs' $(pytest_general_opts) $(pytest_test_opts) $(test_dir)/end2end"
+	-$(call RM_FUNC,end2end.log)
+	bash -c "PYTHONPATH=. TESTLOGFILE=end2end.log TESTEND2END_LOAD=true TESTINVENTORY=tests/end2end/mocked_inventory.yaml TESTVAULT=tests/end2end/mocked_vault.yaml coverage run --append -m pytest -v -m 'not check_hmcs' $(pytest_general_opts) $(pytest_test_opts) $(test_dir)/end2end"
 	coverage html
+	bash -c "tools/check_blanked.py --accept-null end2end.log"
 	@echo "Makefile: $@ done."
 
 .PHONY: authors

base-requirements.txt

@@ -5,7 +5,7 @@
 # Base dependencies (must be consistent with minimum-constraints-install.txt
 # and build-system.requires in pyproject.toml)
 
-pip>=25.2
+pip>=26.0
 setuptools>=78.1.1
 setuptools-scm[toml]>=9.2.0
-wheel>=0.41.3
+wheel>=0.46.2

changes/2122.fix.rst

@@ -0,0 +1,2 @@
+Fixed the issue that the zhmcclient mock support returned write-only properties
+of resources in Get and List operations.

changes/noissue.24.feature.rst

@@ -0,0 +1,2 @@
+Improved checking for sensitive properties in logs to reduce maintenance
+effort.

changes/noissue.25.feature.rst

@@ -0,0 +1,4 @@
+Test: Added support for checking blanked-out sensitive properties in the
+zhmcclient log file created during the end2end tests, by adding a new
+script tools/check_blanked.py, and running it during "make end2end"
+and "make end2end_mocked".

changes/noissue.mend.fix.rst

@@ -0,0 +1 @@
+Fixed Mend issues up to 2026-02-26.

changes/noissue.mendscan.fix.rst

@@ -0,0 +1,2 @@
+Added a step to the release instructions for checking Mend issues in the
+internal copy of the repo.