From 5d7a8738b852aed1629f1873ad06f5961862f825 Mon Sep 17 00:00:00 2001 From: Andreas Maier Date: Fri, 16 Aug 2024 12:32:39 +0200 Subject: [PATCH] Fixed check_reqs and added psutil as dep; Addressed safety issues Signed-off-by: Andreas Maier --- Makefile | 10 +++++----- docs/source/release_notes.rst | 2 +- minimum-constraints-develop.txt | 6 ++++-- requirements-develop.txt | 1 + 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 6469d89b..df466289 100644 --- a/Makefile +++ b/Makefile @@ -134,16 +134,16 @@ safety_develop_policy_file := .safety-policy-develop.yml # Packages whose dependencies are checked using pip-missing-reqs # ansible_test is checked only on officially supported Python versions ifeq ($(python_m_n_version),3.8) - check_reqs_packages := ansible pip_check_reqs pytest coverage coveralls flake8 sphinx ansible_doc_extractor pylint + check_reqs_packages := ansible pip_check_reqs pytest coverage coveralls flake8 sphinx ansible_doc_extractor pylint safety bandit else ifeq ($(python_m_n_version),3.9) - check_reqs_packages := ansible pip_check_reqs pytest coverage coveralls flake8 sphinx ansible_doc_extractor ansible_test pylint + check_reqs_packages := ansible pip_check_reqs pytest coverage coveralls flake8 sphinx ansible_doc_extractor pylint safety bandit ansible_test else ifeq ($(python_m_n_version),3.10) - check_reqs_packages := ansible pip_check_reqs pytest coverage coveralls flake8 sphinx ansible_doc_extractor ansible_test ansiblelint pylint + check_reqs_packages := ansible pip_check_reqs pytest coverage coveralls flake8 sphinx ansible_doc_extractor pylint safety bandit ansible_test ansiblelint else ifeq ($(python_m_n_version),3.11) - check_reqs_packages := ansible pip_check_reqs pytest coverage coveralls flake8 sphinx ansible_doc_extractor ansible_test ansiblelint pylint + check_reqs_packages := ansible pip_check_reqs pytest coverage coveralls flake8 sphinx ansible_doc_extractor pylint safety bandit ansible_test ansiblelint else # sphinx is excluded because pip-missing-reqs 2.5 reports missing sphinx-versions package (rightfully) - check_reqs_packages := ansible pip_check_reqs pytest coverage coveralls flake8 ansible_doc_extractor ansible_test ansiblelint pylint + check_reqs_packages := ansible pip_check_reqs pytest coverage coveralls flake8 ansible_doc_extractor pylint safety bandit ansible_test ansiblelint endif # Directories for documentation diff --git a/docs/source/release_notes.rst b/docs/source/release_notes.rst index 8073c502..461918b7 100644 --- a/docs/source/release_notes.rst +++ b/docs/source/release_notes.rst @@ -35,7 +35,7 @@ Availability: `AutomationHub`_, `Galaxy`_, `GitHub`_ **Bug fixes:** -* Fixed safety issues up to 20024-07-28. +* Fixed safety issues up to 20024-08-16. * Sanity test: Fixed the sanity test on AutomationHub which failed because the "compile" and "import" tests were run for all target node Python versions, diff --git a/minimum-constraints-develop.txt b/minimum-constraints-develop.txt index dc365932..0a90be52 100644 --- a/minimum-constraints-develop.txt +++ b/minimum-constraints-develop.txt @@ -62,6 +62,7 @@ pydantic==1.10.13; python_version <= '3.12' typer==0.12.0; python_version <= '3.12' typer-cli==0.12.0; python_version <= '3.12' typer-slim==0.12.0; python_version <= '3.12' +psutil==6.0.0 # Bandit checker bandit==1.7.8 @@ -123,7 +124,7 @@ pip-check-reqs==2.5.3; python_version >= '3.12' alabaster==0.7.9 attrs==19.2.0 bleach==3.3.0 -certifi==2023.07.22 +certifi==2024.07.04 chardet==3.0.3 configparser==4.0.2 contextlib2==0.6.0 @@ -142,9 +143,10 @@ py==1.11.0 # Still required by pytest 6.2.5 requests-toolbelt==0.8.0 smmap==3.0.1 snowballstemmer==2.0.0 +stevedore==5.2.0 toml==0.10.0 tomli==2.0.1 typing-extensions==4.7.1 wcwidth==0.1.7 webencodings==0.5.1 -zipp==0.5.2 +zipp==3.19.1 diff --git a/requirements-develop.txt b/requirements-develop.txt index d509634e..b02ee92a 100644 --- a/requirements-develop.txt +++ b/requirements-develop.txt @@ -65,6 +65,7 @@ pydantic>=1.10.13; python_version <= '3.12' typer>=0.12.0; python_version <= '3.12' typer-cli>=0.12.0; python_version <= '3.12' typer-slim>=0.12.0; python_version <= '3.12' +psutil>=6.0.0 # Bandit checker bandit>=1.7.8