diff --git a/CHANGELOG.md b/CHANGELOG.md index 715ce0ec..5ffdf546 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,14 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). -## [20.8.1] (unreleased) - -### Fixed -- Fix deploy and upload to pypi. [#315](https://github.com/greenbone/ospd-openvas/pull/315) - -[20.8.1]: https://github.com/greenbone/ospd-openvas/compare/v20.8.0...ospd-openvas-20.08 - -## [20.8.0] (2020-08-11) +## [20.8.0] (2020-08-12) ### Added - Add solution method to solution of vt object. [#131](https://github.com/greenbone/ospd-openvas/pull/131) @@ -61,6 +54,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fix handling of denied hosts. [#263](https://github.com/greenbone/ospd-openvas/pull/263) - Fix handling of special chars in credentials. [#294](https://github.com/greenbone/ospd-openvas/pull/294) - Fix type and default value of optimize_test preference. [#302](https://github.com/greenbone/ospd-openvas/pull/302) +- Fix deploy and upload to pypi. [#315](https://github.com/greenbone/ospd-openvas/pull/315) +- Fix ospd version dependency. [#316](https://github.com/greenbone/ospd-openvas/pull/316) ### Removed - Remove use_mac_addr, vhost_ip and vhost scan preferences. [#184](https://github.com/greenbone/ospd-openvas/pull/184) diff --git a/poetry.lock b/poetry.lock index 107b9060..ee6f6c55 100644 --- a/poetry.lock +++ b/poetry.lock @@ -242,23 +242,19 @@ version = "0.6.1" [[package]] category = "main" -description = "" +description = "OSPD is a base for scanner wrappers which share the same communication protocol: OSP (Open Scanner Protocol)" name = "ospd" optional = false -python-versions = "^3.5" -version = "20.8a1" +python-versions = ">=3.5,<4.0" +version = "20.8.1" [package.dependencies] -defusedxml = "^0.6.0" -deprecated = "^1.2.10" -lxml = "^4.5.1" -paramiko = "^2.7.1" -psutil = "^5.7.0" +defusedxml = ">=0.6.0,<0.7.0" +deprecated = ">=1.2.10,<2.0.0" +lxml = ">=4.5.1,<5.0.0" +paramiko = ">=2.7.1,<3.0.0" +psutil = ">=5.7.0,<6.0.0" -[package.source] -reference = "1c0dec83a73f702ade1bc1d7d66f79ade28641a4" -type = "git" -url = "https://github.com/greenbone/ospd.git" [[package]] category = "main" description = "Core utilities for Python packages" @@ -442,7 +438,7 @@ python-versions = "*" version = "1.12.1" [metadata] -content-hash = "b9fb459bd6a92a98b9cfa99e1fe824889f09770ec04de08692f86f13a8ebdfa7" +content-hash = "c76905f184837fe531e180eda4d0db1feb898fd676779f63e66dc6dd6fd384fd" python-versions = "^3.5" [metadata.files] @@ -625,7 +621,10 @@ mccabe = [ {file = "mccabe-0.6.1-py2.py3-none-any.whl", hash = "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42"}, {file = "mccabe-0.6.1.tar.gz", hash = "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"}, ] -ospd = [] +ospd = [ + {file = "ospd-20.8.1-py3-none-any.whl", hash = "sha256:688fb0b3fc777dc6de871d45bbfdd20a3af264a5455e5fd994f920d4092d547f"}, + {file = "ospd-20.8.1.tar.gz", hash = "sha256:71cff4cc0f54b28737e92e11d9184a1742182ed3114a2dcbfc1dd19200c300a6"}, +] packaging = [ {file = "packaging-20.4-py2.py3-none-any.whl", hash = "sha256:998416ba6962ae7fbd6596850b80e17859a5753ba17c32284f67bfff33784181"}, {file = "packaging-20.4.tar.gz", hash = "sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8"}, diff --git a/pyproject.toml b/pyproject.toml index fdece107..6e92a21a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,7 +49,7 @@ python = "^3.5" redis = "^3.5.3" psutil = "^5.7.0" packaging = "^20.4" -ospd = {git = "https://github.com/greenbone/ospd.git", branch = "ospd-20.08"} +ospd = "^20.8" [tool.poetry.dev-dependencies] pylint = "^2.5.3" diff --git a/setup.py b/setup.py index 067f7428..c5b5b2eb 100644 --- a/setup.py +++ b/setup.py @@ -49,7 +49,7 @@ 'Programming Language :: Python :: 3.8', ], python_requires='>=3.5', - install_requires=['ospd>=2.0.0', 'redis>=3.0.1', 'psutil', 'packaging'], + install_requires=['ospd>=20.8.0', 'redis>=3.0.1', 'psutil', 'packaging'], entry_points={'console_scripts': ['ospd-openvas=ospd_openvas.daemon:main']}, test_suite="tests", )