From bc2b4c4ce606092438800327cb22bb2eed9816c4 Mon Sep 17 00:00:00 2001 From: Juan Jose Nicola Date: Wed, 18 Aug 2021 04:26:16 -0500 Subject: [PATCH 1/2] Downgrade required version for psutil to 5.5.1 Because the referecen system Debian Buster offers this version. (cherry picked from commit 4f13f8944395f734a930040a2f6bb2744a5cddd3) # Conflicts: # CHANGELOG.md --- CHANGELOG.md | 14 ++++++++++++++ pyproject.toml | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 058dabf1..bc58a154 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [21.10.0] (unreleased) ### Added +<<<<<<< HEAD - Add method to validate port lists. [#393](https://github.com/greenbone/ospd/pull/393) [#395](https://github.com/greenbone/ospd/pull/395) +======= +### Changed +- Use better defaults for file paths and permissions [#429](https://github.com/greenbone/ospd/pull/429) +- Downgrade required version for psutil to 5.5.1 [#453](https://github.com/greenbone/ospd/pull/453) + +### Deprecated +### Removed +### Fixed + +[Unreleased]: https://github.com/greenbone/ospd/compare/v21.4.3...HEAD + +## [21.4.3] - 2021-08-04 +>>>>>>> 4f13f89 (Downgrade required version for psutil to 5.5.1) ### Changed - Set Log Timestamp to UTC. [#394](https://github.com/greenbone/ospd-openvas/pull/394) diff --git a/pyproject.toml b/pyproject.toml index 4eb7973c..b180b566 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,7 @@ packages = [ [tool.poetry.dependencies] python = "^3.7" -psutil = "^5.7.2" +psutil = "^5.5.1" lxml = "^4.5.2" defusedxml = ">=0.6,<0.8" paramiko = "^2.7.1" From b5e910b0ed4fe3040300d206f7ce4f3747ab8420 Mon Sep 17 00:00:00 2001 From: Juan Jose Nicola Date: Wed, 18 Aug 2021 12:11:29 +0200 Subject: [PATCH 2/2] Fix conflict --- CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc58a154..d69e0a4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,11 +7,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [21.10.0] (unreleased) ### Added -<<<<<<< HEAD - Add method to validate port lists. [#393](https://github.com/greenbone/ospd/pull/393) [#395](https://github.com/greenbone/ospd/pull/395) -======= ### Changed - Use better defaults for file paths and permissions [#429](https://github.com/greenbone/ospd/pull/429) - Downgrade required version for psutil to 5.5.1 [#453](https://github.com/greenbone/ospd/pull/453) @@ -23,7 +21,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). [Unreleased]: https://github.com/greenbone/ospd/compare/v21.4.3...HEAD ## [21.4.3] - 2021-08-04 ->>>>>>> 4f13f89 (Downgrade required version for psutil to 5.5.1) ### Changed - Set Log Timestamp to UTC. [#394](https://github.com/greenbone/ospd-openvas/pull/394)