Merge pull request #316 from jjnicola/dependency

Set the right ospd dependency

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)

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"

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",
 )