Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set the right ospd dependency #316

Merged
merged 3 commits into from
Aug 12, 2020
Merged

Set the right ospd dependency #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21c4071

jjnicola Aug 11, 2020
c0d0ff9
Update changelog
jjnicola Aug 12, 2020
da0a2b0
update poetry.lock
jjnicola Aug 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
27 changes: 13 additions & 14 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
)