Skip to content

Commit bb81010

Browse files
authored
Merge pull request #316 from jjnicola/dependency
Set the right ospd dependency
2 parents e01ab6c + da0a2b0 commit bb81010

File tree

4 files changed

+18
-24
lines changed

4 files changed

+18
-24
lines changed

CHANGELOG.md

+3-8
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,7 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66

7-
## [20.8.1] (unreleased)
8-
9-
### Fixed
10-
- Fix deploy and upload to pypi. [#315](https://github.com/greenbone/ospd-openvas/pull/315)
11-
12-
[20.8.1]: https://github.com/greenbone/ospd-openvas/compare/v20.8.0...ospd-openvas-20.08
13-
14-
## [20.8.0] (2020-08-11)
7+
## [20.8.0] (2020-08-12)
158

169
### Added
1710
- 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/).
6154
- Fix handling of denied hosts. [#263](https://github.com/greenbone/ospd-openvas/pull/263)
6255
- Fix handling of special chars in credentials. [#294](https://github.com/greenbone/ospd-openvas/pull/294)
6356
- Fix type and default value of optimize_test preference. [#302](https://github.com/greenbone/ospd-openvas/pull/302)
57+
- Fix deploy and upload to pypi. [#315](https://github.com/greenbone/ospd-openvas/pull/315)
58+
- Fix ospd version dependency. [#316](https://github.com/greenbone/ospd-openvas/pull/316)
6459

6560
### Removed
6661
- Remove use_mac_addr, vhost_ip and vhost scan preferences. [#184](https://github.com/greenbone/ospd-openvas/pull/184)

poetry.lock

+13-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ python = "^3.5"
4949
redis = "^3.5.3"
5050
psutil = "^5.7.0"
5151
packaging = "^20.4"
52-
ospd = {git = "https://github.com/greenbone/ospd.git", branch = "ospd-20.08"}
52+
ospd = "^20.8"
5353

5454
[tool.poetry.dev-dependencies]
5555
pylint = "^2.5.3"

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
'Programming Language :: Python :: 3.8',
5050
],
5151
python_requires='>=3.5',
52-
install_requires=['ospd>=2.0.0', 'redis>=3.0.1', 'psutil', 'packaging'],
52+
install_requires=['ospd>=20.8.0', 'redis>=3.0.1', 'psutil', 'packaging'],
5353
entry_points={'console_scripts': ['ospd-openvas=ospd_openvas.daemon:main']},
5454
test_suite="tests",
5555
)

0 commit comments

Comments
 (0)